330 files changed, 72296 insertions, 148120 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index edaac50a538..a6dd3432159 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,944 @@
+Tue Apr 22 14:58:33 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	Merging code from the branch refactor_stage_1. The highlight of
+        this change is the creation and usage of parametric classes for
+	_var's, _out's and the complete removal of generated code if
+        TAO_HAS_SEQUENCE_TEMPLATES is not defined. The generated code
+        within the ORB ie. $TAO_ROOT/tao still has references to
+        TAO_HAS_SEQUENCE_TEMPLATES which needs to be cleaned up in the
+        next round. 
+
+	For more gory details please see below
+
+	Tue Apr 22 10:37:40 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+
+          Turned on CDR operator generation for sequences that have an
+          element type easily detectable as local by the IDL compiler.
+          For the insertion operator, the error will be detected at
+          a lower level, via the generated virtual marshal() method
+          for interfaces. For the extraction operator, 0 is returned.
+
+	Tue Apr 22 09:28:36 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+
+          Made a fix for strings and wstrings similar to
+
+          Mon Apr 21 14:09:21 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        Tue Apr 22 09:10:23 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/Seq_Var_T.cpp: Fixed a wroong inclusion of inlined file.
+
+        Tue Apr 22 06:30:52 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* be/be_visitor_sequence/sequence_ch.cpp: 
+	* be/be_visitor_sequence/sequence_cs.cpp: Use the new managed type
+	  out classes when the IDL compiler comes across managed types. 
+
+	Tue Apr 22 06:22:47 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/Seq_Out_T.cpp:
+	* tao/Seq_Out_T.h:
+	* tao/Seq_Out_T.inl:
+	* tao/Seq_Var_T.cpp:
+	* tao/Seq_Var_T.h:
+	* tao/Seq_Var_T.inl: The Var and Out classes for sequences have
+	  been split across two files. The motivation for this change came
+	  around when we had to have a seperate out class for managed
+	  types. This was needed since the operator[] for managed types
+	  had a return type a bit different from regular sequences. Even
+	  with this change, not all of orbsvcs compile. 
+	  
+	* tao/Array_VarOut_T.h:
+	* tao/DomainC.h:
+	* tao/DynamicC.h:
+	* tao/IIOPC.h:
+	* tao/IOPC.h:
+	* tao/ObjectIdListC.h:
+	* tao/ObjectReferenceTemplateC.h:
+	* tao/Object_KeyC.h:
+	* tao/OctetSeqC.h:
+	* tao/Policy_ForwardC.h:
+	* tao/Sequence_T.h:
+	* tao/StringSeqC.h:
+	* tao/VarOut_T.h:
+	* tao/corba.h:
+	* tao/DynamicAny/DynamicAnyC.h:
+	* tao/IFR_Client/IFR_BaseC.h:
+	* tao/IFR_Client/IFR_BasicC.h:
+	* tao/IORManipulation/IORC.h:
+	* tao/PortableServer/PortableServerC.h: Replaced existing
+	  inclusions of tao/Seq_varOut_T.h with two inclusions,
+	  viz. tao/Seq_Out_T.h and tao/Seq_Var_T.h. 
+
+	* tao/Seq_VarOut_T.h:
+	* tao/Seq_VarOut_T.cpp:
+	* tao/Seq_VarOut_T.inl: Removed from the repo. 
+
+        Mon Apr 21 14:09:21 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+
+          Fixed CDR operator generation for sequence of Object. Thanks to
+          Bala <bala@dre.vanderbilt.edu> for pointing out the problem in
+          code generation for PortableGroup.
+
+        Mon Apr 21 13:11:07 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tests/AMH_Exceptions/Makefile:
+	* tests/Bug_1482_Regression/Makefile: Updated dependencies. 
+
+	* tests/OBV/Forward/Test_impl.cpp: Fixed compilation errors with
+	  g++. 
+
+        Mon Apr 21 13:07:41 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: Dont use _slice*
+	  as template parameters for code generation of the _var and
+	  _out.
+
+	* tao/Seq_VarOut_T.h:
+	* tao/Seq_VarOut_T.inl: Made the declarations of the operations to
+	  be compliant with the spec.
+
+        Wed Apr 16 15:28:51 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/Seq_VarOut_T.h:
+	* tao/Seq_VarOut_T.inl: Removed the const version of [] for
+	  Seq_var since the spec doesnt mandate them.
+
+	* tao/DomainC.i: Removed a bunch of code that shoudlnt have been
+	  there in the first place.
+
+        Wed Apr 16 000:14:10 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be_include/be_sequence.h:
+        * TAO_IDL/be_include/be_type.h:
+        * tao/Array_VarOut_T.inl:
+        * tao/Seq_VarOut_T.inl:
+
+	  Changes to remove compile errors in Param_Test and IDL_Test.
+
+        * tests/Param_Test/recursive_union.cpp:
+
+	  Changed use of TAO-specific recursive member names to
+	  spec-defined and generated recursive member names.
+
+        Mon Apr 14 17:10:59 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/TAO.dsp:
+
+	  Added IOP_IORC.* and IOP_CodecC.* to the project.
+
+        Mon Apr 14 16:10:50 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp:
+        * TAO_IDL/be_include/be_type.h:
+
+	  Fixed code generation for sequence of forward declared interface
+	  from a previous opening of the enclosing module, and for
+	  utility functions when nested scoped names repeat after skipping
+	  a level.
+
+        Mon Apr 14 14:33:48 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+
+	  Fixed code generation to work with deeply nested and/or
+	  anonymous sequence members.
+
+	* tests/IDL_Test/sequence.idl:
+
+	  Modified test to check above use cases more thoroughly.
+
+        Mon Apr 14 09:16:35 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/PortableServer/PortableServerC.cpp:
+        * tao/PortableServer/PortableServerC.h:
+
+	  Removed declaration and definition of Any operators for ObjectId.
+
+        Mon Apr 14 09:06:22 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be_include/be_sequence.h:
+
+          Fixed problem with multiple members of the same anonymous
+          sequence type.
+
+        Sat Apr 12 02:52:03 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be_include/be_type.h:
+        * TAO_IDL/be_include/be_valuetype.h:
+
+	  Fixed errors in generated code for exception holders
+	  and reply/response handlers.
+
+        * tests/AMH_Exceptions/client.dsp:
+        * tests/AMH_Exceptions/server.dsp:
+        * tests/AMH_Oneway/client.dsp:
+        * tests/AMH_Oneway/server.dsp:
+        * tests/AMI/AMI_Test_Client.dsp:
+        * tests/AMI/AMI_Test_Server.dsp:
+        * tests/AMI_Timeouts/client.dsp:
+        * tests/AMI_Timeouts/server.dsp:
+        * tests/OBV/Factory/client.dsp:
+        * tests/OBV/Factory/server.dsp:
+        * tests/OBV/Forward/client.dsp:
+        * tests/OBV/Forward/server.dsp:
+
+	  Removed obsolete -Gv option from IDL compiler
+	  command lines for the above tests.
+
+        * tests/OBV/Forward/client.cpp:
+
+	  Changed instances of <valuetype>_ptr to
+	  <valuetype> *.
+
+        Fri Apr 11 21:50:43 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+
+          Added generated code to make the array's *_alloc function 
+          generically callable outside the IDL compiler, where its full
+          name is not known.
+
+        * tao/Array_VarOut_T.h:
+        * tao/Array_VarOut_T.inl:
+
+          Added a static method to TAO_Array_Forany_T<> to make the 
+          *_alloc method (which was made visible to TAO_Array_Forany_T<>
+          by the changes above) visible to the Any impl class
+          TAO_Any_Array_Impl_T<>, where it is used in extraction.
+
+        * tao/TAO.dsp:
+
+          Added new generated files IOP_IORC.* and IOP_CodecC.* to the
+          project.
+
+        Fri Apr 11 14:41:11 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* Merged with the main trunk and compiled the core ORB and the IDL
+	  compiler on Linux GCC32. Moved the stuff to a new branch by name
+	  refactor_statge_1.  Added the following files from the branch
+	  into the new branch. 
+
+	* tao/Pseudo_Value_VarOut_T.cpp:
+	* tao/Pseudo_Value_VarOut_T.h:
+	* tao/Pseudo_Value_VarOut_T.inl:
+	* tao/Array_VarOut_T.cpp:
+	* tao/Array_VarOut_T.h:
+	* tao/Array_VarOut_T.inl:
+	* tao/Objref_VarOut_T.cpp:
+	* tao/Objref_VarOut_T.h:
+	* tao/Objref_VarOut_T.inl:
+	* tao/Pseudo_Value_Varout_T.cpp:
+	* tao/Pseudo_Value_Varout_T.h:
+	* tao/Pseudo_Value_Varout_T.inl:
+	* tao/Pseudo_VarOut_T.cpp:
+	* tao/Pseudo_VarOut_T.h:
+	* tao/Pseudo_VarOut_T.inl:
+	* tao/Seq_VarOut_T.cpp:
+	* tao/Seq_VarOut_T.h:
+	* tao/Seq_VarOut_T.inl:
+	* tao/Value_VarOut_T.cpp:
+	* tao/Value_VarOut_T.h:
+	* tao/Value_VarOut_T.inl:
+	* tao/VarOut_T.cpp:
+	* tao/VarOut_T.h:
+	* tao/VarOut_T.inl: 
+        
+          New files in to this new branch.
+
+        Tue Apr  1 000:37:21 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/interceptors_exceptlist.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be_include/be_type.h:
+
+	  Moved managed type template class generation from the Any
+	  operator pass (which might be skipped if Any operator generation
+	  is suppressed, or generated needlessly if the type is not used
+	  in a sequence) to the sequence visitor.
+
+        * tao/Sequence_T.cpp:
+
+	  Fixed code in TAO_Abstract_Manager that doesn't work with
+	  forward declared abstract interfaces.
+
+        * tao/DynamicAny/DynamicAny.pidl:
+        * tao/DynamicAny/DynamicAnyC.cpp:
+
+	  Regenerated hand-crafted DynamicAny.pidl files and changed comment
+	  at the top of the .pidl file to show added options to the IDL
+	  compiler command line to suppress Any operator and Typecode
+	  generation. Although these types contain a Typecode, they do
+	  not need Typecodes or Any operators of their own.
+
+        Mon Mar 31 22:31:47 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h:
+        * tao/Sequence_T.cpp:
+
+          Fixed some bugs with sequence template code generation.
+
+        Mon Mar 31 18:05:28 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Services.cpp:
+        * tao/Services.h:
+        * tao/Services.i:
+
+          Removed these files. They were supposed to be removed from the
+          main trunk but there was a glitch during a branch merge and
+          ther were still around, and obviously got carried over to
+          this branch.
+
+        * tao/IFR_Client/TAO_IFR_Client.dsp:
+
+          Turned on RTTI for the hand-crafted files.
+
+        Sun Mar 30 21:13:08 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_sequence.cpp:
+        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/rettype.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be_include/be_sequence.h:
+        * tao/CurrentC.h:
+        * tao/DomainC.h:
+        * tao/IOPC.h:
+        * tao/ObjectReferenceTemplateC.h:
+        * tao/Objref_VarOut_T.cpp:
+        * tao/PolicyC.h:
+        * tao/Policy_ForwardC.h:
+        * tao/PollableC.h:
+        * tao/PortableInterceptorC.h:
+        * tao/TAOC.h:
+        * tao/corbafwd.h:
+        * tao/BiDir_GIOP/BiDirPolicyC.cpp:
+        * tao/BiDir_GIOP/BiDirPolicyC.h:
+        * tao/BiDir_GIOP/BiDirPolicyC.i:
+        * tao/DynamicAny/DynCommon.cpp:
+        * tao/DynamicAny/DynCommon.h:
+        * tao/DynamicAny/DynamicAnyC.cpp:
+        * tao/DynamicAny/DynamicAnyC.h:
+        * tao/DynamicAny/DynamicAnyC.i:
+        * tao/IFR_Client/IFR_BaseC.cpp:
+        * tao/IFR_Client/IFR_BaseC.h:
+        * tao/IFR_Client/IFR_BaseC.i:
+        * tao/IFR_Client/IFR_Basic.pidl:
+        * tao/IFR_Client/IFR_BasicC.cpp:
+        * tao/IFR_Client/IFR_BasicC.h:
+        * tao/IFR_Client/IFR_BasicC.i:
+        * tao/IFR_Client/IFR_ComponentsC.cpp:
+        * tao/IFR_Client/IFR_ComponentsC.h:
+        * tao/IFR_Client/IFR_ComponentsC.i:
+        * tao/IFR_Client/IFR_Extended.pidl:
+        * tao/IFR_Client/IFR_ExtendedC.cpp:
+        * tao/IFR_Client/IFR_ExtendedC.h:
+        * tao/IFR_Client/IFR_ExtendedC.i:
+        * tao/IORManipulation/IORC.cpp:
+        * tao/IORManipulation/IORC.h:
+        * tao/IORManipulation/IORC.i:
+        * tao/IORTable/IORTableC.cpp:
+        * tao/IORTable/IORTableC.h:
+        * tao/IORTable/IORTableC.i:
+        * tao/Messaging/MessagingC.cpp:
+        * tao/Messaging/MessagingC.h:
+        * tao/Messaging/MessagingC.i:
+        * tao/Messaging/Messaging_No_ImplC.cpp:
+        * tao/Messaging/Messaging_No_ImplC.h:
+        * tao/Messaging/Messaging_No_ImplC.i:
+        * tao/Messaging/Messaging_RT_PolicyC.cpp:
+        * tao/Messaging/Messaging_RT_PolicyC.h:
+        * tao/Messaging/Messaging_RT_PolicyC.i:
+        * tao/Messaging/Messaging_SyncScope_PolicyC.cpp:
+        * tao/Messaging/Messaging_SyncScope_PolicyC.h:
+        * tao/Messaging/Messaging_SyncScope_PolicyC.i:
+        * tao/Messaging/TAO_ExtC.cpp:
+        * tao/Messaging/TAO_ExtC.h:
+        * tao/Messaging/TAO_ExtC.i:
+        * tao/PortableServer/Default_ORTC.cpp:
+        * tao/PortableServer/Default_ORTC.h:
+        * tao/PortableServer/Default_ORTC.i:
+        * tao/PortableServer/ImR_ActivatorC.cpp:
+        * tao/PortableServer/ImR_ActivatorC.h:
+        * tao/PortableServer/ImR_ActivatorC.i:
+        * tao/PortableServer/ImplRepoC.cpp:
+        * tao/PortableServer/ImplRepoC.h:
+        * tao/PortableServer/ImplRepoC.i:
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/PortableServerC.cpp:
+        * tao/PortableServer/PortableServerC.h:
+        * tao/PortableServer/PortableServerC.i:
+        * tao/RTCORBA/RTCORBAC.cpp:
+        * tao/RTCORBA/RTCORBAC.h:
+        * tao/RTCORBA/RTCORBAC.i:
+        * tao/RTPortableServer/RTPortableServerC.cpp:
+        * tao/RTPortableServer/RTPortableServerC.h:
+        * tao/RTPortableServer/RTPortableServerC.i:
+        * tao/TypeCodeFactory/TypeCodeFactoryC.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactoryC.h:
+        * tao/TypeCodeFactory/TypeCodeFactoryC.inl:
+
+          Regenerated all hand-crafted files and made fixes to 
+          code generation.
+
+        Sun Mar 30 12:32:33 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * tao/Array_VarOut_T.cpp:
+        * tao/Array_VarOut_T.inl:
+        * tao/ORB.cpp:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+
+          Fixed typos and cut and paste errors.
+
+        Sun Mar 30 02:50:01 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be_include/be_sequence.h:
+        * TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h:
+        * TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h:
+        * TAO_IDL/include/ast_type.h:
+        * tao/CONV_FRAMEC.cpp:
+        * tao/CONV_FRAMEC.h:
+        * tao/CONV_FRAMEC.i:
+        * tao/ClientRequestInfo.cpp:
+        * tao/CurrentC.h:
+        * tao/DomainC.cpp:
+        * tao/DomainC.h:
+        * tao/DomainC.i:
+        * tao/DynamicC.cpp:
+        * tao/DynamicC.h:
+        * tao/DynamicC.i:
+        * tao/IIOPC.cpp:
+        * tao/IIOPC.h:
+        * tao/IIOPC.i:
+        * tao/IOPC.cpp:
+        * tao/IOPC.h:
+        * tao/IOPC.i:
+        * tao/Messaging_PolicyValueC.cpp:
+        * tao/Messaging_PolicyValueC.h:
+        * tao/Messaging_PolicyValueC.i:
+        * tao/Messaging_SyncScopeC.cpp:
+        * tao/Messaging_SyncScopeC.h:
+        * tao/Messaging_SyncScopeC.i:
+        * tao/ORB.h:
+        * tao/ObjectIdListC.cpp:
+        * tao/ObjectIdListC.h:
+        * tao/ObjectIdListC.i:
+        * tao/ObjectReferenceTemplateC.cpp:
+        * tao/ObjectReferenceTemplateC.h:
+        * tao/ObjectReferenceTemplateC.i:
+        * tao/Object_KeyC.cpp:
+        * tao/Object_KeyC.h:
+        * tao/Object_KeyC.i:
+        * tao/OctetSeqC.cpp:
+        * tao/OctetSeqC.h:
+        * tao/OctetSeqC.i:
+        * tao/PolicyC.cpp:
+        * tao/PolicyC.h:
+        * tao/PolicyC.i:
+        * tao/Policy_ForwardC.cpp:
+        * tao/Policy_ForwardC.h:
+        * tao/Policy_ForwardC.i:
+        * tao/PollableC.cpp:
+        * tao/PollableC.h:
+        * tao/PollableC.i:
+        * tao/PortableInterceptorC.cpp:
+        * tao/PortableInterceptorC.h:
+        * tao/PortableInterceptorC.i:
+        * tao/Seq_VarOut_T.cpp:
+        * tao/Seq_VarOut_T.h:
+        * tao/Seq_VarOut_T.inl:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+        * tao/ServicesC.cpp:
+        * tao/ServicesC.h:
+        * tao/ServicesC.i:
+        * tao/StringSeqC.cpp:
+        * tao/StringSeqC.h:
+        * tao/StringSeqC.i:
+        * tao/TAOC.cpp:
+        * tao/TAOC.h:
+        * tao/TAOC.i:
+        * tao/TimeBaseC.cpp:
+        * tao/TimeBaseC.h:
+        * tao/TimeBaseC.i:
+        * tao/corbafwd.h:
+
+          Changed sequence generation to create a class that inherits
+          from the template class instead of just a typedef. Also 
+          regenerated hand-crafted files in the TAO library.
+
+        Fri Mar 28 19:12:40 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/CONV_FRAMEC.cpp:
+        * tao/CONV_FRAMEC.h:
+        * tao/CONV_FRAMEC.i:
+        * tao/CurrentC.cpp:
+        * tao/CurrentC.h:
+        * tao/CurrentC.i:
+        * tao/DomainC.cpp:
+        * tao/DomainC.h:
+        * tao/DomainC.i:
+        * tao/DynamicC.cpp:
+        * tao/DynamicC.h:
+        * tao/DynamicC.i:
+        * tao/GIOPC.cpp:
+        * tao/GIOPC.h:
+        * tao/GIOPC.i:
+        * tao/IIOPC.cpp:
+        * tao/IIOPC.h:
+        * tao/IIOPC.i:
+
+ 	  Regenerated some hand-crafted files.
+
+        * tao/corbafwd.h:
+
+	  Removed some forward _var and _out declarations.
+	  Since these are now typedefs, they can't be forward
+	  declared.
+
+        * tao/Seq_VarOut_T.inl:
+
+	  Fixed a typo.
+
+        * tao/GIOP.pidl:
+        * tao/IOP.pidl:
+
+	  Modified these to use CORBA::OctetSeq instead of
+	  regenerating each time.
+
+	Fri Mar 28 17:09:30 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AbstractBase.cpp:
+        * tao/Environment.cpp:
+        * tao/LocalObject.cpp:
+        * tao/NVList.cpp:
+        * tao/ORB.cpp:
+        * tao/ORB.h:
+        * tao/ORB.i:
+        * tao/Object.cpp:
+        * tao/Principal.cpp:
+        * tao/Pseudo_VarOut_T.h:
+        * tao/TAO.dsp:
+        * tao/Typecode.cpp:
+        * tao/ValueBase.cpp:
+        * tao/ValueFactory.cpp:
+        * tao/corbafwd.h:
+        * tao/DynamicInterface/Context.cpp:
+        * tao/DynamicInterface/Context.h:
+        * tao/DynamicInterface/Context.inl:
+        * tao/DynamicInterface/ExceptionList.h:
+        * tao/DynamicInterface/ExceptionList.inl:
+        * tao/DynamicInterface/Request.cpp:
+        * tao/DynamicInterface/Request.h:
+        * tao/DynamicInterface/Request.inl:
+        * tao/DynamicInterface/Server_Request.cpp:
+        * tao/DynamicInterface/Server_Request.h:
+
+	  Templatized _var and _out classes in
+	  DynamicInterface, added conditional explicit
+	  template instantiations, and updated project
+	  settings.
+
+	Fri Mar 28 000:58:31 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AbstractBase.h:
+        * tao/AbstractBase.inl:
+        * tao/Environment.h:
+        * tao/Environment.i:
+        * tao/LocalObject.h:
+        * tao/LocalObject.i:
+        * tao/NVList.h:
+        * tao/NVList.i:
+        * tao/Principal.cpp:
+        * tao/Principal.h:
+        * tao/Principal.i:
+        * tao/Pseudo_VarOut_T.h:
+        * tao/ValueBase.h:
+        * tao/ValueBase.i:
+        * tao/ValueFactory.h:
+        * tao/ValueFactory.i:
+        * tao/corbafwd.h:
+
+	  Converted the _var and _out classes of most of
+	  the CORBA pseudo objects to the new template
+	  format.
+
+        * tao/Pseudo_Value_Varout_T.cpp:
+        * tao/Pseudo_Value_Varout_T.h:
+        * tao/Pseudo_Value_Varout_T.inl:
+
+	  New template classes to typedef _var and _out
+	  implementations for ValueBase and ValueFactoryBase.
+
+        Thu Mar 27 18:55:41 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Sequence.cpp:
+        * tao/Sequence.h:
+
+          Cosmetic changes.
+
+        * tao/TAO.dsp:
+
+          Added newly created inline files to the project.
+
+        Thu Mar 27 03:00:53 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_predefined_type.cpp:
+        * TAO_IDL/be/be_predefined_type.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/fe/fe_init.cpp:
+        * TAO_IDL/include/ast_predefined_type.h:
+        * tao/Adapter.cpp:
+        * tao/Adapter.h:
+        * tao/Object.cpp:
+        * tao/Object.h:
+        * tao/Object.i:
+        * tao/Objref_VarOut_T.h:
+        * tao/Sequence.cpp:
+        * tao/Sequence.h:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+        * tao/Sequence_T.i:
+        * tao/TAO.dsp:
+        * tao/Typecode.h:
+        * tao/Typecode.i:
+        * tao/ValueBase.cpp:
+        * tao/ValueBase.h:
+        * tao/ValueBase.i:
+        * tao/Value_VarOut_T.h:
+        * tao/corba.h:
+        * tao/corbafwd.h:
+
+	  Finished templatizing of _var, _out and sequence
+	  classes, in TAO and in code generation.
+
+        * tao/Pseudo_VarOut_T.cpp:
+        * tao/Pseudo_VarOut_T.h:
+        * tao/Pseudo_VarOut_T.inl:
+
+	  New files for the _var and _out classes for
+	  CORBA::Object and CORBA::TypeCode.
+
+        * tao/Objref_VarOut_T.inl:
+        * tao/Value_VarOut_T.inl:
+
+	  New files, empty so far.
+
+        Wed Mar 26 18:23:46 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_component.cpp:
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_structure.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_union.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_structure_fwd.cpp:
+        * TAO_IDL/be/be_visitor_union_fwd.cpp:
+        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_ci.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/union_ci.cpp:
+        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp:
+        * TAO_IDL/be_include/be_component.h:
+        * TAO_IDL/be_include/be_helper.h:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_structure.h:
+        * TAO_IDL/be_include/be_type.h:
+        * TAO_IDL/be_include/be_union.h:
+        * TAO_IDL/be_include/be_valuetype.h:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+        * tao/VarOut_T.h:
+        * tao/VarOut_T.inl:
+
+          More changes toward code generation for _var, _out and sequence
+          template typedef, and conditional explicit template instantiation.
+
+        Wed Mar 26 01:06:24 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+
+  	  Added code generation for sequences of abstract
+	  interfaces.
+
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.i:
+
+	  Uninlined a few methods that were too long.
+
+        * tao/Transport.cpp:
+
+	  Cut out an ELSE block to get this to work with
+	  changes Phil Mesnier <mesnier_p@ociweb.com> has
+	  made to ACE - his corresponding TAO changes are
+	  blocked by the branch. This file will get in 
+	  sync again when the branch is merged.
+
+	Tue Mar 25 21:44:34 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.i:
+        * tao/Sequence_T.h:
+
+          Finished re-parametrizing the template sequence classes.
+
+	Mon Mar 24 20:27:09 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+
+          Changed call to AbstractBase constructor in initialization
+          list of abstract interfafce to use ACE_NESTED_CLASS,
+          similarly to non-abstract interfaces.
+
+	Sun Mar 23 23:42:37 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Array_VarOut_T.cpp:
+        * tao/Array_VarOut_T.h:
+        * tao/Array_VarOut_T.inl:
+        * tao/VarOut_T.cpp:
+        * tao/VarOut_T.h:
+        * tao/VarOut_T.inl:
+
+	  New files adding to the support of template-based
+	  _var and _out classes.
+
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+        * tao/Sequence_T.i:
+        * tao/TAO.dsp:
+        * tao/corba.h:
+        * TAO_IDLast/ast_type.cpp:
+        * TAO_IDLbe/be_interface.cpp:
+        * TAO_IDLbe/be_type.cpp:
+        * TAO_IDLbe/be_visitor_array/array_ch.cpp:
+        * TAO_IDLbe/be_visitor_array/array_ci.cpp:
+        * TAO_IDLbe/be_visitor_array/array_cs.cpp:
+        * TAO_IDLbe/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDLbe/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDLbe/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDLbe/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDLbe_include/be_interface.h:
+        * TAO_IDLbe_include/be_type.h:
+        * TAO_IDLbe_include/be_visitor_array/array_ch.h:
+        * TAO_IDLbe_include/be_visitor_array/array_ci.h:
+        * TAO_IDLinclude/ast_type.h:
+
+	  Other changes to support template _var and _out 
+	  classes.
+
+	Sat Mar 22 18:34:48 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/ObjectReferenceTemplateC.cpp:
+        * tao/ObjectReferenceTemplateC.h:
+        * tao/ObjectReferenceTemplateC.i:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+        * tao/Sequence_T.i:
+
+	  Changes to switch to template instantiation for valuetypes
+	  and sequences of valuetypes.
+
+	Fri Mar 21 02:33:00 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_valuetype.h:
+        * tao/Objref_VarOut_T.cpp:
+        * tao/Objref_VarOut_T.h:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+        * tao/TAO.dsp:
+        * tao/corba.h:
+
+	  Modified code generation for sequences of object references,
+	  added conditional explicit template instantiation, template
+	  valuetype _var and _out class generation.
+
+        * tao/Value_VarOut_T.cpp:
+        * tao/Value_VarOut_T.h:
+
+	  New files for the valuetype _var and _out classes.
+
+        Wed Mar 19 18:40:03 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_visitor_argument.cpp:
+        * TAO_IDL/be/be_visitor_array.cpp:
+        * TAO_IDL/be/be_visitor_component.cpp:
+        * TAO_IDL/be/be_visitor_interface.cpp:
+        * TAO_IDL/be/be_visitor_union_branch.cpp:
+        * TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp:
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp:
+        * TAO_IDL/be/be_visitor_root/cdr_op.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
+        * TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h:
+        * TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h:
+        * TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h:
+
+	  Changed code generation to use the generated struct helpers
+	  for interfaces, and removed much of the code generation for
+	  sequences, since they will eventually all be typedefs.
+
+        Wed Mar 19 09:38:00 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+        * TAO_IDL/be_include/be_type.h:
+
+	  Changes to code generation for sequences, _var and _out classes.
+	  This is just a start, lots more to come.
+
+        Tue Mar 18 21:42:03 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/DomainC.cpp:
+        * tao/DomainC.h:
+        * tao/DomainC.i:
+        * tao/PolicyC.cpp:
+        * tao/PolicyC.h:
+        * tao/Policy_ForwardC.cpp:
+        * tao/Policy_ForwardC.h:
+        * tao/Policy_ForwardC.i:
+        * tao/Sequence_T.cpp:
+        * tao/Sequence_T.h:
+        * tao/Sequence_T.i:
+        * tao/corba.h:
+
+	  Interim hacks to avoid build errors. All the
+	  hand-crafted files will eventually be regenerated.
+
+        * tao/Objref_VarOut_T.cpp:
+        * tao/Objref_VarOut_T.h:
+        * tao/Seq_VarOut_T.cpp:
+        * tao/Seq_VarOut_T.h:
+        * tao/Seq_VarOut_T.inl:
+
+	  New files, a start on templatizing all the
+	  _var and _out classes.
+
 Tue Apr 22 13:51:45 2003  Chad Elliott  <elliott_c@ociweb.com>
 
 	* orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp:
@@ -7,7 +948,7 @@ Tue Apr 22 13:51:45 2003  Chad Elliott  <elliott_c@ociweb.com>
 
 Tue Apr 22 14:26:31 2003  Irfan Pyarali  <irfan@oomworks.com>
 
-	* tao\RTPortableServer\RT_Servant_Dispatcher.cpp: 
+	* tao/RTPortableServer/RT_Servant_Dispatcher.cpp: 
 
 	  In pre_invoke_remote_request(),
 	  get_thread_CORBA_and_native_priority() was getting called
@@ -32,15 +973,15 @@ Tue Apr 22 12:35:44 2003  Simon McQueen  <sm@prismtechnologies.com>
 
 Mon Apr 21 14:20:00 2003  Irfan Pyarali  <irfan@oomworks.com>
 
-	* tests\RTCORBA\Profile_And_Endpoint_Selection\client.cpp:   
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp:   
 
 	  Removed extra ACE_CHECK_RETURN.
 
-	* tests\RTCORBA\check_supported_priorities.cpp: 
+	* tests/RTCORBA/check_supported_priorities.cpp: 
 
 	  Initialized <name> in sched_policy_name().
 	
-	* tests\POA\Nested_Non_Servant_Upcalls\Nested_Non_Servant_Upcalls.cpp: 
+	* tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp: 
 
 	  - Removed unused <servant_activation_succeeded>.
 
@@ -118,7 +1059,7 @@ Wed Apr 16 12:49:59 2003  Ossama Othman  <ossama@uci.edu>
 
 Wed Apr 16 13:44:47 2003  Irfan Pyarali  <irfan@oomworks.com>
 
-	* tao\params:
+	* tao/params:
 
 	  - thread_creation_flags: Added a new function that OR's together
 	  the scheduling scope and scheduling policy thread creation
@@ -130,7 +1071,7 @@ Wed Apr 16 13:44:47 2003  Irfan Pyarali  <irfan@oomworks.com>
 	  thread creation flag, and the ace_sched_policy() returns the
 	  ACE_SCHED_* flag.
 
-	* tao\RTCORBA\RT_ORB.cpp (modify_thread_scheduling_policy): Added
+	* tao/RTCORBA/RT_ORB.cpp (modify_thread_scheduling_policy): Added
 	  new static method that changes the scheduling policy of the
 	  calling thread to match the scheduling policy specified in the
 	  svc.conf file.  The priority of the calling thread will be set
@@ -145,7 +1086,7 @@ Wed Apr 16 13:44:47 2003  Irfan Pyarali  <irfan@oomworks.com>
 	  scope and policy when creating the thread, thus not needing to
 	  use this method.
 
-	* tao\RTCORBA\RT_ORBInitializer.cpp (TAO_RT_ORBInitializer): Undid
+	* tao/RTCORBA/RT_ORBInitializer.cpp (TAO_RT_ORBInitializer): Undid
 	  changes from:
 
 	  Wed Feb 12 00:19:58 UTC 2003  Craig Rodrigues <crodrigu@bbn.com>
@@ -166,14 +1107,14 @@ Wed Apr 16 13:44:47 2003  Irfan Pyarali  <irfan@oomworks.com>
 	  scope, please call the
 	  TAO_RT_ORB::modify_thread_scheduling_policy() static method.
 
-	* tao\RTCORBA\Thread_Pool.cpp (create_dynamic_threads):
+	* tao/RTCORBA/Thread_Pool.cpp (create_dynamic_threads):
 
 	  Changed code to use the new canonical thread_creation_flags()
 	  routine.
 
-	* tao\RTCORBA\Thread_Pool.cpp:
-	* tao\Exception.cpp:
-	* tao\corbafwd.h:
+	* tao/RTCORBA/Thread_Pool.cpp:
+	* tao/Exception.cpp:
+	* tao/corbafwd.h:
 
 	  Added TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE so that failures
 	  in thread creation for RTCORBA thread pools can be easily
@@ -181,164 +1122,164 @@ Wed Apr 16 13:44:47 2003  Irfan Pyarali  <irfan@oomworks.com>
 
 Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 
-	* tests\RTCORBA\Destroy_Thread_Pool\Destroy_Thread_Pool.cpp:
-	* tests\RTCORBA\Explicit_Binding\client.cpp:
-	* tests\RTCORBA\Explicit_Binding\server.cpp:
-	* tests\RTCORBA\ORB_init\ORB_init.cpp:
-	* tests\RTCORBA\Persistent_IOR\client.cpp:
-	* tests\RTCORBA\Persistent_IOR\server.cpp:
-	* tests\RTCORBA\Private_Connection\client.cpp:
-	* tests\RTCORBA\Private_Connection\server.cpp:
-	* tests\RTCORBA\RTMutex\server.cpp:
-	* tests\RTCORBA\Server_Declared\client.cpp:
-	* tests\RTCORBA\Server_Declared\server.cpp:
-	* tests\RTCORBA\Server_Protocol\client.cpp:
-	* tests\RTCORBA\Server_Protocol\server.cpp:
-	* tests\RTCORBA\Thread_Pool\client.cpp:
+	* tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp:
+	* tests/RTCORBA/Explicit_Binding/client.cpp:
+	* tests/RTCORBA/Explicit_Binding/server.cpp:
+	* tests/RTCORBA/ORB_init/ORB_init.cpp:
+	* tests/RTCORBA/Persistent_IOR/client.cpp:
+	* tests/RTCORBA/Persistent_IOR/server.cpp:
+	* tests/RTCORBA/Private_Connection/client.cpp:
+	* tests/RTCORBA/Private_Connection/server.cpp:
+	* tests/RTCORBA/RTMutex/server.cpp:
+	* tests/RTCORBA/Server_Declared/client.cpp:
+	* tests/RTCORBA/Server_Declared/server.cpp:
+	* tests/RTCORBA/Server_Protocol/client.cpp:
+	* tests/RTCORBA/Server_Protocol/server.cpp:
+	* tests/RTCORBA/Thread_Pool/client.cpp:
 
  	  Check for multiple priorities is not needed for this test since
 	  multiple priorities are not used in this test.
 
-	* tests\RTCORBA\Banded_Connections\client.cpp:
-	* tests\RTCORBA\Client_Protocol\client.cpp:
-	* tests\RTCORBA\Collocation\Collocation.cpp:
-	* tests\RTCORBA\Linear_Priority\client.cpp:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\client.cpp:
-	* tests\RTCORBA\Policy_Combinations\client.cpp:
-	* tests\RTCORBA\Profile_And_Endpoint_Selection\client.cpp:
-	* tests\RTCORBA\Thread_Pool\client.cpp:
-	* performance-tests\RTCorba\Thread_Pool\client.cpp:
+	* tests/RTCORBA/Banded_Connections/client.cpp:
+	* tests/RTCORBA/Client_Protocol/client.cpp:
+	* tests/RTCORBA/Collocation/Collocation.cpp:
+	* tests/RTCORBA/Linear_Priority/client.cpp:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp:
+	* tests/RTCORBA/Policy_Combinations/client.cpp:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp:
+	* tests/RTCORBA/Thread_Pool/client.cpp:
+	* performance-tests/RTCorba/Thread_Pool/client.cpp:
 
 	  Make all real-time invocations and priority changes from a
 	  real-time thread rather than the main thread.  This will allow
 	  the test to work on platforms like Linux with root as the user
 	  (and the appropriate svc.conf settings).
 
-	* tests\RTCORBA\Client_Propagated\server.cpp:
-	* tests\RTCORBA\Linear_Priority/server.cpp:
-	* tests\RTCORBA\MT_Client_Protocol_Priority/server.cpp:
-	* tests\RTCORBA\Policy_Combinations/server.cpp:
-	* tests\RTCORBA\Profile_And_Endpoint_Selection/server.cpp:
-	* tests\RTCORBA\Server_Declared/server.cpp:
-	* tests\RTCORBA\Thread_Pool/server.cpp:
+	* tests/RTCORBA/Client_Propagated/server.cpp:
+	* tests/RTCORBA/Linear_Priority/server.cpp:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp:
+	* tests/RTCORBA/Policy_Combinations/server.cpp:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp:
+	* tests/RTCORBA/Server_Declared/server.cpp:
+	* tests/RTCORBA/Thread_Pool/server.cpp:
 
 	  Handle all real-time upcall in a real-time thread rather than
 	  the main thread.  This will allow the test to work on platforms
 	  like Linux with root as the user (and the appropriate svc.conf
 	  settings).
 
-	* tests\RTCORBA\Banded_Connections\svc.conf:
-	* tests\RTCORBA\Client_Propagated\svc.conf:
-	* tests\RTCORBA\Client_Protocol\svc.conf:
-	* tests\RTCORBA\Explicit_Binding\svc.conf:
-	* tests\RTCORBA\Linear_Priority\svc.conf:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\server.conf:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\client.conf:
-	* tests\RTCORBA\Policy_Combinations\svc.conf:
-	* tests\RTCORBA\Profile_And_Endpoint_Selection\svc.conf:
-	* tests\RTCORBA\Server_Declared\svc.conf:
-	* tests\RTCORBA\Server_Protocol\server_iiop.conf:
-	* tests\RTCORBA\Server_Protocol\server_reverse.conf:
-	* tests\RTCORBA\Server_Protocol\server_reverse_nt.conf:
-	* tests\RTCORBA\Server_Protocol\server_shmiop.conf:
-	* tests\RTCORBA\Server_Protocol\server_uiop.conf:
-	* tests\RTCORBA\Thread_Pool\svc.conf:
+	* tests/RTCORBA/Banded_Connections/svc.conf:
+	* tests/RTCORBA/Client_Propagated/svc.conf:
+	* tests/RTCORBA/Client_Protocol/svc.conf:
+	* tests/RTCORBA/Explicit_Binding/svc.conf:
+	* tests/RTCORBA/Linear_Priority/svc.conf:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/server.conf:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/client.conf:
+	* tests/RTCORBA/Policy_Combinations/svc.conf:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf:
+	* tests/RTCORBA/Server_Declared/svc.conf:
+	* tests/RTCORBA/Server_Protocol/server_iiop.conf:
+	* tests/RTCORBA/Server_Protocol/server_reverse.conf:
+	* tests/RTCORBA/Server_Protocol/server_reverse_nt.conf:
+	* tests/RTCORBA/Server_Protocol/server_shmiop.conf:
+	* tests/RTCORBA/Server_Protocol/server_uiop.conf:
+	* tests/RTCORBA/Thread_Pool/svc.conf:
 
 	  Updated config file to remove SCHED_FIFO as the scheduling
 	  policy for normal, non-RT testing.
 
-	* tests\RTCORBA\Banded_Connections\svc.conf.xml:
-	* tests\RTCORBA\Client_Propagated\svc.conf.xml:
-	* tests\RTCORBA\Collocation\svc.conf.xml:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\svc.conf.xml:
-	* tests\RTCORBA\Server_Declared\svc.conf.xml:
-	* tests\RTCORBA\Thread_Pool\svc.conf.xml:
+	* tests/RTCORBA/Banded_Connections/svc.conf.xml:
+	* tests/RTCORBA/Client_Propagated/svc.conf.xml:
+	* tests/RTCORBA/Collocation/svc.conf.xml:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml:
+	* tests/RTCORBA/Server_Declared/svc.conf.xml:
+	* tests/RTCORBA/Thread_Pool/svc.conf.xml:
 
 	  Added missing file.
 
-	* tests\RTCORBA\Banded_Connections\server.conf:
-	* tests\RTCORBA\Banded_Connections\server.conf.xml:
-	* tests\RTCORBA\Destroy_Thread_Pool\svc.conf:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\server.conf:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\client.conf:
-	* tests\RTCORBA\ORB_init\svc.conf:
-	* tests\RTCORBA\Persistent_IOR\svc.conf:
-	* tests\RTCORBA\Policies\svc.conf:
-	* tests\RTCORBA\Private_Connection\svc.conf:
-	* tests\RTCORBA\RTMutex\svc.conf:
-	* tests\RTCORBA\Server_Declared\server.conf:
-	* tests\RTCORBA\Server_Declared\server.conf.xml:
-	* tests\RTCORBA\Server_Protocol\svc.conf:
-	* performance-tests\RTCorba\Thread_Pool\fudge_priorities.cpp:
+	* tests/RTCORBA/Banded_Connections/server.conf:
+	* tests/RTCORBA/Banded_Connections/server.conf.xml:
+	* tests/RTCORBA/Destroy_Thread_Pool/svc.conf:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/server.conf:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/client.conf:
+	* tests/RTCORBA/ORB_init/svc.conf:
+	* tests/RTCORBA/Persistent_IOR/svc.conf:
+	* tests/RTCORBA/Policies/svc.conf:
+	* tests/RTCORBA/Private_Connection/svc.conf:
+	* tests/RTCORBA/RTMutex/svc.conf:
+	* tests/RTCORBA/Server_Declared/server.conf:
+	* tests/RTCORBA/Server_Declared/server.conf.xml:
+	* tests/RTCORBA/Server_Protocol/svc.conf:
+	* performance-tests/RTCorba/Thread_Pool/fudge_priorities.cpp:
 
 	  These files are no longer used.
 
-	* tests\RTCORBA\Banded_Connections\server.cpp:
-	* tests\RTCORBA\Client_Propagated\client.cpp:
-	* tests\RTCORBA\Client_Propagated\server.cpp:
-	* tests\RTCORBA\Client_Protocol\client.cpp:
-	* tests\RTCORBA\Client_Protocol\server.cpp:
-	* tests\RTCORBA\Destroy_Thread_Pool\Destroy_Thread_Pool.cpp:
-	* tests\RTCORBA\Diffserv\server.cpp:
-	* tests\RTCORBA\Diffserv\client.cpp:
-	* tests\RTCORBA\Explicit_Binding\client.cpp:
-	* tests\RTCORBA\Explicit_Binding\server.cpp:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\client.cpp:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\server.cpp:
-	* tests\RTCORBA\Private_Connection\client.cpp:
-	* tests\RTCORBA\Private_Connection\server.cpp:
-	* tests\RTCORBA\RTMutex\server.cpp:
-	* tests\RTCORBA\Server_Declared\client.cpp:
-	* tests\RTCORBA\Server_Declared\server.cpp:
-	* tests\RTCORBA\Server_Protocol\client.cpp:
-	* tests\RTCORBA\Server_Protocol\server.cpp:
-	* tests\RTCORBA\Thread_Pool\client.cpp:
-	* tests\RTCORBA\Thread_Pool\server.cpp:
+	* tests/RTCORBA/Banded_Connections/server.cpp:
+	* tests/RTCORBA/Client_Propagated/client.cpp:
+	* tests/RTCORBA/Client_Propagated/server.cpp:
+	* tests/RTCORBA/Client_Protocol/client.cpp:
+	* tests/RTCORBA/Client_Protocol/server.cpp:
+	* tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp:
+	* tests/RTCORBA/Diffserv/server.cpp:
+	* tests/RTCORBA/Diffserv/client.cpp:
+	* tests/RTCORBA/Explicit_Binding/client.cpp:
+	* tests/RTCORBA/Explicit_Binding/server.cpp:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp:
+	* tests/RTCORBA/Private_Connection/client.cpp:
+	* tests/RTCORBA/Private_Connection/server.cpp:
+	* tests/RTCORBA/RTMutex/server.cpp:
+	* tests/RTCORBA/Server_Declared/client.cpp:
+	* tests/RTCORBA/Server_Declared/server.cpp:
+	* tests/RTCORBA/Server_Protocol/client.cpp:
+	* tests/RTCORBA/Server_Protocol/server.cpp:
+	* tests/RTCORBA/Thread_Pool/client.cpp:
+	* tests/RTCORBA/Thread_Pool/server.cpp:
 
 	  Errors should be indicated with a return value -1 and not 1.
 
-	* tests\RTCORBA\Banded_Connections\run_test.pl:
-	* tests\RTCORBA\Client_Propagated\run_test.pl:
-	* tests\RTCORBA\Collocation\run_test.pl:
-	* tests\RTCORBA\Linear_Priority\run_test.pl:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\run_test.pl:
-	* tests\RTCORBA\Policy_Combinations\run_test.pl:
-	* tests\RTCORBA\Profile_And_Endpoint_Selection\run_test.pl:
-	* tests\RTCORBA\Server_Declared\run_test.pl:
-	* tests\RTCORBA\Thread_Pool\run_test.pl:
+	* tests/RTCORBA/Banded_Connections/run_test.pl:
+	* tests/RTCORBA/Client_Propagated/run_test.pl:
+	* tests/RTCORBA/Collocation/run_test.pl:
+	* tests/RTCORBA/Linear_Priority/run_test.pl:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl:
+	* tests/RTCORBA/Policy_Combinations/run_test.pl:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl:
+	* tests/RTCORBA/Server_Declared/run_test.pl:
+	* tests/RTCORBA/Thread_Pool/run_test.pl:
 
 	  Removed incorrect error message.
 
-	* tests\RTCORBA\MT_Client_Protocol_Priority\client.cpp:
-	* tests\RTCORBA\Profile_And_Endpoint_Selection\client.cpp:
-	* examples\RTCORBA\Activity\Activity.cpp:
-	* orbsvcs\orbsvcs\Notify\ThreadPool_Task.cpp:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp:
+	* examples/RTCORBA/Activity/Activity.cpp:
+	* orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp:
 
 	  Use thread_creation_flags() to create invocation threads.
 
-	* tests\RTCORBA\Policy_Combinations\server.cpp:
+	* tests/RTCORBA/Policy_Combinations/server.cpp:
 
 	  Fixed the use of calling sched_policy() to calling
 	  ace_sched_policy().
 
-	* tests\RTCORBA\MT_Client_Protocol_Priority\svc.conf:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\run_test.pl:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl:
 
 	  No need for separate client.conf and server.conf files.  Options
 	  can be combined into one svc.conf file.
 
-	* tests\RTCORBA\Linear_Priority\client.cpp:
-	* tests\RTCORBA\Profile_And_Endpoint_Selection\client.cpp:
+	* tests/RTCORBA/Linear_Priority/client.cpp:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp:
 
 	  Gave the Worker_Threads a stack based instance of the
 	  Thread_Manager rather than using the singleton instance.
 
-	* tests\RTCORBA\Client_Propagated\client.cpp:
+	* tests/RTCORBA/Client_Propagated/client.cpp:
 
 	  Don't fix the scheduling policy value - use ace_sched_policy()
 	  to get the scheduling policy in use.
 
-	* tests\RTCORBA\check_supported_priorities.cpp:
+	* tests/RTCORBA/check_supported_priorities.cpp:
 
 	  - check_supported_priorities(): No need for conversions - simply
 	  use the new ace_sched_policy().
@@ -346,13 +1287,13 @@ Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 	  - sched_policy_name(): Added a helper routine to help convert
 	  scheduling policy constants into strings.
 
-	* tests\RTCORBA\Server_Declared\run_test.pl:
-	* tests\RTCORBA\MT_Client_Protocol_Priority\run_test.pl:
+	* tests/RTCORBA/Server_Declared/run_test.pl:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl:
 
 	  Fixed the priority values for Solaris since they were not in the
 	  SCHED_FIFO range for Solaris 5.7.
 
-	* performance-tests\RTCorba\Thread_Pool\client.cpp:
+	* performance-tests/RTCorba/Thread_Pool/client.cpp:
 
 	  - Removed the <continuous_workers_are_rt> options since all
 	  threads have to be of the same scope to get the mapping correct.
@@ -360,7 +1301,7 @@ Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 	  - No need to call fudge_priorities() since the main thread no
 	  longer makes real-time invocations.
 
-	* examples\RTCORBA\Activity\Activity.cpp:
+	* examples/RTCORBA/Activity/Activity.cpp:
 
 	  - No need to store <scope_policy> since it is available from ORB
 	  params.
@@ -369,8 +1310,8 @@ Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 
 	  - Simplified call to activate().
 
-	* orbsvcs\orbsvcs\Notify\CosNotify_Service:
-	* orbsvcs\orbsvcs\Notify\Properties:
+	* orbsvcs/orbsvcs/Notify/CosNotify_Service:
+	* orbsvcs/orbsvcs/Notify/Properties:
 
 	  - init_main_thread() was removed since it was not needed or
 	  used.
@@ -390,7 +1331,7 @@ Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 
 Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 
-	* tao\PortableServer\Object_Adapter (Non_Servant_Upcall):
+	* tao/PortableServer/Object_Adapter (Non_Servant_Upcall):
 
 	  Nested non-servant upcalls were not being handling correctly.
 	  Added <non_servant_upcall_nesting_level_> that counts the current
@@ -400,7 +1341,7 @@ Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 	  Thanks to Weston Markham <wmarkham@tissueinformatics.com> for
 	  pointing this out.  This fixes bug #1432.
 
-	* tests\POA\Nested_Non_Servant_Upcalls:
+	* tests/POA/Nested_Non_Servant_Upcalls:
 
 	  New test to ensure that nested non-servant upcalls are handled
 	  correctly.
@@ -427,7 +1368,7 @@ Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 
 Wed Apr 16 12:15:04 2003  Irfan Pyarali  <irfan@oomworks.com>
 
-	* tao\PortableServer\POA.h (server_protocol):
+	* tao/PortableServer/POA.h (server_protocol):
 
 	  Made this method virtual so that the correct derived real-time
 	  method gets invoked.  Thanks to Craig Rodrigues
@@ -3443,7 +4384,7 @@ Wed Mar 12 17:03:14 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
         * performance-tests/Cubit/TAO/IDL_Cubit/Makefile:
         * performance-tests/Cubit/TAO/MT_Cubit/Makefile:
 
-          Added separators '\' that are somehow left out in just
+          Added separators '/' that are somehow left out in just
           a few places by make depend.
 
 Wed Mar 12 13:35:47 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 82d739e03b3..76e6a6fe118 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -1031,6 +1031,25 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
       return;
     }
 
+  UTL_Scope *scope = i->defined_in ();
+  const char *prefix_holder = 0;
+
+  // If our prefix is empty, we check to see if an ancestor has one.
+  while (ACE_OS::strcmp (i->prefix (), "") == 0 && scope != 0)
+    {
+      AST_Decl *parent = ScopeAsDecl (scope);
+      prefix_holder = parent->prefix ();
+
+      // We have reached global scope.
+      if (prefix_holder == 0)
+        {
+          break;
+        }
+
+      i->prefix (ACE_const_cast (char *, prefix_holder));
+      scope = parent->defined_in ();
+    }
+
   // Fwd redefinition should be in the same scope, so local
   // lookup is all that's needed.
   AST_Decl *d = s->lookup_by_name_local (i->local_name (),
@@ -1040,6 +1059,24 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
 
   if (d != 0)
     {
+      scope = d->defined_in ();
+
+      // If the lookup prefix is empty, we check to see if an ancestor has one.
+      while (ACE_OS::strcmp (d->prefix (), "") == 0 && scope != 0)
+        {
+          AST_Decl *parent = ScopeAsDecl (scope);
+          prefix_holder = parent->prefix ();
+
+          // We have reached global scope.
+          if (prefix_holder == 0)
+            {
+              break;
+            }
+
+          d->prefix (ACE_const_cast (char *, prefix_holder));
+          scope = parent->defined_in ();
+        }
+
       // Full definition must have the same prefix as the forward declaration.
       if (ACE_OS::strcmp (i->prefix (), d->prefix ()) != 0)
         {
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
index d71d4e1cbdf..669915692aa 100644
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
@@ -180,6 +180,10 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
           ACE_NEW (id,
                    Identifier ("Object"));
           break;
+        case AST_PredefinedType::PT_value:
+          ACE_NEW (id,
+                   Identifier ("ValueBase"));
+          break;
         case AST_PredefinedType::PT_pseudo:
           ACE_NEW (id,
                    Identifier (n->last_component ()->get_string ()));
diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp
index 164238db621..8afe77aca4b 100644
--- a/TAO/TAO_IDL/be/be_component.cpp
+++ b/TAO/TAO_IDL/be/be_component.cpp
@@ -73,6 +73,14 @@ be_component::~be_component (void)
 }
 
 void
+be_component::redefine (AST_Interface *from)
+{
+  be_component *bc = be_component::narrow_from_decl (from);
+  this->var_out_seq_decls_gen_ = bc->var_out_seq_decls_gen_;
+  AST_Component::redefine (from);
+}
+
+void
 be_component::destroy ()
 {
   this->be_interface::destroy ();
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index 892719cc605..1ab6b3782ad 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -23,8 +23,8 @@
 #include "be_codegen.h"
 #include "idl_defines.h"
 
-ACE_RCSID (be, 
-           be_helper, 
+ACE_RCSID (be,
+           be_helper,
            "$Id$")
 
 static const char copyright[] =
@@ -297,16 +297,15 @@ TAO_OutStream::gen_endif (void)
 int
 TAO_OutStream::gen_ifdef_AHETI (void)
 {
-  *this << "\n\n#if !defined (TAO_USE_SEQUENCE_TEMPLATES)";
+  *this << "\n\n#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)";
 
   return 0;
 }
 
 int
-TAO_OutStream::gen_else_AHETI (void)
+TAO_OutStream::gen_elif_AHETI (void)
 {
-  *this << "\n#else /* TAO_USE_SEQUENCE_TEMPLATES */"
-        << be_nl;
+  *this << "\n\n#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)";
 
   return 0;
 }
@@ -314,7 +313,7 @@ TAO_OutStream::gen_else_AHETI (void)
 int
 TAO_OutStream::gen_endif_AHETI (void)
 {
-  *this << "\n\n#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ";
+  *this << "\n\n#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ ";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index c5d6b6d4b0e..e5dd83aa9f2 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -42,10 +42,13 @@ ACE_RCSID (be,
 
 // Default constructor.
 be_interface::be_interface (void)
-  : skel_count_ (0),
-    in_mult_inheritance_ (-1),
-    original_interface_ (0),
-    has_mixed_parentage_ (-1)
+  : var_out_seq_decls_gen_ (0)
+    , skel_count_ (0)
+    , in_mult_inheritance_ (-1)
+    , strategy_ (0)
+    , original_interface_ (0)
+    , has_mixed_parentage_ (-1)
+
 {
   ACE_NEW (this->strategy_,
            be_interface_default_strategy (this));
@@ -59,13 +62,18 @@ be_interface::be_interface (UTL_ScopedName *n,
                             long nih_flat,
                             idl_bool local,
                             idl_bool abstract)
-  : AST_Interface (n,
+  : be_scope (AST_Decl::NT_interface),
+    be_type (AST_Decl::NT_interface,
+             n),
+    AST_Interface (n,
                    ih,
                    nih,
                    ih_flat,
                    nih_flat,
                    local,
                    abstract),
+    AST_Type (AST_Decl::NT_interface,
+              n),
     AST_Decl (AST_Decl::NT_interface,
               n),
     UTL_Scope (AST_Decl::NT_interface),
@@ -74,7 +82,8 @@ be_interface::be_interface (UTL_ScopedName *n,
     skel_count_ (0),
     in_mult_inheritance_ (-1),
     original_interface_ (0),
-    has_mixed_parentage_ (-1)
+    has_mixed_parentage_ (-1),
+    var_out_seq_decls_gen_ (0)
 {
   ACE_NEW (this->strategy_,
            be_interface_default_strategy (this));
@@ -358,7 +367,8 @@ be_interface::relative_name (const char *localname,
 
 
 // Am I in some kind of a multiple inheritance?
-int be_interface::in_mult_inheritance (void)
+int
+be_interface::in_mult_inheritance (void)
 {
   if (this->in_mult_inheritance_ == -1)
     {
@@ -379,7 +389,8 @@ int be_interface::in_mult_inheritance (void)
   return this->in_mult_inheritance_;
 }
 
-void be_interface::in_mult_inheritance (int mi)
+void
+be_interface::in_mult_inheritance (int mi)
 {
   if (this->in_mult_inheritance_ == -1)
     {
@@ -387,6 +398,14 @@ void be_interface::in_mult_inheritance (int mi)
     }
 }
 
+void
+be_interface::redefine (AST_Interface *from)
+{
+  be_interface *bi = be_interface::narrow_from_decl (from);
+  this->var_out_seq_decls_gen_ = bi->var_out_seq_decls_gen_;
+  AST_Interface::redefine (from);
+}
+
 // Gen copy constructors,
 void
 be_interface::gen_copy_ctors (TAO_OutStream *os)
@@ -533,593 +552,75 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
     }
 }
 
-// Generate the var definition. If <interface_name> is not 0, generate
-// the var defn for that name. Otherwise, do it for the interface you
-// are visiting (this).
-int
-be_interface::gen_var_defn (char *interface_name)
-{
-  char namebuf [NAMEBUFSIZE];  // names
-
-  // Decide which name to use.
-  if (interface_name == 0)
-    {
-      interface_name = (char *) this->local_name ();
-    }
-
-  // Buffer with name of the var class.
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf,
-                   "%s_var",
-                   interface_name);
-
-  TAO_OutStream *ch = tao_cg->client_header ();
-
-  // Generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // Note the private inheritance from TAO_Base_var to emphasize that
-  // a given _var does not satisfy the IS-A relationship.  _var
-  // classes are merely IMPLEMENTED-IN-TERMS-OF TAO_Base_var.  This
-  // also invalidates assignments like:
-  //    Foo_var v;
-  //    TAO_Base_var * t = &v;
-  *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf
-      << " : private TAO_Base_var" << be_nl;
-  *ch << "{" << be_nl;
-  *ch << "public:" << be_idt_nl;
-
-  // Default constructor.
-  *ch << namebuf << " (void); // default constructor" << be_nl;
-  *ch << namebuf << " (" << interface_name
-      << "_ptr p)"
-      << " : ptr_ (p) {} " << be_nl;
-
-  // Copy constructor.
-  *ch << namebuf << " (const " << namebuf
-      << " &); // copy constructor" << be_nl;
-
-  // Destructor.
-  *ch << "~" << namebuf
-      << " (void); // destructor" << be_nl;
-  *ch << be_nl;
-
-  // Assignment operator from a pointer.
-  *ch << namebuf << " &operator= (" << interface_name
-      << "_ptr);" << be_nl;
-
-  // Assignment from _var.
-  *ch << namebuf << " &operator= (const " << namebuf
-      << " &);" << be_nl;
-
-  // Arrow operator
-  *ch << interface_name << "_ptr operator-> (void) const;" << be_nl;
-  *ch << be_nl;
-
-  // Other extra types (cast operators, [] operator, and others).
-  *ch << "operator const " << interface_name
-      << "_ptr &() const;" << be_nl;
-  *ch << "operator " << interface_name
-      << "_ptr &();" << be_nl;
-
-  *ch << "// in, inout, out, _retn " << be_nl;
-  // The return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type.
-  *ch << interface_name << "_ptr in (void) const;" << be_nl;
-  *ch << interface_name << "_ptr &inout (void);" << be_nl;
-  *ch << interface_name << "_ptr &out (void);" << be_nl;
-  *ch << interface_name << "_ptr _retn (void);" << be_nl;
-
-  // Generate an additional member function that returns the
-  // underlying pointer.
-  *ch << interface_name << "_ptr ptr (void) const;" << be_nl << be_nl;
-
-  // Hooks for non-defined forward declared interfaces.
-  *ch << "// Hooks used by template sequence and object manager classes"
-      << be_nl
-      << "// for non-defined forward declared interfaces." << be_nl
-      << "static " << interface_name
-      << "_ptr tao_duplicate ("
-      << interface_name << "_ptr);" << be_nl
-      << "static void tao_release (" << interface_name
-      << "_ptr);" << be_nl
-      << "static " << interface_name
-      << "_ptr tao_nil (void);" << be_nl
-      << "static " << interface_name
-      << "_ptr tao_narrow (" << be_idt << be_idt_nl;
-
-  if (this->is_abstract ())
-    {
-      *ch << "CORBA::AbstractBase *" << be_nl;
-    }
-  else if (this->node_type () == AST_Decl::NT_component)
-    {
-      *ch << "Components::CCMObject *" << be_nl;
-    }
-  else
-    {
-      *ch << "CORBA::Object *" << be_nl;
-    }
-
-  *ch << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  if (this->is_abstract ())
-    {
-      *ch << "static CORBA::AbstractBase *";
-    }
-  else if (this->node_type () == AST_Decl::NT_component)
-    {
-      *ch << "Components::CCMObject *";
-    }
-  else
-    {
-      *ch << "static CORBA::Object *";
-    }
-
-  *ch << " tao_upcast (void *);" << be_uidt_nl << be_nl;
-
-  // Private.
-  *ch << "private:" << be_idt_nl;
-  *ch << interface_name << "_ptr ptr_;" << be_nl;
-  *ch << "// Unimplemented - prevents widening assignment." << be_nl;
-  *ch << interface_name << "_var (const TAO_Base_var & rhs);" << be_nl;
-  *ch << interface_name << "_var & operator= (const TAO_Base_var & rhs);"
-      << be_uidt_nl;
-
-  *ch << "};";
-
-  return 0;
-}
-
-// Implementation of the _var class. All of these get generated in the
-// inline file.
-// If the argument is 0, then use the name in <this>, otherwise use
-// the name given. Just making the class more useful.
-int
-be_interface::gen_var_impl (char *interface_local_name,
-                            char *interface_full_name)
+// Generate the forward declarations and static methods used by the
+// interface _var and _out template classes, as well as by the
+// template sequence classes for object references.
+void
+be_interface:: gen_var_out_seq_decls (void)
 {
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  // Decide on the names to use.
-  // Even if one argument is 0, there is no point using the
-  // arguments. Let us then use the name in this node.
-  if (interface_local_name == 0 || interface_full_name == 0)
+  if (this->var_out_seq_decls_gen_ == 1)
     {
-      interface_local_name = (char *) this->local_name ();
-      interface_full_name = (char *) this->full_name ();
+      return;
     }
 
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
+  const char *lname = this->local_name ();
+  TAO_OutStream *os = tao_cg->client_header ();
 
-  ACE_OS::sprintf (fname,
-                   "%s_var",
-                   interface_full_name);
-
-  ACE_OS::memset (lname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname,
-                   "%s_var",
-                   interface_local_name);
-
-  TAO_OutStream *cs = tao_cg->client_stubs ();
-
-  *cs << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
-  // Generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we
-  // account for over here.
-
-  *cs << be_nl << be_nl
-      << "// *************************************************************"
-      << be_nl
-      << "// " << fname << be_nl
-      << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Default constructor.
-  *cs << fname << "::" << lname
-      << " (void)" << be_idt_nl;
-  *cs << ": ptr_ (" << interface_local_name
-      << "::_nil ())" << be_uidt_nl;
-  *cs << "{}" << be_nl << be_nl;
-
-  // The additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  *cs << "::" << interface_full_name
-      << "_ptr" << be_nl;
-  *cs << fname << "::ptr (void) const" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *cs << fname << "::" << lname
-      << " (const ::" << interface_full_name
-      << "_var &p)" << be_nl;
-  *cs << "  : TAO_Base_var ()," << be_nl;
-  *cs << "    ptr_ (" << interface_local_name
-      << "::_duplicate (p.ptr ()))" << be_nl;
-  *cs << "{}" << be_nl << be_nl;
-
-  // Destructor.
-  *cs << fname << "::~" << lname
-      << " (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "CORBA::release (this->ptr_);" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Assignment operator.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (" << interface_local_name
-      << "_ptr p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "CORBA::release (this->ptr_);" << be_nl;
-  *cs << "this->ptr_ = p;" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Assignment operator from _var.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (const "
-      << "::" << interface_full_name
-      << "_var &p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "if (this != &p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "CORBA::release (this->ptr_);" << be_nl;
-  *cs << "this->ptr_ = ::" << interface_full_name
-      << "::_duplicate (p.ptr ());" << be_uidt_nl;
-  *cs << "}" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Other extra methods - cast operator ().
-  *cs << fname << "::operator const ::" << interface_full_name
-      << "_ptr &() const // cast" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << fname << "::operator ::" << interface_full_name
-      << "_ptr &() // cast " << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // operator->
-  *cs << "::" << interface_full_name
-      << "_ptr" << be_nl;
-  *cs << fname << "::operator-> (void) const" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // in, inout, out, and _retn
-  *cs << "::" << interface_full_name
-      << "_ptr" << be_nl;
-  *cs << fname << "::in (void) const" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << "::" << interface_full_name
-      << "_ptr &" << be_nl;
-  *cs << fname << "::inout (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << "::" << interface_full_name
-      << "_ptr &" << be_nl;
-  *cs << fname << "::out (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "CORBA::release (this->ptr_);" << be_nl;
-  *cs << "this->ptr_ = ::" << interface_full_name
-      << "::_nil ();" << be_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << "::" << interface_full_name
-      << "_ptr" << be_nl;
-  *cs << fname << "::_retn (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "// yield ownership of managed obj reference" << be_nl;
-  *cs << "::" << interface_full_name
-      << "_ptr val = this->ptr_;" << be_nl;
-  *cs << "this->ptr_ = ::" << interface_full_name
-      << "::_nil ();" << be_nl;
-  *cs << "return val;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Hooks for the flat name global functions used by references to
-  // non-defined interfaces.
-  *cs << "::" << interface_full_name
-      << "_ptr" << be_nl
-      << fname << "::tao_duplicate ("
-      << interface_local_name << "_ptr p)" << be_nl
-      << "{" << be_idt_nl
-      << "return ::" << interface_full_name
-      << "::_duplicate (p);"
-      << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *cs << "void" << be_nl
-      << fname << "::tao_release (" << interface_local_name
-      << "_ptr p)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::release (p);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *cs << "::" << interface_full_name << "_ptr" << be_nl
-      << fname << "::tao_nil (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return ::" << interface_full_name
-      << "::_nil ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *cs << "::" << interface_full_name << "_ptr" << be_nl
-      << fname << "::tao_narrow (" << be_idt << be_idt_nl;
-
-  if (this->is_abstract ())
-    {
-      *cs << "CORBA::AbstractBase *p" << be_nl;
-    }
-  else if (this->node_type () == AST_Decl::NT_component)
-    {
-      *cs << "Components::CCMObject *p" << be_nl;
-    }
-  else
-    {
-      *cs << "CORBA::Object *p" << be_nl;
-    }
 
-  *cs << "ACE_ENV_ARG_DECL" << be_uidt_nl
-      << ")" << be_uidt_nl
+  // Generate the ifdefined macro for this interface.
+  os->gen_ifdef_macro (this->flat_name (),
+                       "odds_n_ends");
+
+  *os << be_nl << be_nl
+      << "class " << lname << ";" << be_nl
+      << "typedef " << lname << " *" << lname << "_ptr;" << be_nl
+      << "struct tao_" << lname << "_life;" << be_nl << be_nl
+      << "typedef" << be_idt_nl
+      << "TAO_Objref_Var_T<" << be_idt << be_idt_nl
+      << lname << "," << be_nl
+      << "tao_" << lname << "_life" << be_uidt_nl
+      << ">" << be_uidt_nl
+      << lname << "_var;" << be_uidt_nl << be_nl
+      << "typedef" << be_idt_nl
+      << "TAO_Objref_Out_T<" << be_idt << be_idt_nl
+      << lname << "," << be_nl
+      << "tao_" << lname << "_life" << be_uidt_nl
+      << ">" << be_uidt_nl
+      << lname << "_out;" << be_uidt;
+
+  *os << be_nl << be_nl
+      << "struct " << be_global->stub_export_macro ()
+      << " tao_" << lname << "_life" << be_nl
       << "{" << be_idt_nl
-      << "return ::" << interface_full_name
-      << "::_narrow (p ACE_ENV_ARG_PARAMETER);"
-      << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  if (this->is_abstract ())
-    {
-      *cs << "CORBA::AbstractBase *" << be_nl;
-    }
-  else if (this->node_type () == AST_Decl::NT_component)
+      << "static " << lname << "_ptr tao_duplicate ("
+      << lname << "_ptr);" << be_nl
+      << "static void tao_release (" << lname << "_ptr);" << be_nl
+      << "static " << lname << "_ptr tao_nil (void);" << be_nl
+      << "static CORBA::Boolean tao_marshal (" << be_idt << be_idt_nl
+      << lname << "_ptr," << be_nl
+      << "TAO_OutputCDR &" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
+      << "};";
+
+  if (! this->is_abstract ())
     {
-      *cs << "Components::CCMObject *" << be_nl;
-    }
-  else
-    {
-      *cs << "CORBA::Object *" << be_nl;
-    }
-
-  *cs << fname << "::tao_upcast (void *src)" << be_nl
-      << "{" << be_idt_nl
-      << interface_local_name << " **tmp =" << be_idt_nl
-      << "ACE_static_cast (" << interface_local_name
-      << " **, src);"
-      << be_uidt_nl
-      << "return *tmp;" << be_uidt_nl
-      << "}";
-
-  return 0;
-}
-
-// Generate the out definition. If <interface_name> is not 0, generate
-// the out defn for that name. Otherwise, do it for the interface you
-// are visiting (this).
-int
-be_interface::gen_out_defn (char *interface_name)
-{
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  // Decide which name to use.
-  if (interface_name == 0)
-    interface_name = (char *) this->local_name ();
-
-  // Create the buffer with the name of the out class.
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf,
-                   "%s_out",
-                   interface_name);
-
-  TAO_OutStream *ch = tao_cg->client_header ();
-
-  *ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // Generate the out definition (always in the client header)
-  *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << be_nl;
-  *ch << "{" << be_nl;
-  *ch << "public:" << be_idt_nl;
-
-  // No default constructor.
-
-  // Constructor from a pointer.
-  *ch << namebuf << " (" << interface_name
-      << "_ptr &);" << be_nl;
-
-  // Constructor from a _var &.
-  *ch << namebuf << " (" << interface_name
-      << "_var &);" << be_nl;
-
-  // Constructor from a _out &.
-  *ch << namebuf << " (const " << namebuf
-      << " &);" << be_nl;
-
-  // Assignment operator from a _out &
-  *ch << namebuf << " &operator= (const " << namebuf
-      << " &);" << be_nl;
-
-  // Assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators.
-  // Only interface allows assignment from var &.
-  *ch << namebuf << " &operator= (const " << interface_name
-      << "_var &);" << be_nl;
-  *ch << namebuf << " &operator= (" << interface_name
-      << "_ptr);" << be_nl;
-
-  // Cast.
-  *ch << "operator " << interface_name
-      << "_ptr &();" << be_nl;
-
-  // ptr fn
-  *ch << interface_name << "_ptr &ptr (void);" << be_nl;
-
-  // operator ->
-  *ch << interface_name << "_ptr operator-> (void);" << be_uidt_nl << be_nl;
-
-  *ch << "private:" << be_idt_nl;
-  *ch << interface_name << "_ptr &ptr_;" << be_uidt_nl;
-
-  *ch << "};";
-
-  return 0;
-}
-
-
-// Generate the out class definition. If <interface_name> is not 0,
-// generate the out defn for that name. Otherwise, do it for the
-// interface you are visiting (this).
-int
-be_interface::gen_out_impl (char *interface_local_name,
-                            char *interface_full_name)
-{
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  // Even if one argument is 0, there is no point using the
-  // arguments. Let us then use the name in this node.
-  if (interface_local_name == 0 || interface_full_name == 0)
-    {
-      interface_local_name = (char *) local_name ();
-      interface_full_name = (char *) this->full_name ();
+      *os << be_nl << be_nl
+          << "struct " << be_global->stub_export_macro ()
+          << " tao_" << lname << "_cast" << be_nl
+          << "{" << be_idt_nl
+          << "static " << lname << "_ptr tao_narrow (" << be_idt << be_idt_nl
+          << "CORBA::Object_ptr"
+          << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl
+          << ");" << be_uidt_nl
+          << "static CORBA::Object_ptr tao_upcast (void *);" << be_uidt_nl
+          << "};";
     }
 
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", interface_full_name);
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", interface_local_name);
+  os->gen_endif ();
 
-  TAO_OutStream *cs = tao_cg->client_stubs ();
-
-  // Generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *cs << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  *cs << be_nl << be_nl
-      << "// *************************************************************"
-      << be_nl
-      << "// " << fname << be_nl
-      << "// *************************************************************";
-
-      // Constructor from a _ptr.
-  *cs << be_nl << be_nl
-      << fname << "::" << lname
-      << " ("  << interface_local_name
-      << "_ptr &p)" << be_nl;
-  *cs << "  : ptr_ (p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "this->ptr_ = ::" << interface_full_name
-      << "::_nil ();" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Constructor from _var &.
-  *cs << fname << "::" << lname
-      << " (" << interface_local_name
-      << "_var &p)" << be_nl;
-  *cs << "  : ptr_ (p.out ())" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "CORBA::release (this->ptr_);" << be_nl;
-  *cs << "this->ptr_ = ::" << interface_full_name
-      << "::_nil ();" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *cs << fname << "::" << lname
-      << " (const ::" << interface_full_name
-      << "_out &p)" << be_nl;
-  *cs << "  : ptr_ (ACE_const_cast (" << interface_local_name
-      << "_out &, p).ptr_)" << be_nl;
-  *cs << "{}" << be_nl << be_nl;
-
-  // Assignment operator from _out &.
-  *cs << "::" << fname
-      << " &" << be_nl;
-  *cs << fname << "::operator= (const ::" << interface_full_name
-      << "_out &p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "this->ptr_ = ACE_const_cast (" << interface_local_name
-      << "_out&, p).ptr_;" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Assignment operator from _var.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (const ::" << interface_full_name
-      << "_var &p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "this->ptr_ = ::" << interface_full_name
-      << "::_duplicate (p.ptr ());" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Assignment operator from _ptr.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (" << interface_local_name
-      << "_ptr p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "this->ptr_ = p;" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Other extra methods - cast operator ().
-  *cs << fname << "::operator ::" << interface_full_name
-      << "_ptr &() // cast" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // ptr function.
-  *cs << "::" << interface_full_name
-      << "_ptr &" << be_nl;
-  *cs << fname << "::ptr (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // operator->
-  *cs << "::" << interface_full_name
-      << "_ptr" << be_nl;
-  *cs << fname << "::operator-> (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-  *cs << "}";
-
-  return 0;
+  this->var_out_seq_decls_gen_ = 1;
 }
 
 // ****************************************************************
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index 7c092c7f5cd..0e157a1b415 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -49,6 +49,15 @@ be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t,
 
   // Compute the flattened fully scoped name.
   this->AST_Decl::compute_flat_name ();
+
+  if (t == AST_PredefinedType::PT_object)
+    {
+      this->fwd_helper_name_ = "CORBA::tao_Object";
+    }
+  else if (t == AST_PredefinedType::PT_value)
+    {
+      this->fwd_helper_name_ = "CORBA::tao_ValueBase";
+    }
 }
 
 // Overriden method.
@@ -133,6 +142,10 @@ be_predefined_type::compute_tc_name (void)
       ACE_NEW (id,
                Identifier ("_tc_Object"));
     break;
+    case AST_PredefinedType::PT_value:
+      ACE_NEW (id,
+               Identifier ("_tc_ValueBase"));
+    break;
     case AST_PredefinedType::PT_pseudo:
       {
         char tcname [100];
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 758d442bd1f..15d58887b74 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -24,9 +24,12 @@
 #include "be_interface.h"
 #include "be_interface_fwd.h"
 #include "be_predefined_type.h"
+#include "be_field.h"
 #include "be_visitor.h"
+#include "be_helper.h"
 #include "utl_identifier.h"
 #include "idl_defines.h"
+#include "nr_extern.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (be, 
@@ -35,7 +38,8 @@ ACE_RCSID (be,
 
 
 be_sequence::be_sequence (void)
-  : mt_ (be_sequence::MNG_UNKNOWN)
+  : mt_ (be_sequence::MNG_UNKNOWN),
+    field_node_ (0)
 {
   // Always the case.
   this->has_constructor (I_TRUE);
@@ -66,7 +70,8 @@ be_sequence::be_sequence (AST_Expression *v,
               I_TRUE),
     COMMON_Base (t->is_local () || local,
                  abstract),
-    mt_ (be_sequence::MNG_UNKNOWN)
+    mt_ (be_sequence::MNG_UNKNOWN),
+    field_node_ (0)
 {
   // Always the case.
   this->has_constructor (I_TRUE);
@@ -77,7 +82,7 @@ char *
 be_sequence::gen_name (void)
 {
   char namebuf [NAMEBUFSIZE];
-  be_type *bt = 0; // Base type.
+  be_type *bt = 0;
 
   // Reset the buffer.
   ACE_OS::memset (namebuf,
@@ -96,6 +101,10 @@ be_sequence::gen_name (void)
                         0);
     }
 
+  // If this is non-zero, add its local name to the generated name,
+  // for uniqueness.
+  be_field *fn = this->field_node_;
+
   if (bt->node_type () == AST_Decl::NT_sequence)
     {
       // Our base type is an anonymous sequence.
@@ -110,8 +119,7 @@ be_sequence::gen_name (void)
                             0);
         }
 
-      // Some platforms define IDL sequences as template classes
-      // and some do not. If the nested sequence were defined in
+      // If the nested sequence were defined in
       // the scope of the enclosing sequence, we would have to
       // not only define the nested class in two places, but also
       // deal with the fact that, for the template classes, the
@@ -122,15 +130,18 @@ be_sequence::gen_name (void)
       UTL_Scope *parent = this->defined_in ();
       seq->set_defined_in (parent);
       parent->add_sequence (seq);
+
       ACE_OS::sprintf (namebuf,
-                       "_tao_seq_%s",
-                       seq->gen_name ());
+                       "_tao_seq_%s_%s",
+                       seq->gen_name (),
+                       fn ? fn->local_name ()->get_string () : "");
     }
   else
     {
       ACE_OS::sprintf (namebuf,
-                       "_tao_seq_%s",
-                       bt->local_name ()->get_string ());
+                       "_tao_seq_%s_%s",
+                       bt->local_name ()->get_string (),
+                       fn ? fn->local_name ()->get_string () : "");
     }
 
   // Append the size (if any).
@@ -263,17 +274,20 @@ be_sequence::managed_type (void)
               be_predefined_type::narrow_from_decl (prim_type);
             AST_PredefinedType::PredefinedType pt = bpd->pt ();
 
-            if (pt == AST_PredefinedType::PT_pseudo)
+            switch (pt)
               {
-                this->mt_ = be_sequence::MNG_PSEUDO;
-              }
-            else if (pt == AST_PredefinedType::PT_object)
-              {
-                this->mt_ = be_sequence::MNG_OBJREF;
-              }
-            else
-              {
-                this->mt_ = be_sequence::MNG_NONE;
+                case AST_PredefinedType::PT_pseudo:
+                  this->mt_ = be_sequence::MNG_PSEUDO;
+                  break;
+                case AST_PredefinedType::PT_object:
+                  this->mt_ = be_sequence::MNG_PSEUDO;
+                  break;
+                case AST_PredefinedType::PT_value:
+                  this->mt_ = be_sequence::MNG_VALUE;
+                  break;
+                default:
+                  this->mt_ = be_sequence::MNG_NONE;
+                  break;
               }
           }
           break;
@@ -460,6 +474,202 @@ be_sequence::instance_name ()
   return namebuf;
 }
 
+int
+be_sequence::gen_base_class_name (TAO_OutStream *os,
+                                  AST_Decl *elem_scope)
+{
+  be_type *elem = be_type::narrow_from_decl (this->base_type ());
+
+  // Generate the appropriate base class type.
+  switch (this->managed_type ())
+    {
+    case be_sequence::MNG_OBJREF:
+      if (this->unbounded ())
+        {
+          *os << "TAO_Unbounded_Object_Sequence<" << be_idt << be_idt_nl
+              << elem->nested_type_name (elem_scope) << "," << be_nl;
+          *os << elem->nested_type_name (elem_scope, "_var") << "," << be_nl
+              << this->smart_fwd_helper_name (elem_scope, elem) 
+              << "_life," << be_nl
+              << this->smart_fwd_helper_name (elem_scope, elem) 
+              << "_cast" << be_uidt_nl
+              << ">" << be_uidt;
+        }
+      else
+        {
+          *os << "TAO_Bounded_Object_Sequence<" << be_idt << be_idt_nl
+              << elem->nested_type_name (elem_scope) << "," << be_nl;
+          *os << elem->nested_type_name (elem_scope, "_var") << "," << be_nl
+              << this->smart_fwd_helper_name (elem_scope, elem) 
+              << "_life," << be_nl
+              << this->smart_fwd_helper_name (elem_scope, elem) 
+              << "_cast," << be_nl
+              << this->max_size ()->ev ()->u.ulval << be_uidt_nl
+              << ">" << be_uidt;
+        }
+
+      break;
+    case be_sequence::MNG_ABSTRACT:
+      if (this->unbounded ())
+        {
+          *os << "TAO_Unbounded_Abstract_Sequence<" << be_idt << be_idt_nl
+              << elem->nested_type_name (elem_scope) << "," << be_nl;
+          *os << elem->nested_type_name (elem_scope, "_var") << "," << be_nl
+              << this->smart_fwd_helper_name (elem_scope, elem) 
+              << "_life" << be_uidt_nl
+              << ">" << be_uidt;
+        }
+      else
+        {
+          *os << "TAO_Bounded_Abstract_Sequence<" << be_idt << be_idt_nl
+              << elem->nested_type_name (elem_scope) << "," << be_nl;
+          *os << elem->nested_type_name (elem_scope, "_var") << "," << be_nl
+              << this->smart_fwd_helper_name (elem_scope, elem) 
+              << "_life," << be_nl
+              << this->max_size ()->ev ()->u.ulval << be_uidt_nl
+              << ">" << be_uidt;
+        }
+
+      break;
+    case be_sequence::MNG_PSEUDO:
+      if (this->unbounded ())
+        {
+          *os << "TAO_Unbounded_Pseudo_Sequence<" << be_idt << be_idt_nl
+              << elem->nested_type_name (elem_scope) << "," << be_nl
+              << elem->name () << "_var" << be_uidt_nl
+              << ">" << be_uidt;
+        }
+      else
+        {
+          *os << "TAO_Bounded_Pseudo_Sequence<" << be_idt << be_idt_nl
+              << elem->nested_type_name (elem_scope) << "," << be_nl
+              << elem->name () << "_var," << be_nl
+              << this->max_size ()->ev ()->u.ulval << be_uidt_nl
+              << ">" << be_uidt;
+        }
+
+      break;
+    case be_sequence::MNG_VALUE:
+      if (this->unbounded ())
+        {
+          *os << "TAO_Unbounded_Valuetype_Sequence<" << be_idt << be_idt_nl
+              << elem->nested_type_name (elem_scope) << "," << be_nl;
+          *os << elem->nested_type_name (elem_scope, "_var") << "," << be_nl
+              << this->smart_fwd_helper_name (elem_scope, elem) 
+              << "_life" << be_uidt_nl
+              << ">" << be_uidt;
+        }
+      else
+        {
+          *os << "TAO_Bounded_Valuetype_Sequence<" << be_idt << be_idt_nl
+              << elem->nested_type_name (elem_scope) << "," << be_nl;
+          *os << elem->nested_type_name (elem_scope, "_var") << "," << be_nl
+              << this->smart_fwd_helper_name (elem_scope, elem) 
+              << "_life," << be_nl
+              << this->max_size ()->ev ()->u.ulval << be_uidt_nl
+              << ">" << be_uidt;
+        }
+
+      break;
+    case be_sequence::MNG_STRING:
+      if (this->unbounded ())
+        {
+          *os << "TAO_Unbounded_String_Sequence";
+        }
+      else
+        {
+          *os << "TAO_Bounded_String_Sequence<"
+              << this->max_size ()->ev ()->u.ulval << ">";
+        }
+
+      break;
+    case be_sequence::MNG_WSTRING:
+      if (this->unbounded ())
+        {
+          *os << "TAO_Unbounded_WString_Sequence";
+        }
+      else
+        {
+          *os << "TAO_Bounded_WString_Sequence<"
+              << this->max_size ()->ev ()->u.ulval << ">";
+        }
+
+      break;
+    default: // Not a managed type.
+      switch (elem->base_node_type ())
+        {
+          case AST_Decl::NT_array:
+            if (this->unbounded ())
+              {
+                *os << "TAO_Unbounded_Array_Sequence<"
+                    << be_idt << be_idt_nl
+                    << elem->nested_type_name (elem_scope) << "," << be_nl
+                    << this->smart_fwd_helper_name (elem_scope, elem) 
+                    << "_life" << be_uidt_nl
+                    << ">" << be_uidt;
+              }
+            else
+              {
+                *os << "TAO_Bounded_Array_Sequence<"
+                    << be_idt << be_idt_nl
+                    << elem->nested_type_name (elem_scope) << "," << be_nl
+                    << this->smart_fwd_helper_name (elem_scope, elem) 
+                    << "_life," << be_nl
+                    << this->max_size ()->ev ()->u.ulval << be_uidt_nl
+                    << ">" << be_uidt;
+              }
+
+            break;
+          default:
+            if (this->unbounded ())
+              {
+                *os << "TAO_Unbounded_Sequence<" << be_idt << be_idt_nl
+                    << elem->nested_type_name (elem_scope) << be_uidt_nl
+                    << ">" << be_uidt;
+              }
+            else
+              {
+                *os << "TAO_Bounded_Sequence<" << be_idt << be_idt_nl
+                    << elem->nested_type_name (elem_scope) << "," << be_nl
+                    << this->max_size ()->ev ()->u.ulval << be_uidt_nl
+                    << ">" << be_uidt;
+              }
+
+            break;
+        }
+
+      break;      
+  }
+
+  return 0;
+}
+
+be_field *
+be_sequence::field_node (void) const
+{
+  return this->field_node_;
+}
+
+void
+be_sequence::field_node (be_field *node)
+{
+  this->field_node_ = node;
+}
+
+const char *
+be_sequence::smart_fwd_helper_name (AST_Decl *elem_scope,
+                                    be_type *elem)
+{
+  if (ScopeAsDecl (this->defined_in ()) == elem_scope)
+    {
+      ACE_CString retval = "tao_";
+      retval += elem->local_name ()->get_string ();
+      return retval.rep ();
+    }
+
+  return elem->fwd_helper_name ();
+}
+
 void
 be_sequence::destroy (void)
 {
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index c266c13a18b..2704496dfc9 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -47,558 +47,12 @@ be_structure::be_structure (UTL_ScopedName *n,
 {
 }
 
-// Generate the _var definition for ourself.
-int
-be_structure::gen_var_defn (char *)
-{
-  char namebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf,
-                   "%s_var",
-                   this->local_name ()->get_string ());
-
-  TAO_OutStream *ch = tao_cg->client_header ();
-
-  // Generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which
-  // we account for here.
-
-  *ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // Start with whatever was our current indent level.
-  *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << be_nl;
-  *ch << "{" << be_nl;
-  *ch << "public:" << be_idt_nl;
-
-  // Default constructor.
-  *ch << namebuf << " (void);" << be_nl;
-
-  // Constructor.
-  *ch << namebuf << " (" << this->local_name () << " *);" << be_nl;
-
-  // Copy constructor.
-  *ch << namebuf << " (const " << namebuf << " &);" << be_nl;
-
-  // Fixed-size types only.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ch << "// Fixed-size types only." << be_nl;
-      *ch << namebuf << " (const " << this->local_name ()
-          << " &);" << be_nl;
-    }
-
-  // Destructor.
-  *ch << "~" << namebuf << " (void);" << be_nl;
-  *ch << be_nl;
-
-  // Assignment operator from a pointer.
-  *ch << namebuf << " &operator= (" << this->local_name ()
-      << " *);" << be_nl;
-
-  // Assignment from _var.
-  *ch << namebuf << " &operator= (const " << namebuf << " &);";
-
-  // Fixed-size types only.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ch << be_nl << be_nl << "// Fixed-size types only." << be_nl;
-      *ch << namebuf << " &operator= (const " << this->local_name ()
-          << " &);" << be_nl;
-    }
-
-  // Arrow operator.
-  *ch << be_nl << this->local_name () << " *operator-> (void);" << be_nl;
-  *ch << "const " << this->local_name ()
-      << " *operator-> (void) const;" << be_nl << be_nl;
-
-  // Other extra types (cast operators, [] operator, and others).
-  *ch << "operator const " << this->local_name () << " &() const;" << be_nl;
-  *ch << "operator " << this->local_name () << " &();" << be_nl;
-  *ch << "operator " << this->local_name () << " &() const;";
-
-  if (this->size_type () == AST_Type::VARIABLE)
-    {
-      *ch << be_nl << be_nl
-          << "// Variable-size types only." << be_nl;
-      *ch << "operator " << this->local_name ()
-          << " *&();";
-    }
-
-  *ch << be_nl << be_nl;
-  *ch << "// in, inout, out, _retn " << be_nl;
-
-  // The return types of in, out, inout, and _retn are based on the
-  // parameter passing rules and the base type.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ch << "const " << this->local_name () << " &in (void) const;" << be_nl;
-      *ch << this->local_name () << " &inout (void);" << be_nl;
-      *ch << this->local_name () << " &out (void);" << be_nl;
-      *ch << this->local_name () << " _retn (void);" << be_nl;
-    }
-  else
-    {
-      *ch << "const " << this->local_name () << " &in (void) const;" << be_nl;
-      *ch << this->local_name () << " &inout (void);" << be_nl;
-      *ch << this->local_name () << " *&out (void);" << be_nl;
-      *ch << this->local_name () << " *_retn (void);" << be_nl;
-    }
-
-  // Generate an additional member function
-  // that returns the underlying pointer.
-  *ch << this->local_name () << " *ptr (void) const;" << be_uidt_nl << be_nl;
-
-  // Generate the private section.
-  *ch << "private:" << be_idt_nl;
-  *ch << this->local_name () << " *ptr_;" << be_uidt_nl;
-  *ch << "};";
-
-  return 0;
-}
-
-// Implementation of the _var class, generated in the inline file.
-int
-be_structure::gen_var_impl (char *,
-                            char *)
-{
-  TAO_OutStream *ci = 0;
-  TAO_NL be_nl;        // end line
-  char fname [NAMEBUFSIZE];
-  char lname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname,
-                   "%s_var",
-                   this->full_name ());
-
-  ACE_OS::memset (lname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname,
-                   "%s_var",
-                   this->local_name ()->get_string ());
-
-  ci = tao_cg->client_inline ();
-
-  *ci << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *ci << "// *************************************************************"
-      << be_nl;
-  *ci << "// Inline operations for class " << fname << be_nl;
-  *ci << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Default constructor.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname
-      << " (void)" << be_nl;
-  *ci << "  " << ": ptr_ (0)" << be_nl;
-  *ci << "{}" << be_nl << be_nl;
-
-  // Constructor from a pointer.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (" << this->local_name ()
-      << " *p)" << be_nl;
-  *ci << "  : ptr_ (p)" << be_nl;
-  *ci << "{}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (const ::" << fname
-      << " &p)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "if (p.ptr_)" << be_idt_nl
-      << "{" << be_idt_nl;
-  *ci << "ACE_NEW (this->ptr_, " << "::" << this->name ()
-      << " (*p.ptr_));" << be_uidt_nl
-      << "}" << be_uidt_nl;
-  *ci << "else" << be_idt_nl
-      << "{" << be_idt_nl;
-  *ci << "this->ptr_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Fixed-size types only.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ci << "// Fixed-size types only." << be_nl;
-      *ci << "ACE_INLINE" << be_nl;
-      *ci << fname << "::" << lname << " (const "
-          << "::" << this->name () << " &p)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "ACE_NEW (this->ptr_, " << "::" << this->name ()
-          << " (p));" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-    }
-
-  // Destructor.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::~" << lname << " (void)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "delete this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Assignment operator from a pointer.
-  *ci << "ACE_INLINE" << be_nl
-  << fname << " &" << be_nl;
-  *ci << fname << "::operator= (" << this->local_name ()
-      << " *_tao_struct_var)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "delete this->ptr_;" << be_nl;
-  *ci << "this->ptr_ = _tao_struct_var;" << be_nl;
-  *ci << "return *this;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Assignment operator from _var.
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << fname << " &" << be_nl
-      << fname << "::operator= (const ::" << fname
-      << " &_tao_struct_var)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this != &_tao_struct_var)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (_tao_struct_var.ptr_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "delete this->ptr_;" << be_nl
-      << "this->ptr_ = 0;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << this->local_name () << " *deep_copy = 0;" << be_nl
-      << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-      << "deep_copy," << be_nl
-      << this->local_name () << " (*_tao_struct_var.ptr_)," << be_nl
-      << "*this" << be_uidt_nl 
-      << ");" << be_uidt_nl << be_nl
-      << "if (deep_copy != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << this->local_name () << " *tmp = deep_copy;" << be_nl
-      << "deep_copy = this->ptr_;" << be_nl
-      << "this->ptr_ = tmp;" << be_nl
-      << "delete deep_copy;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Fixed-size types only.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ci << "// fixed-size types only" << be_nl;
-      *ci << "ACE_INLINE " << fname << " &" << be_nl;
-      *ci << fname << "::operator= (const " << "::" << this->name ()
-          << " &p)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "if (this->ptr_ != &p)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "delete this->ptr_;" << be_nl;
-      *ci << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-          << "this->ptr_," << be_nl
-          << "::" << this->name () << " (p)," << be_nl
-          << "*this" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-      *ci << "return *this;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-    }
-
-  // Two arrow operators.
-  *ci << "ACE_INLINE const " << "::" << this->name () << " *" << be_nl;
-  *ci << fname << "::operator-> (void) const" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE " << "::" << this->name () << " *" << be_nl;
-  *ci << fname << "::operator-> (void)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Other extra methods - 3 cast operator ().
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::operator const " << "::" << this->name ()
-      << " &() const // cast" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::operator " << "::" << this->name ()
-      << " &() // cast " << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::operator " << "::" << this->name ()
-      << " &() const // cast " << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Variable-size types only.
-  if (this->size_type () == AST_Type::VARIABLE)
-    {
-      *ci << "// Variable-size types only." << be_nl;
-      *ci << "ACE_INLINE" << be_nl;
-      *ci << fname << "::operator " << "::" << this->name ()
-          << " *&() // cast " << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "return this->ptr_;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-    }
-
-  // in, inout, out, and _retn
-  *ci << "ACE_INLINE const " << "::" << this->name () << " &" << be_nl;
-  *ci << fname << "::in (void) const" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE " << "::" << this->name () << " &" << be_nl;
-  *ci << fname << "::inout (void)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // The out is handled differently based on our size type.
-  if (this->size_type () == AST_Type::VARIABLE)
-    {
-      *ci << "// Mapping for variable size." << be_nl;
-      *ci << "ACE_INLINE " << "::" << this->name () << " *&" << be_nl;
-      *ci << fname << "::out (void)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "delete this->ptr_;" << be_nl;
-      *ci << "this->ptr_ = 0;" << be_nl;
-      *ci << "return this->ptr_;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-
-      *ci << "ACE_INLINE " << "::" << this->name () << " *" << be_nl;
-      *ci << fname << "::_retn (void)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "::" << this->name () << " *tmp = this->ptr_;" << be_nl;
-      *ci << "this->ptr_ = 0;" << be_nl;
-      *ci << "return tmp;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-    }
-  else
-    {
-      *ci << "// mapping for fixed size " << be_nl;
-      *ci << "ACE_INLINE " << "::" << this->name () << " &" << be_nl;
-      *ci << fname << "::out (void)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "return *this->ptr_;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-
-      *ci << "ACE_INLINE " << "::" << this->name () << be_nl;
-      *ci << fname << "::_retn (void)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "return *this->ptr_;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-
-    }
-
-  // The additional ptr () member function.
-  *ci << "ACE_INLINE " << "::" << this->name () << " *" << be_nl;
-  *ci << fname << "::ptr (void) const" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}";
-
-  return 0;
-}
-
-// Generate the _out definition.
-int
-be_structure::gen_out_defn (char *)
-{
-  TAO_OutStream *ch = 0;
-  TAO_NL be_nl;
-  char namebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf,
-                   "%s_out",
-                   this->local_name ()->get_string ());
-
-  ch = tao_cg->client_header ();
-
-  // Generate the out definition (always in the client header).
-
-  *ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << be_nl;
-  *ch << "{" << be_nl;
-  *ch << "public:" << be_idt_nl;
-
-  // No default constructor
-
-  // Constructor from a pointer.
-  *ch << namebuf << " (" << this->local_name () << " *&);" << be_nl;
-
-  // Constructor from a _var &.
-  *ch << namebuf << " (" << this->local_name () << "_var &);" << be_nl;
-
-  // Constructor from a _out &.
-  *ch << namebuf << " (const " << namebuf << " &);" << be_nl;
-
-  // Assignment operator from a _out &.
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl;
-
-  // Assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators.
-
-  // Assignment.
-  *ch << namebuf << " &operator= ("
-      << this->local_name () << " *);" << be_nl;
-
-  // Operator ().
-  *ch << "operator " << this->local_name () << " *&();" << be_nl;
-
-  // ptr fn
-  *ch << this->local_name () << " *&ptr (void);" << be_nl;
-
-  // operator ->
-  *ch << this->local_name () << " *operator-> (void);" << be_nl;
-
-  *ch << be_uidt_nl;
-  *ch << "private:" << be_idt_nl;
-  *ch << local_name () << " *&ptr_;" << be_nl;
-  *ch << "// Assignment from T_var not allowed." << be_nl;
-  *ch << "void operator= (const " << this->local_name ()
-      << "_var &);" << be_uidt_nl;
-  *ch << "};";
-
-  return 0;
-}
-
-int
-be_structure::gen_out_impl (char *,
-                            char *)
+void
+be_structure::redefine (AST_Structure *from)
 {
-  TAO_OutStream *ci = 0;
-  TAO_NL be_nl;
-  char fname [NAMEBUFSIZE];
-  char lname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname,
-                   "%s_out",
-                   this->full_name ());
-
-  ACE_OS::memset (lname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname,
-                   "%s_out",
-                   this->local_name ()->get_string ());
-
-  ci = tao_cg->client_inline ();
-
-  // Generate the var implementation in the inline file.
-
-  *ci << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *ci << "// *************************************************************"
-      << be_nl;
-  *ci << "// Inline operations for class " << fname << be_nl;
-  *ci << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Constructor from a pointer.
-  ci->indent ();
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (" << "::"
-      << this->name () << " *&p)" << be_nl;
-  *ci << "  : ptr_ (p)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "this->ptr_ = 0;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Constructor from _var &.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (" << this->local_name ()
-      << "_var &p)" << be_nl;
-  *ci << "  : ptr_ (p.out ())" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "delete this->ptr_;" << be_nl;
-  *ci << "this->ptr_ = 0;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (const ::" << fname
-      << " &p)" << be_nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << lname << "&, p).ptr_)" << be_nl;
-  *ci << "{}" << be_nl << be_nl;
-
-  // assignment operator from _out &.
-  *ci << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *ci << fname << "::operator= (const ::" << fname <<
-    " &p)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "this->ptr_ = ACE_const_cast (" << lname << "&, p).ptr_;" << be_nl;
-  *ci << "return *this;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Assignment from _var is not allowed by a private declaration.
-
-  // Assignment operator from pointer.
-  *ci << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *ci << fname << "::operator= (" << this->local_name () << " *_tao_struct_out)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "this->ptr_ = _tao_struct_out;" << be_nl;
-  *ci << "return *this;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Other extra methods - cast operator ().
-  *ci << "ACE_INLINE " << be_nl;
-  *ci << fname << "::operator " << "::" << this->name ()
-      << " *&() // cast" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // ptr function
-  *ci << "ACE_INLINE " << "::" << this->name () << " *&" << be_nl;
-  *ci << fname << "::ptr (void) // ptr" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // operator ->
-  *ci << "ACE_INLINE " << "::" << this->name () << " *" << be_nl;
-  *ci << fname << "::operator-> (void)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}";
-
-  return 0;
+  be_structure *bs = be_structure::narrow_from_decl (from);
+  this->common_varout_gen_ = bs->common_varout_gen_;
+  AST_Structure::redefine (from);
 }
 
 void
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index e6726ad85c3..00537bf3ded 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -23,15 +23,19 @@
 #include "be_scope.h"
 #include "be_visitor.h"
 #include "be_codegen.h"
+#include "be_helper.h"
 #include "utl_identifier.h"
 #include "idl_defines.h"
+#include "nr_extern.h"
 
 ACE_RCSID (be, 
            be_type, 
            "$Id$")
 
 be_type::be_type (void)
-  : tc_name_ (0)
+  : tc_name_ (0),
+    common_varout_gen_ (I_FALSE),
+    seen_in_sequence_ (I_FALSE)
 {
 }
 
@@ -43,8 +47,14 @@ be_type::be_type (AST_Decl::NodeType nt,
               n),
     AST_Decl (nt,
               n),
-    tc_name_ (0)
+    tc_name_ (0),
+    common_varout_gen_ (I_FALSE),
+    seen_in_sequence_ (I_FALSE)
 {
+  if (n != 0) 
+    {
+      this->gen_fwd_helper_name ();
+    }
 }
 
 be_type::~be_type (void)
@@ -180,38 +190,160 @@ be_type::nested_sp_type_name (be_decl *use_scope,
                             prefix);
 }
 
-// *****************************
-// CODE GENERATION
-// *****************************
+void
+be_type::gen_fwd_helper_name (void)
+{
+  AST_Decl *parent = ScopeAsDecl (this->defined_in ());
+  Identifier *segment = 0;
+  char *tmp = 0;
+  this->fwd_helper_name_.clear (1);
 
-// Generate the _var definition for ourself.
-int
-be_type::gen_var_defn (char *)
+  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+    {
+      for (UTL_IdListActiveIterator i (parent->name ());
+           !i.is_done ();
+           i.next ())
+        {
+          segment = i.item ();
+          tmp = segment->get_string ();
+
+          if (ACE_OS::strcmp (tmp, "") == 0)
+            {
+              continue;
+            }
+
+          this->fwd_helper_name_ += tmp;
+          this->fwd_helper_name_ += "::";
+        }
+    }
+  else
+    {
+      this->fwd_helper_name_= "";
+    }
+
+  this->fwd_helper_name_ += "tao_";
+  this->fwd_helper_name_ += this->local_name ()->get_string ();
+}
+
+const char *
+be_type::fwd_helper_name (void) const
 {
-  return 0;
+  return this->fwd_helper_name_.fast_rep ();
 }
 
-// Implementation of the _var class. All of these get generated
-// in the inline file
-int
-be_type::gen_var_impl (char *,
-                       char *)
+void
+be_type::fwd_helper_name (const char *name)
 {
-  return 0;
+  this->fwd_helper_name_ = name;
 }
 
-// Generate the _out definition.
-int
-be_type::gen_out_defn (char *)
+void
+be_type::gen_common_varout (TAO_OutStream *os)
+{
+  if (this->common_varout_gen_ == 1)
+    {
+      return;
+    }
+
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__;
+
+  AST_Type::SIZE_TYPE st = this->size_type ();
+
+  *os << be_nl << be_nl
+      << (this->node_type () == AST_Decl::NT_struct ? "struct "
+                                                    : "class ")
+      << this->local_name () << ";";
+
+  *os << be_nl << be_nl
+      << "typedef" << be_idt_nl
+      << (st == AST_Type::FIXED ? "TAO_Fixed_Var_T<"
+                                : "TAO_Var_Var_T<")
+      << be_idt << be_idt_nl
+      << this->local_name () << be_uidt_nl
+      << ">" << be_uidt_nl
+      << this->local_name () << "_var;" << be_uidt_nl << be_nl;
+
+  if (st == AST_Type::FIXED)
+    {
+      *os << "typedef" << be_idt_nl
+          << this->local_name () << " &" << be_nl
+          << this->local_name () << "_out;" << be_uidt;
+    }
+  else
+    {
+      *os << "typedef" << be_idt_nl
+          << "TAO_Out_T<" << be_idt << be_idt_nl
+          << this->local_name () << "," << be_nl
+          << this->local_name () << "_var" << be_uidt_nl
+          << ">" << be_uidt_nl
+          << this->local_name () << "_out;" << be_uidt;
+    }
+
+  this->common_varout_gen_ = 1;
+}
+
+void
+be_type::gen_common_tmplinst (TAO_OutStream *os)
+{
+  AST_Type::SIZE_TYPE st = this->size_type ();
+
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__;
+
+  os->gen_ifdef_AHETI ();
+
+  *os << be_nl << be_nl
+      << "template class" << be_idt_nl
+      << (st == AST_Type::FIXED ? "TAO_Fixed_Var_T<"
+                                : "TAO_Var_Var_T<")
+      << be_idt << be_idt_nl
+      << this->local_name () << be_uidt_nl
+      << ">;" << be_uidt << be_uidt;
+
+  if (st == AST_Type::VARIABLE)
+    {
+      *os << be_nl<< be_nl
+          << "template class" << be_idt_nl
+          << "TAO_Out_T<" << be_idt << be_idt_nl
+          << this->local_name () << "," << be_nl
+          << this->local_name () << "_var" << be_uidt_nl
+          << ">;" << be_uidt << be_uidt;
+    }
+
+  os->gen_elif_AHETI ();
+
+  *os << be_nl << be_nl
+      << "# pragma instantiate \\" << be_idt_nl
+      << (st == AST_Type::FIXED ? "TAO_Fixed_Var_T< \\"
+                                : "TAO_Var_Var_T< \\")
+      << be_idt << be_idt_nl
+      << this->local_name () << " \\" << be_uidt_nl
+      << ">" << be_uidt << be_uidt;
+
+  if (st == AST_Type::VARIABLE)
+    {
+      *os << be_nl << be_nl
+          << "# pragma instantiate \\" << be_idt_nl
+          << "TAO_Out_T< \\" << be_idt << be_idt_nl
+          << this->local_name () << ", \\" << be_nl
+          << this->local_name () << "_var \\" << be_uidt_nl
+          << ">" << be_uidt << be_uidt;
+    }
+
+  os->gen_endif_AHETI ();
+}
+
+idl_bool
+be_type::seen_in_sequence (void) const
 {
-  return 0;
+  return this->seen_in_sequence_;
 }
 
-int
-be_type::gen_out_impl (char *,
-                       char *)
+void
+be_type::seen_in_sequence (idl_bool val)
 {
-  return 0;
+  this->seen_in_sequence_ = val;
 }
 
 AST_Decl::NodeType
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 24e76c21aae..13ec5d12652 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -61,579 +61,12 @@ be_union::be_union (AST_ConcreteType *dt,
   this->has_constructor (I_TRUE);
 }
 
-// Generate the _var definition for ourself.
-int
-be_union::gen_var_defn (char *)
-{
-  char namebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf,
-                   "%s_var",
-                   this->local_name ()->get_string ());
-
-  TAO_OutStream *ch = tao_cg->client_header ();
-
-  // Generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  *ch << be_nl << be_nl
-      << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << be_nl;
-  *ch << "{" << be_nl;
-  *ch << "public:" << be_idt_nl;
-
-  // Default constructor.
-  *ch << namebuf << " (void);" << be_nl;
-
-  // Constructor.
-  *ch << namebuf << " (" << this->local_name () << " *);" << be_nl;
-
-  // Copy constructor.
-  *ch << namebuf << " (const " << namebuf
-      << " &);" << be_nl;
-
-  // Fixed-size types only.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ch << namebuf << " (const " << this->local_name ()
-          << " &); // fixed-size types only" << be_nl;
-    }
-
-  // Destructor.
-  *ch << "~" << namebuf << " (void);" << be_nl;
-  *ch << be_nl;
-
-  // Assignment operator from a pointer.
-  *ch << namebuf << " &operator= ("
-      << this->local_name () << " *);" << be_nl;
-
-  // Assignment from _var.
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl;
-
-  // Fixed-size types only.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ch << namebuf << " &operator= (const " << this->local_name ()
-          << " &); // fixed-size types only" << be_nl;
-    }
-
-  // Arrow operator.
-  *ch << local_name () << " *operator-> (void);" << be_nl;
-  *ch << "const " << this->local_name ()
-      << " *operator-> (void) const;" << be_nl;
-  *ch << be_nl;
-
-  // Other extra types (cast operators, [] operator, and others).
-  *ch << "operator const " << this->local_name () << " &() const;" << be_nl;
-  *ch << "operator " << this->local_name () << " &();" << be_nl;
-  *ch << "operator " << this->local_name () << " &() const;" << be_nl;
-
-  if (this->size_type () == AST_Type::VARIABLE)
-    {
-      *ch << "  // Variable size types only." << be_nl;
-      *ch << "operator " << this->local_name ()
-          << " *&();" << be_nl;
-    }
-
-  *ch << be_nl;
-  *ch << "// in, inout, out, _retn " << be_nl;
-
-  // The return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << be_nl;
-      *ch << this->local_name () << " &inout (void);" << be_nl;
-      *ch << this->local_name () << " &out (void);" << be_nl;
-      *ch << this->local_name () << " _retn (void);" << be_nl;
-    }
-  else
-    {
-      *ch << "const " << this->local_name () << " &in (void) const;" << be_nl;
-      *ch << this->local_name () << " &inout (void);" << be_nl;
-      *ch << this->local_name () << " *&out (void);" << be_nl;
-      *ch << this->local_name () << " *_retn (void);" << be_nl;
-    }
-
-  // Generate an additional member function that
-  // returns the underlying pointer.
-  *ch << this->local_name () << " *ptr (void) const;"
-      << be_uidt_nl << be_nl;
-
-  // Generate the private section
-  *ch << "private:" << be_idt_nl;
-  *ch << this->local_name () << " *ptr_;" << be_uidt_nl;
-  *ch << "};";
-
-  return 0;
-}
-
-// Implementation of the _var class. All of these get generated in the inline
-// file.
-int
-be_union::gen_var_impl (char *,
-                        char *)
-{
-  TAO_OutStream *ci = 0;
-  TAO_NL be_nl;
-
-  // To hold the full and local _var names.
-  char fname [NAMEBUFSIZE];
-  char lname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname,
-                   "%s_var",
-                   this->full_name ());
-
-  ACE_OS::memset (lname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname,
-                   "%s_var",
-                   this->local_name ()->get_string ());
-
-  ci = tao_cg->client_inline ();
-
-  *ci << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *ci << "// *************************************************************"
-      << be_nl;
-  *ci << "// Inline operations for class " << fname << be_nl;
-  *ci << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Default constructor.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname <<
-    " (void)" << be_nl;
-  *ci << "  " << ": ptr_ (0)" << be_nl;
-  *ci << "{}" << be_nl << be_nl;
-
-  // Constructor from a pointer.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (" << this->local_name ()
-      << " *p)" << be_nl;
-  *ci << "  : ptr_ (p)" << be_nl;
-  *ci << "{}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (const ::" << fname
-      << " &p)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "if (p.ptr_)" << be_idt_nl
-      << "{" << be_idt_nl;
-  *ci << "ACE_NEW (this->ptr_, ::" << this->name ()
-      << " (*p.ptr_));" << be_uidt_nl
-      << "}" << be_uidt_nl;
-  *ci << "else" << be_idt_nl
-      << "{" << be_idt_nl;
-  *ci << "this->ptr_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Fixed-size types only.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ci << "// Fixed-size types only." << be_nl;
-      *ci << "ACE_INLINE" << be_nl;
-      *ci << fname << "::" << lname << " (const ::"
-          << this->name () << " &p)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "ACE_NEW (this->ptr_, ::" << this->name ()
-          << " (p));" << be_uidt_nl;
-      *ci << "}\n\n";
-    }
-
-  // Destructor.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::~" << lname << " (void)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "delete this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Assignment operator from a pointer.
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << fname << " &" << be_nl;
-  *ci << fname << "::operator= (" << this->local_name ()
-      << " *_tao_union_var)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "delete this->ptr_;" << be_nl;
-  *ci << "this->ptr_ = _tao_union_var;" << be_nl;
-  *ci << "return *this;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Assignment operator from _var.
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << fname << " &" << be_nl
-      << fname << "::operator= (const ::" << fname
-      << " &_tao_union_var)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this != &_tao_union_var)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (_tao_union_var.ptr_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "delete this->ptr_;" << be_nl
-      << "this->ptr_ = 0;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << this->local_name () << " *deep_copy = 0;" << be_nl
-      << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-      << "deep_copy," << be_nl
-      << this->local_name () << " (*_tao_union_var.ptr_)," << be_nl
-      << "*this" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl
-      << "if (deep_copy != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << this->local_name () << " *tmp = deep_copy;" << be_nl
-      << "deep_copy = this->ptr_;" << be_nl
-      << "this->ptr_ = tmp;" << be_nl
-      << "delete deep_copy;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Fixed-size types only.
-  if (this->size_type () == AST_Type::FIXED)
-    {
-      *ci << "// Fixed-size types only." << be_nl;
-      *ci << "ACE_INLINE" << be_nl
-          << "::" << fname << " &" << be_nl;
-      *ci << fname << "::operator= (const ::" << this->name ()
-          << " &_tao_union_var)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "if (this->ptr_ != &_tao_union_var)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "delete this->ptr_;" << be_nl;
-      *ci << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-          << "this->ptr_," << be_nl
-          << "::" << this->name () << " (_tao_union_var)," << be_nl
-          << "*this" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl;
-      *ci << "}" << be_nl;
-      *ci << "return *this;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-    }
-
-  // Two arrow operators.
-  *ci << "ACE_INLINE" << be_nl
-      << "const ::" << this->name () << " *" << be_nl;
-  *ci << fname << "::operator-> (void) const" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << this->name () << " *" << be_nl;
-  *ci << fname << "::operator-> (void)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Other extra methods - 3 cast operator ().
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::operator const ::" << this->name ()
-      << " &() const // cast" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::operator ::" << this->name ()
-      << " &() // cast " << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::operator ::" << this->name ()
-      << " &() const// cast " << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Variable-size types only.
-  if (this->size_type () == AST_Type::VARIABLE)
-    {
-      *ci << "// Variable-size types only." << be_nl;
-      *ci << "ACE_INLINE" << be_nl;
-      *ci << fname << "::operator ::" << this->name ()
-          << " *&() // cast " << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "return this->ptr_;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-    }
-
-  // in, inout, out, _retn, and ptr.
-  *ci << "ACE_INLINE" << be_nl
-      << "const ::" << this->name () << " &" << be_nl;
-  *ci << fname << "::in (void) const" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << this->name () << " &" << be_nl;
-  *ci << fname << "::inout (void)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return *this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // The out and _retn are handled differently based on our size type.
-  if (this->size_type () == AST_Type::VARIABLE)
-    {
-      *ci << "// Mapping for variable size." << be_nl;
-      *ci << "ACE_INLINE" << be_nl
-          << "::" << this->name () << " *&" << be_nl;
-      *ci << fname << "::out (void)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "delete this->ptr_;" << be_nl;
-      *ci << "this->ptr_ = 0;" << be_nl;
-      *ci << "return this->ptr_;" << be_uidt_nl;
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE" << be_nl
-          << "::" << this->name () << " *" << be_nl;
-      *ci << fname << "::_retn (void)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "::" << this->name () << " *tmp = this->ptr_;" << be_nl;
-      *ci << "this->ptr_ = 0;" << be_nl;
-      *ci << "return tmp;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-
-    }
-  else
-    {
-      *ci << "// Mapping for fixed size. " << be_nl;
-      *ci << "ACE_INLINE" << be_nl
-          << "::" << this->name () << " &" << be_nl;
-      *ci << fname << "::out (void)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "return *this->ptr_;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-
-      *ci << "ACE_INLINE" << be_nl
-          << "::" << this->name () << be_nl;
-      *ci << fname << "::_retn (void)" << be_nl;
-      *ci << "{" << be_idt_nl;
-      *ci << "return *this->ptr_;" << be_uidt_nl;
-      *ci << "}" << be_nl << be_nl;
-    }
-
-  // The additional ptr () member function.
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << this->name () << " *" << be_nl;
-  *ci << fname << "::ptr (void) const" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}";
-
-  return 0;
-}
-
-// Generate the _out definition
-int
-be_union::gen_out_defn (char *)
-{
-  TAO_OutStream *ch = 0;
-  TAO_NL be_nl;
-
-  // To hold the _out name.
-  char namebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf,
-                   "%s_out",
-                   this->local_name ()->get_string ());
-
-  ch = tao_cg->client_header ();
-
-  // Generate the out definition (always in the client header).
-
-  *ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  *ch << be_nl << be_nl
-      << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << be_nl;
-  *ch << "{" << be_nl;
-  *ch << "public:" << be_idt_nl;
-
-  // No default constructor.
-
-  // Constructor from a pointer.
-  *ch << namebuf << " (" << this->local_name () << " *&);" << be_nl;
-
-  // Constructor from a _var &.
-  *ch << namebuf << " (" << this->local_name () << "_var &);" << be_nl;
-
-  // Constructor from a _out &.
-  *ch << namebuf << " (const " << namebuf << " &);" << be_nl;
-
-  // Assignment operator from a _out &.
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl;
-
-  // Assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators.
-
-  // Assignment.
-  *ch << namebuf << " &operator= (" << this->local_name ()
-      << " *);" << be_nl;
-
-  // operator ().
-  *ch << "operator " << local_name () << " *&();" << be_nl;
-
-  // ptr function.
-  *ch << this->local_name () << " *&ptr (void);" << be_nl;
-
-  // operator ->
-  *ch << this->local_name () << " *operator-> (void);" << be_nl;
-
-  *ch << be_uidt_nl;
-  *ch << "private:" << be_idt_nl;
-  *ch << this->local_name () << " *&ptr_;" << be_nl;
-  *ch << "// assignment from T_var not allowed." << be_nl;
-  *ch << "void operator= (const " << this->local_name ()
-      << "_var &);" << be_uidt_nl;
-  *ch << "};";
-
-  return 0;
-}
-
-int
-be_union::gen_out_impl (char *,
-                        char *)
+void
+be_union::redefine (AST_Structure *from)
 {
-  TAO_OutStream *ci = 0;
-  TAO_NL be_nl;
-
-  // To hold the full and local _out names.
-  char fname [NAMEBUFSIZE];
-  char lname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname,
-                   "%s_out",
-                   this->full_name ());
-
-  ACE_OS::memset (lname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname,
-                   "%s_out",
-                   this->local_name ()->get_string ());
-
-  ci = tao_cg->client_inline ();
-
-  // Generate the var implementation in the inline file.
-
-  *ci << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *ci << "// *************************************************************"
-      << be_nl;
-  *ci << "// Inline operations for class " << fname << be_nl;
-  *ci << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Constructor from a pointer.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (" << this->local_name ()
-      << " *&p)" << be_nl;
-  *ci << "  : ptr_ (p)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "this->ptr_ = 0;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Constructor from _var &.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (" << this->local_name ()
-      << "_var &p)" << be_nl;
-  *ci << "  : ptr_ (p.out ())" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "delete this->ptr_;" << be_nl;
-  *ci << "this->ptr_ = 0;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::" << lname << " (const ::" << fname
-      << " &p)" << be_nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << lname << "&, p).ptr_)" << be_nl;
-  *ci << "{}" << be_nl << be_nl;
-
-  // Assignment operator from _out &.
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << fname << " &" << be_nl;
-  *ci << fname << "::operator= (const ::" << fname
-      << " &p)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "this->ptr_ = ACE_const_cast (" << lname << "&, p).ptr_;" << be_nl;
-  *ci << "return *this;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Assignment from _var is not allowed by a private declaration.
-
-  // Assignment operator from pointer.
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << fname << " &" << be_nl;
-  *ci << fname << "::operator= (" << this->local_name () 
-      << " *_tao_union_out)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "this->ptr_ = _tao_union_out;" << be_nl;
-  *ci << "return *this;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // Other extra methods - cast operator ().
-  *ci << "ACE_INLINE" << be_nl;
-  *ci << fname << "::operator ::" << this->name ()
-      << " *&() // cast" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // ptr function.
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << this->name () << " *&" << be_nl;
-  *ci << fname << "::ptr (void) // ptr" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}" << be_nl << be_nl;
-
-  // operator ->
-  *ci << "ACE_INLINE" << be_nl
-      << "::" << this->name () << " *" << be_nl;
-  *ci << fname << "::operator-> (void)" << be_nl;
-  *ci << "{" << be_idt_nl;
-  *ci << "return this->ptr_;" << be_uidt_nl;
-  *ci << "}";
-
-  return 0;
+  be_union *bu = be_union::narrow_from_decl (from);
+  this->common_varout_gen_ = bu->common_varout_gen_;
+  AST_Union::redefine (from);
 }
 
 idl_bool
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index e3a1a2465ec..f7c860b205a 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -23,6 +23,7 @@
 #include "be_extern.h"
 #include "be_helper.h"
 #include "ast_module.h"
+#include "utl_identifier.h"
 #include "idl_defines.h"
 #include "nr_extern.h"
 #include "ace/Log_Msg.h"
@@ -68,6 +69,8 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
                   n_inherits_flat,
                   0,
                   abstract),
+    be_type (AST_Decl::NT_valuetype,
+             n),
     AST_ValueType (n,
                    inherits,
                    n_inherits,
@@ -92,7 +95,8 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
     COMMON_Base (0,
                  abstract),
     full_obv_skel_name_ (0),
-    supports_abstract_ (0)
+    supports_abstract_ (0),
+    var_out_seq_decls_gen_ (0)
 {
   // Check that redefine() copies all members.
 
@@ -117,6 +121,11 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
           break;
         }
     }
+
+  if (n != 0 && this->fwd_helper_name_ == "") 
+    {
+      this->gen_fwd_helper_name ();
+    }
 }
 
 be_valuetype::~be_valuetype (void)
@@ -126,6 +135,8 @@ be_valuetype::~be_valuetype (void)
 void
 be_valuetype::redefine (AST_Interface *from)
 {
+  be_valuetype *bv = be_valuetype::narrow_from_decl (from);
+  bv->var_out_seq_decls_gen_ = bv->var_out_seq_decls_gen_;
   this->AST_ValueType::redefine (from);
 }
 
@@ -157,517 +168,10 @@ be_valuetype::full_obv_skel_name (void)
   return this->full_obv_skel_name_;
 }
 
-// Generate the var definition.
-int
-be_valuetype::gen_var_defn (char *local_name)
-{
-  char namebuf [NAMEBUFSIZE];
-
-  if (local_name == 0)
-    {
-      local_name = (char *) this->local_name ();
-    }
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf,
-                   "%s_var",
-                   local_name);
-
-  TAO_OutStream *ch = tao_cg->client_header ();
-
-  *ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // Generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << be_nl;
-  *ch << "{" << be_nl;
-  *ch << "public:" << be_idt_nl;
-
-  // Default constructor.
-  *ch << namebuf << " (void);" << be_nl;
-  *ch << namebuf << " (" << local_name << "*);" << be_nl;
-  *ch << namebuf << " (const " << local_name
-      << "*); // (TAO extension)" << be_nl;
-
-  // Copy constructor.
-  *ch << namebuf << " (const " << namebuf <<
-    " &);" << be_nl;
-
-  // Destructor.
-  *ch << "~" << namebuf << " (void);" << be_nl;
-  *ch << be_nl;
-
-  // Assignment operator from a pointer.
-  *ch << namebuf << " &operator= (" << local_name
-      << "*);" << be_nl;
-
-  // Assignment from _var.
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << be_nl;
-
-  // Arrow operator.
-  *ch << local_name << "* operator-> (void) const;" << be_nl;
-
-  *ch << be_nl;
-
-  // Other extra types (cast operators and others).
-  *ch << "operator const " << local_name
-      << "* () const;" << be_nl;
-  *ch << "operator " << local_name << "*& ();" << be_nl;
-
-  *ch << "// in, inout, out, _retn " << be_nl;
-  // The return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type.
-  *ch << local_name << "* in (void) const;" << be_nl;
-  *ch << local_name << "*& inout (void);" << be_nl;
-  *ch << local_name << "*& out (void);" << be_nl;
-  *ch << local_name << "* _retn (void);" << be_nl;
-
-  // Generate an additional member function that returns
-  // the underlying pointer.
-  *ch << local_name << "* ptr (void) const;" << be_nl << be_nl;
-
-  // Hooks for non-defined forward declared interfaces.
-  *ch << "// Hooks used by template sequence and valuetype manager classes"
-      << be_nl
-      << "// for non-defined forward declared valuetypes." << be_nl
-      << "static void tao_add_ref (" << local_name << " *);" << be_nl
-      << "static void tao_remove_ref (" << local_name << " *);"
-      << be_uidt_nl << be_nl;
-
-  // Private.
-  *ch << "private:" << be_idt_nl;
-  *ch << local_name << "* ptr_;" << be_uidt_nl;
-
-  *ch << "};";
-
-  return 0;
-}
-
-// Implementation of the _var class. All of these get generated in the stubs
-// file.
-int
-be_valuetype::gen_var_impl (char *local_name,
-                            char *full_name)
-{
-  TAO_OutStream *cs = 0;
-  TAO_NL be_nl;
-
-  // Decide on the names to use.
-  // Even if one argument is 0, there is no point using the
-  // arguments. Let us then use the name in this node.
-  if (local_name == 0 || full_name == 0)
-    {
-      local_name = (char *) this->local_name ();
-      full_name = (char *) this->full_name ();
-    }
-
-  // To hold the full and local _var names.
-  char fname [NAMEBUFSIZE];
-  char lname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname,
-                   "%s_var",
-                   full_name);
-
-  ACE_OS::memset (lname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname,
-                   "%s_var",
-                   local_name);
-
-  cs = tao_cg->client_stubs ();
-
-  // Generate the var implementation in the stubs file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *cs << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *cs << "// *************************************************************"
-      << be_nl;
-  *cs << "// Operations for class " << fname << be_nl;
-  *cs << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Default constructor.
-  *cs << fname << "::" << lname <<
-    " (void)" << be_nl;
-  *cs << "  " << ": ptr_ (0)" << be_nl;
-  *cs << "{}" << be_nl << be_nl;
-
-  // Constructor from a pointer.
-  *cs << fname << "::" << lname << " ("
-      << local_name << "* p)" << be_nl;
-  *cs << "  : ptr_ (p)" << be_nl;
-  *cs << "{}" << be_nl << be_nl;
-
-  // Constructor from a const pointer.
-  // TAO extension - it appears that there are problems with at least g++
-  // which reclaims amguity between T(T*) and T(const T_var &)
-  *cs << fname << "::" << lname << " (const "
-      << local_name << "* p)" << be_nl;
-  *cs << "  : ptr_ (ACE_const_cast ("
-      << local_name << " *, p))" << be_nl;
-  *cs << "{}" << be_nl << be_nl;
-
-  // The additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  *cs << full_name << " *" << be_nl;
-  *cs << fname << "::ptr (void) const" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *cs << fname << "::" << lname << " (const " << lname <<
-    " &p)" << be_nl;
-  *cs << "{" << be_idt_nl
-      <<    "CORBA::add_ref (p.ptr ());" << be_nl
-      <<    "this->ptr_ = p.ptr ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Destructor.
-  *cs << fname << "::~" << lname << " (void) // destructor" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "CORBA::remove_ref (this->ptr_);" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Assignment operator.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (" << local_name
-      << " *p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "CORBA::remove_ref (this->ptr_);" << be_nl;
-  *cs << "this->ptr_ = p;" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Assignment operator from _var.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (const " << lname
-      << " &p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "if (this != &p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "CORBA::remove_ref (this->ptr_);" << be_nl
-      << local_name << " *tmp = p.ptr ();" << be_nl
-      << "CORBA::add_ref (tmp);" << be_nl
-      << "this->ptr_ = tmp;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Other extra methods - cast operators.
-  *cs << fname << "::operator const " << full_name
-      << "* () const // cast" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << fname << "::operator " << full_name
-      << "*& () // cast " << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // operator->
-  *cs << full_name << " *" << be_nl;
-  *cs << fname << "::operator-> (void) const" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // in, inout, out, and _retn.
-  *cs << full_name << " *" << be_nl;
-  *cs << fname << "::in (void) const" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << full_name << " *&" << be_nl;
-  *cs << fname << "::inout (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << full_name << " *&" << be_nl;
-  *cs << fname << "::out (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "CORBA::remove_ref (this->ptr_);" << be_nl;
-  *cs << "this->ptr_ = 0;" << be_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << full_name << " *" << be_nl;
-  *cs << fname << "::_retn (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "// yield ownership of managed obj reference" << be_nl;
-  *cs << local_name << "* tmp = this->ptr_;" << be_nl;
-  *cs << "this->ptr_ = 0;" << be_nl;
-  *cs << "return tmp;" << be_uidt_nl;
-  *cs << "}" << be_nl << be_nl;
-
-  // Hooks for the flat name global functions used by references to
-  // non-defined valuetypes.
-  *cs << "void" << be_nl
-      << fname << "::tao_add_ref (" << be_idt << be_idt_nl
-      << local_name << " *p" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "CORBA::add_ref (p);"
-      << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *cs << "void" << be_nl
-      << fname << "::tao_remove_ref (" << be_idt << be_idt_nl
-      << local_name << " *p" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "CORBA::remove_ref (p);" << be_uidt_nl
-      << "}";
-
-  return 0;
-}
-
-// Generate the _out definition.
-int
-be_valuetype::gen_out_defn (char *)
-{
-  TAO_OutStream *ch = 0;
-  TAO_NL be_nl;
-  char namebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf,
-                   "%s_out",
-                   this->local_name ());
-
-  ch = tao_cg->client_header ();
-
-  *ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // Generate the out definition (always in the client header).
-
-  *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << be_nl;
-  *ch << "{" << be_nl;
-  *ch << "public:" << be_idt_nl;
-
-  // No default constructor.
-
-  // Constructor from a pointer.
-  *ch << namebuf << " (" << this->local_name () << "* &);" << be_nl;
-
-  // Constructor from a _var &.
-  *ch << namebuf << " (" << this->local_name () << "_var &);" << be_nl;
-
-  // Constructor from a _out &.
-  *ch << namebuf << " (const " << namebuf << " &);" << be_nl;
-
-  // Assignment operator from a _out &.
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl;
-
-  // Assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators.
-  // Only interface allows assignment from var &.
-  *ch << namebuf << " &operator= (const " << this->local_name ()
-      << "_var &);" << be_nl;
-  *ch << namebuf << " &operator= (" << this->local_name ()
-      << "*);" << be_nl;
-
-  // Cast.
-  *ch << "operator " << this->local_name () << "*& ();" << be_nl;
-
-  // ptr function.
-  *ch << this->local_name () << "*& ptr (void);" << be_nl;
-
-  // operator ->
-  *ch << this->local_name () << "* operator-> (void);" << be_nl;
-
-  *ch << be_uidt_nl;
-  *ch << "private:" << be_idt_nl;
-  *ch << this->local_name () << "* &ptr_;" << be_uidt_nl;
-  *ch << "};";
-
-  return 0;
-}
-
-int
-be_valuetype::gen_out_impl (char *,
-                            char *)
+const char *
+be_valuetype::fwd_helper_name (void) const
 {
-  TAO_OutStream *cs = 0;
-  TAO_NL be_nl;
-
-  // To hold the full and local _out names.
-  char fname [NAMEBUFSIZE];
-  char lname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname,
-                   "%s_out",
-                   this->full_name ());
-
-  ACE_OS::memset (lname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname,
-                   "%s_out",
-                   this->local_name ());
-
-  cs = tao_cg->client_stubs ();
-
-  *cs << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // Generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *cs << "// *************************************************************"
-      << be_nl;
-  *cs << "// Operations for class " << fname << be_nl;
-  *cs << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Constructor from a pointer.
-  *cs << fname << "::" << lname << " (" << this->local_name ()
-      << " *&p)" << be_nl;
-  *cs << "  : ptr_ (p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "this->ptr_ = 0;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Constructor from _var &.
-  *cs << fname << "::" << lname << " (" << this->local_name ()
-      << "_var &p)" << be_nl;
-  *cs << "  : ptr_ (p.out ())" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "CORBA::remove_ref (this->ptr_);" << be_nl;
-  *cs << "this->ptr_ = 0;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *cs << fname << "::" << lname << " (const " << lname
-      << " &p)" << be_nl;
-  *cs << "  : ptr_ (ACE_const_cast (" << lname << "&, p).ptr_)" << be_nl;
-  *cs << "{}" << be_nl << be_nl;
-
-  // Assignment operator from _out &.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (const " << lname <<
-    " &p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "this->ptr_ = ACE_const_cast (" << lname << "&, p).ptr_;" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Assignment operator from _var.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (const " << this->local_name ()
-      << "_var &p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << this->local_name () << " *tmp = p.ptr ();" << be_nl
-      << "CORBA::add_ref (tmp);" << be_nl
-      << "this->ptr_ = tmp;" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Assignment operator from *.
-  *cs << fname << " &" << be_nl;
-  *cs << fname << "::operator= (" << this->local_name ()
-      << " *p)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "this->ptr_ = p;" << be_nl;
-  *cs << "return *this;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // Other extra methods - cast operator ().
-  *cs << fname << "::operator " << this->name ()
-      << "*& () // cast" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // ptr function.
-  *cs << this->name () << " *&" << be_nl;
-  *cs << fname << "::ptr (void) // ptr" << be_nl;
-  *cs << "{" << be_idt_nl;
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  // operator->
-  *cs << this->name () << " *" << be_nl;
-  *cs << fname << "::operator-> (void)" << be_nl;
-  *cs << "{" << be_idt_nl;
-
-  *cs << "return this->ptr_;" << be_uidt_nl;
-
-  *cs << "}" << be_nl << be_nl;
-
-  *cs << "// *************************************************************";
-
-  return 0;
+  return this->fwd_helper_name_.fast_rep ();
 }
 
 int
@@ -761,6 +265,58 @@ be_valuetype::gen_helper_stubs (char* ,
   return 0;
 }
 
+// Generate the forward declarations and static methods used by the
+// interface _var and _out template classes, as well as by the
+// template sequence classes for object references.
+void
+be_valuetype:: gen_var_out_seq_decls (void)
+{
+  if (this->var_out_seq_decls_gen_ == 1)
+    {
+      return;
+    }
+
+  TAO_OutStream *os = tao_cg->client_header ();
+
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+  // Generate the ifdefined macro for this interface.
+  os->gen_ifdef_macro (this->flat_name (),
+                       "odds_n_ends");
+
+  const char *lname = this->local_name ();
+
+  *os << be_nl << be_nl
+      << "class " << lname << ";" << be_nl
+      << "struct tao_" << lname << "_life;" << be_nl << be_nl
+      << "typedef" << be_idt_nl
+      << "TAO_Value_Var_T<" << be_idt << be_idt_nl
+      << lname << "," << be_nl
+      << "tao_" << lname << "_life" << be_uidt_nl
+      << ">" << be_uidt_nl
+      << lname << "_var;" << be_uidt_nl << be_nl
+      << "typedef" << be_idt_nl
+      << "TAO_Value_Out_T<" << be_idt << be_idt_nl
+      << lname << "," << be_nl
+      << "tao_" << lname << "_life" << be_uidt_nl
+      << ">" << be_uidt_nl 
+      << lname << "_out;" << be_uidt;
+
+  *os << be_nl << be_nl
+      << "struct " << be_global->stub_export_macro () 
+      << " tao_" << lname << "_life" << be_nl
+      << "{" << be_idt_nl
+      << "static void tao_add_ref (" 
+      << lname << " *);" << be_nl
+      << "static void tao_remove_ref (" << lname << " *);" << be_uidt_nl
+      << "};";
+
+  os->gen_endif ();
+
+  this->var_out_seq_decls_gen_ = 1;
+}
+
 // For building the pre and postfix of private data fields.
 const char *
 be_valuetype::field_pd_prefix (void)
diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index 9b5aa0ad019..24ab9029bd8 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -169,6 +169,7 @@ be_visitor_amh_pre_proc::create_response_handler (
   response_handler->set_imported (node->imported ());
   response_handler->set_line (node->line ());
   response_handler->set_file_name (node->file_name ());
+  response_handler->gen_fwd_helper_name ();
 
   this->add_rh_node_members (node, response_handler, exception_holder);
 
@@ -638,6 +639,8 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
                   0);
 
   excep_holder->set_name (excep_holder_name);
+  excep_holder->set_defined_in (node->defined_in ());
+  excep_holder->gen_fwd_helper_name ();
 
   // Now our customized valuetype is created, we have to
   // add now the operations and attributes to the scope.
diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index 765e5c5d427..3f68429afd7 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -501,6 +501,8 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                   0);
 
   reply_handler->set_name (reply_handler_name);
+  reply_handler->set_defined_in (node->defined_in ());
+  reply_handler->gen_fwd_helper_name ();
 
   // Now our customized valuetype is created, we have to
   // add now the operations and attributes to the scope.
diff --git a/TAO/TAO_IDL/be/be_visitor_argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument.cpp
index 05f16bdf2b6..290bd87f2b5 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument.cpp
@@ -43,6 +43,7 @@
 #include "be_operation.h"
 #include "be_helper.h"
 #include "utl_identifier.h"
+#include "nr_extern.h"
 #include "ace/Log_Msg.h"
 
 #include "be_visitor_argument/arglist.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index 45384a20aee..e96f7a34285 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -199,6 +199,21 @@ int be_visitor_args_arglist::visit_predefined_type (be_predefined_type *node)
           break;
         }
     }
+  else if (pt == AST_PredefinedType::PT_value)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          *os << this->type_name (node) << " *";
+          break;
+        case AST_Argument::dir_INOUT:
+          *os << this->type_name (node) << " *&";
+          break;
+        case AST_Argument::dir_OUT:
+          *os << this->type_name (node, "_out");
+          break;
+        }
+    }
   else if (pt == AST_PredefinedType::PT_pseudo
            || pt == AST_PredefinedType::PT_object)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
index 36f9eabcbcf..114c4bb0308 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
@@ -85,15 +85,26 @@ be_visitor_args_post_invoke_cs::visit_interface (be_interface *node)
     {
     case AST_Argument::dir_INOUT:
       {
+        *os << be_nl;
+
         // Assign the narrowed obj reference.
         if (node->is_defined ())
           {
-            *os << "CORBA::release (" << arg->local_name () << ");" << be_nl;
+            *os << "CORBA::release (" << arg->local_name () << ");";
           }
         else
           {
-            *os << "tao_" << node->flat_name () << "_release ("
-                << arg->local_name () << ");" << be_nl;
+            AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+            if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+              {
+                *os << parent->name () << "::";
+              }
+
+            *os << "tao_" << node->local_name () << "_life::tao_release ("
+                << be_idt << be_idt_nl
+                << arg->local_name () << be_uidt_nl
+                << ");" << be_uidt;
           }
       }
       break;
diff --git a/TAO/TAO_IDL/be/be_visitor_array.cpp b/TAO/TAO_IDL/be/be_visitor_array.cpp
index 56e7c32de25..7b280e885fe 100644
--- a/TAO/TAO_IDL/be/be_visitor_array.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array.cpp
@@ -34,6 +34,7 @@
 #include "be_helper.h"
 #include "be_extern.h"
 #include "utl_identifier.h"
+#include "nr_extern.h"
 #include "ace/Log_Msg.h"
 
 #include "be_visitor_array.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index 8ff46f273f3..1afce55d486 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_array, 
-           any_op_cs, 
+ACE_RCSID (be_visitor_array,
+           any_op_cs,
            "$Id$")
 
 
@@ -50,7 +50,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -62,7 +62,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl
       << node->name () << "_slice," << be_nl
       << node->name () << "_forany" << be_uidt_nl
-      << ">::insert (" 
+      << ">::insert ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "_forany::_tao_any_destructor," << be_nl
@@ -109,9 +109,9 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << node->name () << "_forany" << be_uidt_nl
       << ">;" << be_uidt << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
-      << "# pragma instantiate TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl
-      << node->name () << "_slice," << be_nl
-      << node->name () << "_forany" << be_uidt_nl
+      << "# pragma instantiate TAO::Any_Array_Impl_T< \\" << be_idt << be_idt_nl
+      << node->name () << "_slice, \\" << be_nl
+      << node->name () << "_forany \\" << be_uidt_nl
       << ">" << be_uidt_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index b2045432825..2d4bf035662 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -18,8 +14,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_array, 
-           array_ch, 
+ACE_RCSID (be_visitor_array,
+           array_ch,
            "$Id$")
 
 // ************************************************************************
@@ -175,14 +171,22 @@ int be_visitor_array_ch::visit_array (be_array *node)
 
   *os << " ";
 
-  if (!this->ctx_->tdef ())
+  char anon_p [2];
+  ACE_OS::memset (anon_p,
+                  '\0',
+                  2);
+
+  if (this->ctx_->tdef ())
     {
-      // We are dealing with an anonymous array case. Generate a typedef with
-      // an _ prepended to the name.
-      *os << "_";
+      anon_p[0] = '\0';
+    }
+  else
+    {
+      ACE_OS::sprintf (anon_p,
+                       "_");
     }
 
-  *os << node->local_name () << "_slice";
+  *os << anon_p << node->local_name () << "_slice";
 
   if (node->gen_dimensions (os, 1) == -1)
     {
@@ -195,53 +199,74 @@ int be_visitor_array_ch::visit_array (be_array *node)
 
   *os << ";";
 
+  // Generate helper struct for use of array in a sequence.
+  *os << be_nl << be_nl
+      << "struct " << be_global->stub_export_macro ()
+      << " tao_" << node->local_name () << "_life" << be_nl
+      << "{" << be_idt_nl
+      << "static " << anon_p << node->local_name () 
+      << "_slice * tao_alloc (void);" << be_nl
+      << "static void tao_free (" << anon_p << node->local_name ()
+      << "_slice * _tao_slice);" << be_nl
+      << "static " << anon_p << node->local_name ()
+      << "_slice * tao_dup (" << be_idt << be_idt_nl
+      << "const " << anon_p << node->local_name () << "_slice * _tao_slice"
+      << be_uidt_nl
+      << ");" << be_uidt_nl
+      << "static void tao_copy (" << be_idt << be_idt_nl
+      << anon_p << node->local_name () << "_slice * _tao_to," << be_nl
+      << "const " << anon_p << node->local_name ()
+      << "_slice * _tao_from" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
+      << "};";
+
   // No _var or _out class for an anonymous (non-typedef'd) array.
   if (this->ctx_->tdef () != 0)
     {
-      // Generate the _var and _out class declarations.
-      if (this->gen_var_defn (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_array_ch::"
-                             "visit_argument - "
-                             "var_defn failed\n"),
-                            -1);
-        }
-
-      // An out defn is generated only for a variable size array.
+      // Generate _var class decl.
+      // An _out decl is generated only for a variable size array.
       if (node->size_type () == AST_Type::VARIABLE)
         {
-          if (this->gen_out_defn (node) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_array_ch::"
-                                 "visit_argument - "
-                                 "out_defn failed\n"),
-                                -1);
-            }
+          *os << be_nl << be_nl
+              << "typedef" << be_idt_nl
+              << "TAO_VarArray_Var_T<" << be_idt << be_idt_nl
+              << node->local_name () << "_slice," << be_nl
+              << "tao_" << node->local_name () << "_life" << be_uidt_nl
+              << ">" << be_uidt_nl
+              << node->local_name () << "_var;" << be_uidt_nl;
+
+          *os << "typedef" << be_idt_nl
+              << "TAO_Array_Out_T<" << be_idt << be_idt_nl
+              << node->local_name () << "_var," << be_nl
+              << node->local_name () << "_slice," << be_nl
+              << "tao_" << node->local_name () << "_life" << be_uidt_nl
+              << ">" << be_uidt_nl
+              << node->local_name () << "_out;" << be_uidt;
         }
       else
         {
-          *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-                       << "// " __FILE__ << ":" << __LINE__;
-
-          *os << be_nl << be_nl 
-              << "typedef " << node->local_name () << " "
-              << node->local_name () << "_out;";
+          *os << be_nl << be_nl
+              << "typedef" << be_idt_nl
+              << "TAO_FixedArray_Var_T<" << be_idt << be_idt_nl
+              << node->local_name () << "_slice," << be_nl
+              << "tao_" << node->local_name () << "_life" << be_uidt_nl
+              << ">" << be_uidt_nl
+              << node->local_name () << "_var;" << be_uidt;
+
+          *os << be_nl << be_nl
+              << "typedef" << be_idt_nl << node->local_name () << be_nl
+              << node->local_name () << "_out;" << be_uidt;
         }
     }
 
-  if (this->gen_forany_defn (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_ch::"
-                         "visit_argument - "
-                         "forany_defn failed\n"),
-                        -1);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-               << "// " __FILE__ << ":" << __LINE__;
+  // Generate _forany decl.
+  *os << be_nl << be_nl
+      << "typedef" << be_idt_nl
+      << "TAO_Array_Forany_T<" << be_idt << be_idt_nl
+      << anon_p << node->local_name () << "_slice," << be_nl
+      << "tao_" << node->local_name () << "_life" << be_uidt_nl
+      << ">" << be_uidt_nl
+      << anon_p << node->local_name () << "_forany;" << be_uidt;
 
   *os << be_nl << be_nl;
 
@@ -270,7 +295,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       // Typedefed array.
       *os << storage_class << node->nested_type_name (scope, "_slice")
           << " *" << be_nl;
-      *os << node->nested_type_name (scope, "_alloc") << " (void);" 
+      *os << node->nested_type_name (scope, "_alloc") << " (void);"
           << be_nl << be_nl;
       *os << storage_class << "void" << be_nl
           << node->nested_type_name (scope, "_free")
@@ -278,7 +303,7 @@ int be_visitor_array_ch::visit_array (be_array *node)
       *os << node->nested_type_name (scope, "_slice")
           << " *_tao_slice " << be_uidt_nl
           << ");" << be_uidt_nl << be_nl;
-      *os << storage_class << node->nested_type_name (scope, "_slice") 
+      *os << storage_class << node->nested_type_name (scope, "_slice")
           << " *" << be_nl;
       *os << node->nested_type_name (scope, "_dup")
           << " (" << be_idt << be_idt_nl
@@ -333,311 +358,3 @@ int be_visitor_array_ch::visit_array (be_array *node)
   node->cli_hdr_gen (1);
   return 0;
 }
-
-// Generate the var definition.
-int
-be_visitor_array_ch::gen_var_defn (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  char namebuf [NAMEBUFSIZE];
-  char varnamebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-  ACE_OS::memset (varnamebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (this->ctx_->tdef ())
-    {
-      // Typedefed array.
-      ACE_OS::sprintf (namebuf,
-                       "%s",
-                       node->local_name ()->get_string ());
-      ACE_OS::sprintf (varnamebuf,
-                       "%s_var",
-                       node->local_name ()->get_string ());
-    }
-  else
-    {
-      ACE_OS::sprintf (namebuf,
-                       "_%s",
-                       node->local_name ()->get_string ());
-      ACE_OS::sprintf (varnamebuf,
-                       "_%s_var",
-                       node->local_name ()->get_string ());
-    }
-
-  // Generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-               << "// " __FILE__ << ":" << __LINE__;
-
-  *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro ()
-      << " " << varnamebuf << be_nl;
-  *os << "{" << be_nl;
-  *os << "public:" << be_idt_nl;
-  // default constr
-  *os << varnamebuf << " (void);" << be_nl;
-  // constr from pointer to slice
-  *os << varnamebuf << " (" << namebuf << "_slice *);" << be_nl;
-  // copy constructor
-  *os << varnamebuf << " (const " << varnamebuf <<
-    " &);" << be_nl;
-  // destructor
-  *os << "~" << varnamebuf << " (void);" << be_nl;
-  *os << be_nl;
-  // assignment operator from a pointer to slice
-  *os << varnamebuf << " &operator= (" << namebuf << "_slice *);"
-      << be_nl;
-  // assignment from _var
-  *os << varnamebuf << " &operator= (const " << varnamebuf << " &);" << be_nl;
-
-  // arrow operator
-  // nothing here
-  *os << be_nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  // overloaded [] operator
-  *os << namebuf << "_slice &operator[] (CORBA::ULong index);"
-      << be_nl;
-  *os << "const " << namebuf
-      << "_slice &operator[] (CORBA::ULong index) const;" << be_nl;
-
-  // cast operators
-  *os << "operator " << namebuf << "_slice * const &() const;"
-      << be_nl;
-
-  if (node->size_type () == AST_Type::VARIABLE)
-    {
-      *os << "operator " << namebuf << "_slice *&();" << be_nl;
-    }
-
-  *os << be_nl;
-
-  // Non-spec helper function used if array is a sequence element.
-  *os << "// Calls " << namebuf << "_copy "
-      << "(used in sequences of " << namebuf << ")." << be_nl;
-  *os << "static void copy (" << be_idt << be_idt_nl
-      << namebuf << "_slice *_tao_to," << be_nl
-      << "const " << namebuf << "_slice *_tao_from" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  // in, inout, out and _retn
-  *os << "// in, inout, out, _retn " << be_nl;
-  *os << "const " << namebuf << "_slice *in (void) const;" << be_nl;
-
-  if (node->size_type () == AST_Type::FIXED)
-    {
-      *os << namebuf << "_slice *inout (void);" << be_nl;
-    }
-  else
-    {
-      *os << namebuf << "_slice *&inout (void);" << be_nl;
-    }
-
-  *os << namebuf << "_slice *&out (void);" << be_nl;
-  *os << namebuf << "_slice *_retn (void);" << be_nl;
-
-  // Generate an additional member function that returns the
-  // underlying pointer.
-  *os << namebuf << "_slice *ptr (void) const;" << be_uidt_nl;
-
-  // Generate the private section.
-  *os << "private:" << be_idt_nl;
-  *os << namebuf << "_slice *ptr_;" << be_uidt_nl;
-  *os << "};";
-
-  return 0;
-}
-
-// Generate the _out definition.
-int
-be_visitor_array_ch::gen_out_defn (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  char namebuf [NAMEBUFSIZE];
-  char outnamebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-  ACE_OS::memset (outnamebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (this->ctx_->tdef ())
-    {
-      ACE_OS::sprintf (namebuf,
-                       "%s",
-                       node->local_name ()->get_string ());
-      ACE_OS::sprintf (outnamebuf,
-                       "%s_out",
-                       node->local_name ()->get_string ());
-    }
-  else
-    {
-      // Anonymous array.
-      ACE_OS::sprintf (namebuf,
-                       "_%s",
-                       node->local_name ()->get_string ());
-      ACE_OS::sprintf (outnamebuf,
-                       "_%s_out",
-                       node->local_name ()->get_string ());
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-               << "// " __FILE__ << ":" << __LINE__;
-
-  // Generate the out definition (always in the client header).
-  *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro ()
-      << " " << outnamebuf << be_nl;
-  *os << "{" << be_nl;
-  *os << "public:" << be_idt_nl;
-
-  // No default constructor
-
-  // Constructor from a pointer to slice.
-  *os << outnamebuf << " (" << namebuf << "_slice *&);" << be_nl;
-  // Constructor from a _var &
-  *os << outnamebuf << " (" << namebuf << "_var &);" << be_nl;
-  // Constructor from a _out &
-  *os << outnamebuf << " (const " << outnamebuf << " &);" << be_nl << be_nl;
-  // Assignment operator from a _out &
-  *os << outnamebuf << " &operator= (const " << outnamebuf << " &);" << be_nl;
-  // Assignment from slice *
-  *os << outnamebuf << " &operator= (" << namebuf << "_slice *);"
-      << be_nl << be_nl;
-  // Cast
-  *os << "operator " << namebuf << "_slice *&();" << be_nl;
-  // ptr function
-  *os << namebuf << "_slice *&ptr (void);" << be_nl << be_nl;
-  // operator [] instead of ->
-  *os << namebuf << "_slice &operator[] (CORBA::ULong index);" << be_nl;
-  *os << "const " << namebuf << "_slice &operator[] "
-      << "(CORBA::ULong index) const;" << be_uidt_nl;
-
-  *os << "private:" << be_idt_nl;
-  *os << namebuf << "_slice *&ptr_;" << be_nl;
-  *os << "// Assignment from T_var not allowed." << be_nl;
-  *os << "void operator= (const " << namebuf << "_var &);" << be_uidt_nl;
-  *os << "};";
-
-  return 0;
-}
-
-// Generate the _forany definition for ourself.
-int
-be_visitor_array_ch::gen_forany_defn (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  char namebuf [NAMEBUFSIZE];
-  char foranyname [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-  ACE_OS::memset (foranyname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (this->ctx_->tdef ())
-    {
-      ACE_OS::sprintf (namebuf,
-                       "%s",
-                       node->local_name ()->get_string ());
-      ACE_OS::sprintf (foranyname,
-                       "%s_forany",
-                       node->local_name ()->get_string ());
-    }
-  else
-    {
-      // Anonymous array case.
-      ACE_OS::sprintf (namebuf,
-                       "_%s",
-                       node->local_name ()->get_string ());
-      ACE_OS::sprintf (foranyname,
-                       "_%s_forany",
-                       node->local_name ()->get_string ());
-    }
-
-  // Generate the forany definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-               << "// " __FILE__ << ":" << __LINE__;
-
-  *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro ()
-      << " " << foranyname << be_nl;
-  *os << "{" << be_nl;
-  *os << "public:" << be_idt_nl;
-
-  // Default constuctor.
-  *os << foranyname << " (void);" << be_nl;
-  // Constuctor from pointer to slice.
-  *os << foranyname << " (" << be_idt << be_idt_nl
-      << namebuf << "_slice *," << be_nl
-      << "CORBA::Boolean nocopy = 0" << be_uidt_nl
-      << ");" << be_uidt_nl;
-  // Copy constructor.
-  *os << foranyname << " (const " << foranyname
-      << " &);" << be_nl;
-  // Destructor.
-  *os << "~" << foranyname << " (void);" << be_nl << be_nl;
-
-  if (be_global->any_support ())
-    {
-      *os << "static void _tao_any_destructor (void*);" << be_nl << be_nl;
-    }
-
-  // assignment operator from a pointer to slice
-  *os << foranyname << " &operator= (" << namebuf << "_slice *);"
-      << be_nl;
-  // assignment from _var
-  *os << foranyname << " &operator= (const " << foranyname << " &);"
-      << be_nl << be_nl;
-
-  // Other extra types (cast operators, [] operator, and others)
-  // overloaded [] operator
-  *os << namebuf << "_slice &operator[] (CORBA::ULong index);"
-      << be_nl;
-  *os << "const " << namebuf
-      << "_slice &operator[] (CORBA::ULong index) const;" << be_nl << be_nl;
-
-  // cast operators
-  *os << "operator " << namebuf << "_slice * const &() const;"
-      << be_nl;
-  *os << "operator " << namebuf << "_slice *&();" << be_nl << be_nl;
-
-  // in, inout, out and _retn
-  *os << "// in, inout, out, _retn " << be_nl;
-  *os << "const " << namebuf << "_slice *in (void) const;" << be_nl;
-  *os << namebuf << "_slice *inout (void);" << be_nl;
-  *os << namebuf << "_slice *&out (void);" << be_nl;
-  *os << namebuf << "_slice *_retn (void);" << be_nl;
-
-  // Generate an additional member function that returns the
-  // underlying pointer.
-  *os << namebuf << "_slice *ptr (void) const;" << be_nl;
-
-  // Additional member function that returns the NOCOPY flag.
-  *os << "CORBA::Boolean nocopy (void) const;" << be_nl << be_nl;
-
-  *os << "static " << namebuf << "_slice * tao_alloc (void);" 
-      << be_uidt_nl << be_nl;
-
-  // Generate the private section.
-  *os << "private:" << be_idt_nl;
-  *os << namebuf << "_slice *ptr_;" << be_nl;
-  *os << "CORBA::Boolean nocopy_;" << be_uidt_nl;
-  *os << "};";
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index 809ee2b959a..44deb5b26df 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -18,8 +14,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_array, 
-           array_ci, 
+ACE_RCSID (be_visitor_array,
+           array_ci,
            "$Id$")
 
 
@@ -110,724 +106,100 @@ int be_visitor_array_ci::visit_array (be_array *node)
         }
     }
 
-  // No _var or _out class for an anonymous (non-typedef'd) array.
-  if (this->ctx_->tdef () != 0)
-    {
-      // Generate code for the _var and _out types
-      if (this->gen_var_impl (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_array_ci::"
-                             "visit_array - "
-                             "var_defn failed\n"),
-                            -1);
-        }
-      if (node->size_type () == AST_Type::VARIABLE)
-        {
-          if (this->gen_out_impl (node) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_array_ci::"
-                                 "visit_array - "
-                                 "out_defn failed\n"),
-                                -1);
-            }
-        }
-    }
-
-  // Generate code for the forany type.
-  if (this->gen_forany_impl (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_array_ci::"
-                         "visit_array - "
-                         "forany_defn failed\n"),
-                        -1);
-    }
-
-  // Since we don't generate CDR stream operators for types that
-  // explicitly contain a local interface (at some level), we 
-  // must override these Any template class methods to avoid
-  // calling the non-existent operators. The zero return value
-  // will eventually cause CORBA::MARSHAL to be raised if this
-  // type is inserted into an Any and then marshaled.
-  if (node->is_local () && be_global->any_support ())
-    {
-      TAO_OutStream *os = this->ctx_->stream ();
-
-      *os << be_nl << be_nl
-          << "template<>" << be_nl
-          << "ACE_INLINE" << be_nl
-          << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Array_Impl_T<" << node->name ()
-          << "_slice, " << node->name () 
-          << "_forany>::marshal_value (TAO_OutputCDR &)" << be_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}";
-
-      *os << be_nl << be_nl
-          << "template<>" << be_nl
-          << "ACE_INLINE" << be_nl
-          << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Array_Impl_T<" << node->name ()
-          << "_slice, " << node->name () 
-          << "_forany>::demarshal_value (TAO_InputCDR &)" << be_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}";
-    }
-
-  node->cli_inline_gen (1);
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_visitor_array_ci::gen_var_impl (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  char nodename [NAMEBUFSIZE];
+  // To hold the full and local.
   char fname [NAMEBUFSIZE];
   char lname [NAMEBUFSIZE];
-
-  ACE_OS::memset (nodename, 
-                  '\0', 
+  ACE_OS::memset (fname,
+                  '\0',
                   NAMEBUFSIZE);
-  ACE_OS::memset (fname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-  ACE_OS::memset (lname, 
-                  '\0', 
+  ACE_OS::memset (lname,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (this->ctx_->tdef ())
     {
-      // typedefed node
-      ACE_OS::sprintf (nodename, 
-                       "%s", 
-                       node->full_name ());
-      ACE_OS::sprintf (fname, 
-                       "%s_var", 
+      // Typedefed node.
+      ACE_OS::sprintf (fname, "%s",
                        node->full_name ());
-      ACE_OS::sprintf (lname, 
-                       "%s_var",
+      ACE_OS::sprintf (lname, "%s",
                        node->local_name ()->get_string ());
     }
   else
     {
-      // for anonymous arrays ...
+      // For anonymous arrays ...
       // we have to generate a name for us that has an underscope prepended to
-      // our local name. This needs to be inserted after the parents's name
+      // our local name. This needs to be inserted after the parents's name.
       if (node->is_nested ())
         {
-          be_decl *parent = 
+          be_decl *parent =
             be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename, 
-                           "%s::_%s", 
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
           ACE_OS::sprintf (fname,
-                           "%s::_%s_var", 
+                           "%s::_%s",
                            parent->full_name (),
                            node->local_name ()->get_string ());
           ACE_OS::sprintf (lname,
-                           "_%s_var",
+                           "_%s",
                            node->local_name ()->get_string ());
         }
       else
         {
-          ACE_OS::sprintf (nodename,
-                           "_%s", 
-                           node->full_name ());
           ACE_OS::sprintf (fname,
-                           "_%s_var", 
+                           "_%s",
                            node->full_name ());
           ACE_OS::sprintf (lname,
-                           "_%s_var",
+                           "_%s",
                            node->local_name ()->get_string ());
         }
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// Inline operations for class " << fname << be_nl;
-  *os << "// *************************************************************\n\n";
-
-  // default constr
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname <<
-    " (void)" << be_nl;
-  *os << "  " << ": ptr_ (0)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  // constr from a _slice *
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << nodename << "_slice *p)" << be_nl;
-  *os << "  : ptr_ (p)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  // copy constructor (deep copy)
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const " << fname
-      << " &p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ =" << be_idt_nl << nodename << "_dup " << "(" 
-      << be_idt << be_idt_nl
-      << "ACE_const_cast (" << be_idt << be_idt_nl
-      << "const "
-      << nodename << "_slice *," << be_nl
-      << "p.ptr_" << be_uidt_nl
-      << ")" << be_uidt << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // destructor
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::~" << lname << " (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << nodename << "_free (this->ptr_);" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // assignment operator
-  *os << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << nodename
-      << "_slice *p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "// Is what we own the same that is being assigned to us?"
-      << be_nl;
-  *os << "if (this->ptr_ != p)" << be_idt_nl;
-  *os << "{" << be_idt_nl;
-  *os << "// Delete our stuff and assume ownership of p." << be_nl;
-  *os << nodename << "_free (this->ptr_);" << be_nl;
-  *os << "this->ptr_ = p;" << be_uidt_nl;
-  *os << "}" << be_uidt_nl << be_nl;
-  *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // assignment operator from _var
-  *os << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *os << fname << "::operator= (const " << fname
-      << " &p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "if (this != &p)" << be_idt_nl;
-  *os << "{" << be_idt_nl;
-  *os << nodename << "_free (this->ptr_);" << be_nl << be_nl;
-  *os << "// Deep copy." << be_nl;
-  *os << "this->ptr_ =" << be_idt_nl
-      << nodename << "_dup (" << be_idt << be_idt_nl
-      << "ACE_const_cast (" << be_idt << be_idt_nl
-      << "const " << nodename << "_slice *," << be_nl\
-      << "p.ptr_" << be_uidt_nl
-      << ")" << be_uidt << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl;
-  *os << "}" << be_uidt_nl << be_nl;
-  *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // other extra methods - cast operators ()
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::operator " << nodename
-      << "_slice * const &() const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  if (node->size_type () == AST_Type::VARIABLE)
-    {
-      *os << "ACE_INLINE" << be_nl;
-      *os << fname << "::operator " << nodename
-          << "_slice *&() // cast " << be_nl;
-      *os << "{" << be_idt_nl;
-      *os << "return this->ptr_;" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
-    }
-
-  // two operator []s instead of ->
-  *os << "ACE_INLINE" << be_nl;
-  *os << "const " << nodename << "_slice &" << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index) const" << be_nl;
-  *os << "{" << be_nl;
-
-  *os << "#if defined (ACE_HAS_BROKEN_IMPLICIT_CONST_CAST)" << be_idt_nl;
-  *os << "return ACE_const_cast (" << be_idt << be_idt_nl
-      << "const " << nodename
-      << "_slice &," << be_nl
-      << "this->ptr_[index]" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-  *os << "#else" << be_idt_nl;
-  *os << "const " << nodename << "_slice &tmp = this->ptr_[index];" << be_nl;
-  *os << "return tmp;" << be_uidt_nl;
-  *os << "#endif /* ACE_HAS_BROKEN_IMPLICIT_CONST_CAST */" << be_nl;
-
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-  *os << nodename << "_slice &" << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_[index];" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // copy (in case we are a sequence element)
-  *os << "ACE_INLINE" << be_nl
-      << "void" << be_nl;
-  *os << fname << "::copy (" << be_idt << be_idt_nl
-      << nodename << "_slice *_tao_to," << be_nl
-      << "const " << nodename << "_slice *_tao_from" << be_uidt_nl
-      << ")" << be_uidt_nl;
-  *os << "{" << be_idt_nl;
-  *os << nodename << "_copy (_tao_to, _tao_from);" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // in, inout, out, and _retn
-  *os << "ACE_INLINE" << be_nl
-      << "const " << nodename << "_slice *" << be_nl;
-  *os << fname << "::in (void) const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return ACE_const_cast (" << be_idt << be_idt_nl
-      << "const " << nodename
-      << "_slice *," << be_nl
-      << "this->ptr_" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-
-  if (node->size_type () == AST_Type::FIXED)
-    {
-      *os << nodename << "_slice *" << be_nl;
-    }
-  else
-    {
-      *os << nodename << "_slice * &" << be_nl;
-    }
-
-  *os << fname << "::inout (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice * &" << be_nl;
-  *os << fname << "::out (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << nodename << "_free (this->ptr_);" << be_nl;
-  *os << "this->ptr_ = (" << nodename << "_slice *)0;" << be_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice *" << be_nl;
-  *os << fname << "::_retn (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << nodename << "_slice *tmp = this->ptr_;" << be_nl;
-  *os << "this->ptr_ = (" << nodename << "_slice *)0;" << be_nl;
-  *os << "return tmp;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // the additional ptr () member function
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice *" << be_nl;
-  *os << fname << "::ptr (void) const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}";
-
-  return 0;
-}
-
-int
-be_visitor_array_ci::gen_out_impl (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  char nodename [NAMEBUFSIZE]; // node name
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local names of the out class
-  // save the node's local name and full name in a buffer for quick use later
-  // on
-  ACE_OS::memset (nodename, 
-                  '\0', 
-                  NAMEBUFSIZE);
-  ACE_OS::memset (fname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-  ACE_OS::memset (lname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-  if (this->ctx_->tdef ())
-    {
-      // typedefed node
-      ACE_OS::sprintf (nodename, 
-                       "%s", 
-                       node->full_name ());
-      ACE_OS::sprintf (fname,
-                       "%s_out", 
-                       node->full_name ());
-      ACE_OS::sprintf (lname,
-                       "%s_out",
-                       node->local_name ()->get_string ());
-    }
-  else
-    {
-      // for anonymous arrays ...
-      // we have to generate a name for us that has an underscope prepended to
-      // our local name. This needs to be inserted after the parents's name
-      if (node->is_nested ())
-        {
-          be_decl *parent = 
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename,
-                           "%s::_%s", 
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-          ACE_OS::sprintf (fname,
-                           "%s::_%s_out", 
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-          ACE_OS::sprintf (lname,
-                           "_%s_out",
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (nodename,
-                           "_%s", 
-                           node->full_name ());
-          ACE_OS::sprintf (fname,
-                           "_%s_out", 
-                           node->full_name ());
-          ACE_OS::sprintf (lname,
-                           "_%s_out",
-                           node->local_name ()->get_string ());
-        }
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// Inline operations for class " << fname << be_nl;
-  *os << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Constructor from a pointer to slice.
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << nodename << "_slice *&p)" << be_nl;
-  *os << "  : ptr_ (p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = 0;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // constructor from _var &
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << nodename
-      << "_var &p) // constructor from _var" << be_nl;
-  *os << "  : ptr_ (p.out ())" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << nodename << "_free (this->ptr_);" << be_nl;
-  *os << "this->ptr_ = 0;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // copy constructor
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const " << fname
-      << " &p) // copy constructor" << be_nl;
-  *os << "  : ptr_ (ACE_const_cast ("
-      << fname << "&,p).ptr_)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  // assignment operator from _out &
-  *os << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *os << fname << "::operator= (const " << fname
-      << " &p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = ACE_const_cast ("
-      << fname << "&,p).ptr_;" << be_nl;
-  *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // assignment from _var is not allowed
-
-  // assignment operator from _ptr
-  *os << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << nodename
-      << "_slice *p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = p;" << be_nl;
-  *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // other extra methods - cast operator ()
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::operator " << nodename
-      << "_slice *&() // cast" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // ptr function
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice *&" << be_nl;
-  *os << fname << "::ptr (void) // ptr" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // operator [] instead of ->
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice &" << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_[index];" << be_uidt_nl;
-  *os << "}";
-
-  return 0;
-}
-
-int
-be_visitor_array_ci::gen_forany_impl (be_array *node)
-{
+  // Generate _life struct static member definitions.
   TAO_OutStream *os = this->ctx_->stream ();
 
-  char nodename [NAMEBUFSIZE]; // node name
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local names of the forany
-
-  // Save the node's local name and full name in a buffer for quick use later
-  // on
-  ACE_OS::memset (nodename, 
-                  '\0', 
-                  NAMEBUFSIZE);
-  ACE_OS::memset (fname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-  ACE_OS::memset (lname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  if (this->ctx_->tdef ())
-    {
-      // typedefed node
-      ACE_OS::sprintf (nodename, 
-                       "%s", 
-                       node->full_name ());
-      ACE_OS::sprintf (fname, 
-                       "%s_forany", 
-                       node->full_name ());
-      ACE_OS::sprintf (lname,
-                       "%s_forany",
-                       node->local_name ()->get_string ());
-    }
-  else
-    {
-      // for anonymous arrays ...
-      // we have to generate a name for us that has an underscope prepended to
-      // our local name. This needs to be inserted after the parents's name
-      if (node->is_nested ())
-        {
-          be_decl *parent = 
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (nodename, 
-                           "%s::_%s", 
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-          ACE_OS::sprintf (fname, 
-                           "%s::_%s_forany", 
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-          ACE_OS::sprintf (lname, 
-                           "_%s_forany",
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (nodename,
-                           "_%s", 
-                           node->full_name ());
-          ACE_OS::sprintf (fname,
-                           "_%s_forany", 
-                           node->full_name ());
-          ACE_OS::sprintf (lname,
-                           "_%s_forany",
-                           node->local_name ()->get_string ());
-        }
-    }
-
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// Inline operations for class " << fname << be_nl;
-  *os << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // default constr
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname <<
-    " (void)" << be_nl;
-  *os << "  " << ": ptr_ (0)," << be_nl;
-  *os << "    nocopy_ (0)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  // constr from a _slice *
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << be_idt << be_idt_nl
-      << nodename << "_slice *p," << be_nl
-      << "CORBA::Boolean nocopy" << be_uidt_nl
-      << ")" << be_uidt_nl;
-  *os << "  : ptr_ (p)," << be_nl;
-  *os << "    nocopy_ (nocopy)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  // copy constructor
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << be_idt << be_idt_nl
-      << "const " << fname << " &p" << be_uidt_nl
-      << ")" << be_uidt_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = p.ptr_;" << be_nl 
-      << "this->nocopy_ = p.nocopy_;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__;
 
-  // destructor
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::~" << lname << " (void)" << be_nl;
-  *os << "{" << be_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // assignment operator
-  *os << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << be_idt << be_idt_nl
-      << nodename << "_slice *p" << be_uidt_nl
-      << ")" << be_uidt_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = p;" << be_nl;
-  *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // assignment operator from _forany
-  *os << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << be_idt << be_idt_nl
-      << "const " << fname << " &p" << be_uidt_nl
-      << ")" << be_uidt_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = p.ptr_;" << be_nl
-      << "this->nocopy_ = p.nocopy_;" << be_nl
-      << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // other extra methods - cast operators ()
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::operator " << nodename
-      << "_slice * const &() const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::operator " << nodename
-      << "_slice *&()" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // two operator []s instead of ->
-  *os << "ACE_INLINE" << be_nl;
-  *os << "const " << nodename << "_slice &" << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index) const" << be_nl;
-  *os << "{" << be_idt_nl;
-
-  // MSVC requires an explicit cast for this. SunCC will
-  // not accept one, but will do it implicitly with a temporary.
-  // It's only a problem with multidimensional arrays.
-#if defined (ACE_HAS_BROKEN_IMPLICIT_CONST_CAST)
-  *os << "return ACE_const_cast (" << be_idt << be_idt_nl
-      << "const " << nodename << "_slice &," << be_nl
-      << "this->ptr_[index]" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-#else
-  *os << "const " << nodename << "_slice &tmp = this->ptr_[index];" << be_nl;
-  *os << "return tmp;" << be_uidt_nl;
-#endif /* ACE_HAS_BROKEN_IMPLICIT_CONST_CAST */
-
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-  *os << nodename << "_slice &" << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_[index];" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // in, inout, out, and _retn
-  *os << "ACE_INLINE" << be_nl
-      << "const " << nodename << "_slice *" << be_nl;
-  *os << fname << "::in (void) const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return ACE_const_cast (" << be_idt << be_idt_nl
-      << "const " << nodename << "_slice *," << be_nl
-      << "this->ptr_" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice *" << be_nl;
-  *os << fname << "::inout (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice * &" << be_nl;
-  *os << fname << "::out (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice *" << be_nl;
-  *os << fname << "::_retn (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << be_nl << be_nl
+      << "ACE_INLINE" << be_nl
+      << "void" << be_nl
+      << node->fwd_helper_name () << "_life::tao_free ("
+      << be_idt << be_idt_nl
+      << fname << "_slice * _tao_slice" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << fname << "_free (_tao_slice);" << be_uidt_nl
+      << "}";
 
-  // the additional ptr () member function
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice *" << be_nl;
-  *os << fname << "::ptr (void) const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << be_nl << be_nl
+      << "ACE_INLINE" << be_nl
+      << fname << "_slice *" << be_nl
+      << node->fwd_helper_name () << "_life::tao_dup ("
+      << be_idt << be_idt_nl
+      << "const " << fname << "_slice * _tao_slice" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "return " << fname << "_dup (_tao_slice);" << be_uidt_nl
+      << "}";
 
-  // the additional nocopy member function
-  *os << "ACE_INLINE" << be_nl
-      << "CORBA::Boolean" << be_nl;
-  *os << fname << "::nocopy (void) const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->nocopy_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << be_nl << be_nl
+      << "ACE_INLINE" << be_nl
+      << "void" << be_nl
+      << node->fwd_helper_name () << "_life::tao_copy ("
+      << be_idt << be_idt_nl
+      << fname << "_slice * _tao_to," << be_nl
+      << "const " << fname << "_slice * _tao_from" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << fname << "_copy (_tao_to, _tao_from);" << be_uidt_nl
+      << "}";
 
-  *os << "ACE_INLINE" << be_nl
-      << nodename << "_slice *" << be_nl
-      << fname << "::tao_alloc (void)" << be_nl
+  *os << be_nl << be_nl
+      << "ACE_INLINE" << be_nl
+      << fname << "_slice *" << be_nl
+      << node->fwd_helper_name () << "_life::tao_alloc (void)" << be_nl
       << "{" << be_idt_nl
-      << "return " << nodename << "_alloc ();" << be_uidt_nl
+      << "return " << fname << "_alloc ();" << be_uidt_nl
       << "}";
 
+  node->cli_inline_gen (1);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
index ce96ae54d64..d23bdb71b7b 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -109,17 +109,6 @@ int be_visitor_array_cs::visit_array (be_array *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  if (be_global->any_support ())
-    {
-      *os << "void " << fname << "_forany"
-          << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
-          << "{" << be_idt_nl
-          << lname << "_slice *tmp = ACE_static_cast ("
-          << lname << "_slice*, _tao_void_pointer);" << be_nl
-          << lname << "_free (tmp);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
-    }
-
   // dup method.
   *os << fname << "_slice *" << be_nl
       << fname << "_dup (const " << fname
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
index 432a1125a31..98a3ee2ccca 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp
@@ -717,7 +717,17 @@ be_visitor_array_cdr_op_ci::visit_node (be_type *bt)
             }
           else
             {
-              *os << "tao_" << bt->flat_name () << "_marshal (_tao_array";
+              
+              AST_Decl *parent = 
+                ScopeAsDecl (bt->defined_in ());
+
+              if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+                {
+                  *os << parent->name () << "::";
+                }
+
+              *os << "tao_" << bt->local_name () << "_life::"
+                  << "tao_marshal (_tao_array";
               
               for (i = 0; i < ndims; ++i)
                 {
diff --git a/TAO/TAO_IDL/be/be_visitor_component.cpp b/TAO/TAO_IDL/be/be_visitor_component.cpp
index ade5a3cfb74..f49c06ae87d 100644
--- a/TAO/TAO_IDL/be/be_visitor_component.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component.cpp
@@ -37,6 +37,7 @@
 #include "be_helper.h"
 #include "be_extern.h"
 #include "idl_defines.h"
+#include "nr_extern.h"
 #include "ace/Log_Msg.h"
 
 #include "be_visitor_component/component.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
index 7fccf516366..ace94f139e7 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -43,67 +39,11 @@ be_visitor_component_ch::visit_component (be_component *node)
       return 0;
     }
 
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // == STEP 1:  generate the class name and class names we inherit ==
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // Generate the ifdefined macro for  the _ptr type.
-  os->gen_ifdef_macro (node->flat_name (),
-                       "_ptr");
+  // This will be a no-op if it has already been done by a forward
+  // declaration.
+  node->gen_var_out_seq_decls ();
 
-  // The following two are required to be under the ifdef macro to avoid
-  // multiple declarations.
-
-  // Forward declaration.
-  *os << be_nl << be_nl << "class " << node->local_name () << ";";
-  // Generate the _ptr declaration.
-  *os << be_nl << "typedef " << node->local_name () << " *"
-      << node->local_name () << "_ptr;";
-
-  os->gen_endif ();
-
-  // Generate the ifdefined macro for the var type.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-
-  // Generate the _var declaration.
-  if (node->gen_var_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ch::"
-                         "visit_interface - "
-                         "codegen for _var failed\n"),
-                        -1);
-    }
-
-  os->gen_endif ();
-
-  // Generate the ifdef macro for the _out class.
-  os->gen_ifdef_macro (node->flat_name (),
-                       "_out");
-
-  // Generate the _out declaration.
-  if (node->gen_out_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ch::"
-                         "visit_interface - "
-                         "codegen for _out failed\n"),
-                        -1);
-    }
-
-  // Generate the endif macro.
-  os->gen_endif ();
-
-  // The above code could have been executed by the forward declaration
-  // as long as it wasn't imported. The code below can only be
-  // executed by an interface definition, also non-imported.
-  if (node->imported ())
-    {
-      return 0;
-    }
+  TAO_OutStream *os = this->ctx_->stream ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index 8573bdbcf6d..cc9730f2d8b 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -64,11 +60,19 @@ be_visitor_component_cs::visit_component (be_component *node)
   *os << "int " << node->full_name () << "::_tao_class_id = 0;"
       << be_nl << be_nl;
 
-  // Global functions to allow non-defined forward declared interfaces
-  // access to some methods in the full definition.
-  *os << node->full_name () << "_ptr" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_duplicate (" << be_idt << be_idt_nl
+  AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+  // Helper functions generated in case this interface was
+  // forward declared in some other IDL file and not defined there.
+  *os << node->full_name () << "_ptr" << be_nl;
+
+  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+    {
+      *os << parent->name () << "::";
+    }
+
+  *os << "tao_" << node->local_name () << "_life::"
+      << "tao_duplicate (" << be_idt << be_idt_nl
       << node->full_name () << "_ptr p" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -76,18 +80,30 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "::_duplicate (p);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "void" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_release (" << be_idt << be_idt_nl
+  *os << "void" << be_nl;
+
+  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+    {
+      *os << parent->name () << "::";
+    }
+
+  *os << "tao_" << node->local_name () << "_life::"
+      << "tao_release (" << be_idt << be_idt_nl
       << node->full_name () << "_ptr p" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "CORBA::release (p);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << node->full_name () <<  "_ptr" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_nil (" << be_idt << be_idt_nl
+  *os << node->full_name () <<  "_ptr" << be_nl;
+
+  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+    {
+      *os << parent->name () << "::";
+    }
+
+  *os << "tao_" << node->local_name () << "_life::"
+      << "tao_nil (" << be_idt << be_idt_nl
       << "void" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -95,9 +111,31 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "::_nil ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << node->full_name () << "_ptr" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_narrow (" << be_idt << be_idt_nl
+  *os << "CORBA::Boolean" << be_nl;
+
+  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+    {
+      *os << parent->name () << "::";
+    }
+
+  *os << "tao_" << node->local_name () << "_life::"
+      << "tao_marshal (" << be_idt << be_idt_nl
+      << node->name () << "_ptr p," << be_nl
+      << "TAO_OutputCDR &cdr" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "return p->marshal (cdr);" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << node->full_name () << "_ptr" << be_nl;
+
+  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+    {
+      *os << parent->name () << "::";
+    }
+
+  *os << "tao_" << node->local_name () << "_cast::"
+      << "tao_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr p" << be_nl
       << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -107,9 +145,15 @@ be_visitor_component_cs::visit_component (be_component *node)
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "CORBA::Object_ptr " << be_nl
-      << "tao_" << node->flat_name ()
-      << "_upcast (" << be_idt << be_idt_nl
+  *os << "CORBA::Object_ptr" << be_nl;
+
+  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+    {
+      *os << parent->name () << "::";
+    }
+
+  *os << "tao_" << node->local_name () << "_cast::"
+      << "tao_upcast (" << be_idt << be_idt_nl
       << "void *src" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -128,25 +172,6 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "return p->marshal (strm);" << be_uidt_nl
       << "}";
 
-  // Generate the _var class.
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_component_cs::"
-                         "visit_component - "
-                         "codegen for _var failed\n"),
-                        -1);
-    }
-
-  // Generate the _out class.
-  if (node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_component_cs::"
-                         "visit_component - "
-                         "codegen for _out failed\n"),
-                        -1);
-    }
 
   be_visitor_context ctx (*this->ctx_);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index 87048b92cb1..486d84ba535 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -87,7 +87,8 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
       << "template class TAO::Any_Basic_Impl_T<" << node->name () << ">;" 
       << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
-      << "# pragma instantiate TAO::Any_Basic_Impl_T<" << node->name () 
+      << "# pragma instantiate TAO::Any_Basic_Impl_T<" 
+      << node->name () << " \\"
       << ">" << be_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index d82db0ff67a..4437767b344 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -18,8 +14,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_exception, 
-           any_op_cs, 
+ACE_RCSID (be_visitor_exception,
+           any_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -49,7 +45,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -77,7 +73,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << node->name () << " *_tao_elem" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert (" 
+      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
@@ -120,10 +116,11 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \\"
       << be_idt_nl
       << "  defined (ACE_HAS_GNU_REPO)" << be_nl
-      << "template class TAO::Any_Dual_Impl_T<" << node->name () << ">;" 
+      << "template class TAO::Any_Dual_Impl_T<" << node->name () << ">;"
       << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
-      << "# pragma instantiate TAO::Any_Dual_Impl_T<" << node->name () 
+      << "# pragma instantiate TAO::Any_Dual_Impl_T<"
+      << node->name () << " \\"
       << ">" << be_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
@@ -132,7 +129,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception::visit_exception - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
@@ -151,7 +148,7 @@ be_visitor_exception_any_op_cs::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_cs::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -160,7 +157,7 @@ be_visitor_exception_any_op_cs::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_cs::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -183,7 +180,7 @@ be_visitor_exception_any_op_cs::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_cs::"
                          "visit_enum - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -206,7 +203,7 @@ be_visitor_exception_any_op_cs::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_cs::"
                          "visit_structure - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -229,10 +226,9 @@ be_visitor_exception_any_op_cs::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_cs::"
                          "visit_union - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
index f920a883a6e..c5b18dda6de 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ci.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -292,8 +288,18 @@ be_visitor_field_cdr_op_ci::visit_interface (be_interface *node)
         }
       else
         {
-          *os << "tao_" << node->flat_name () << "_marshal ("
-              << "_tao_aggregate." << f->local_name () << ".in (), strm)";
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao_marshal ("
+              << be_idt << be_idt_nl
+              << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl
+              << "strm" << be_uidt_nl
+              << ")" << be_uidt;
         }
 
       break;
@@ -348,8 +354,18 @@ be_visitor_field_cdr_op_ci::visit_interface_fwd (be_interface_fwd *node)
         }
       else
         {
-          *os << "tao_" << node->flat_name () << "_marshal ("
-              << "_tao_aggregate." << f->local_name () << ".in (), strm)";
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao_marshal ("
+              << be_idt << be_idt_nl
+              << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl
+              << "strm" << be_uidt_nl
+              << ")" << be_uidt;
         }
 
       break;
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index 0b214f6e2b3..1631fe636ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -420,6 +420,12 @@ be_visitor_field_ch::visit_sequence (be_sequence *node)
   if (!this->ctx_->alias ()
       && node->is_child (this->ctx_->scope ()))
     {
+      // Put the field node into the (anonymous) sequence node, to be
+      // used later for unique name generation.
+      be_field *member_node = 
+        be_field::narrow_from_decl (this->ctx_->node ());
+      node->field_node (member_node);
+
       be_visitor_context ctx (*this->ctx_);
       ctx.node (node);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 656fac4592e..6d14041f227 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -34,6 +34,7 @@
 #include "be_helper.h"
 #include "be_extern.h"
 #include "utl_identifier.h"
+#include "nr_extern.h"
 
 #include "be_visitor_interface.h"
 #include "be_visitor_attribute.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
index 574cee004b2..99699d86b47 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
@@ -29,53 +29,18 @@ be_visitor_amh_interface_ch::~be_visitor_amh_interface_ch (void)
 int
 be_visitor_amh_interface_ch::visit_interface (be_interface *node)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
-
   // If not already generated and not imported.
-  if (!node->cli_hdr_gen () && !node->imported ())
-    {
-      // == STEP 1:  generate the class name and class names we inherit ==
-
-      // Generate the ifdefined macro for  the _ptr type.
-      os->gen_ifdef_macro (node->flat_name (),
-                           "_ptr");
-
-      // The following two are required to be under the ifdef macro to avoid
-      // multiple declarations.
-
-      // Forward declaration.
-      *os << "class " << node->local_name () << ";" << be_nl;
-      // Generate the _ptr declaration.
-      *os << "typedef " << node->local_name () << " *"
-          << node->local_name () << "_ptr;" << be_nl;
-
-      os->gen_endif ();
-
-      // Generate the ifdefined macro for the var type.
-      os->gen_ifdef_macro (node->flat_name (), "_var");
-
-      // Generate the _var declaration.
-      if (node->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_ch::"
-                             "visit_interface - "
-                             "codegen for _var failed\n"),
-                            -1);
-        }
-
-      os->gen_endif ();
-
-    }
-
-  // The above code could have been executed by the forward declaration
-  // as long as it wasn't imported. The code below can only be
-  // executed by an interface definition, also non-imported.
-  if (node->imported ())
+  if (node->cli_hdr_gen () || node->imported ())
     {
       return 0;
     }
 
+  // This will be a no-op if it has already been done by a forward
+  // declaration.
+  node->gen_var_out_seq_decls ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
   // Now the interface definition itself.
   os->gen_ifdef_macro (node->flat_name ());
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
index 3f35c0062b1..711b6ce0527 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
@@ -51,9 +51,6 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  // Generate the Any <<= and >>= operator declarations.
-  os->indent ();
-
   *os << be_global->stub_export_macro () << " void"
       << " operator<<= (CORBA::Any &, " << node->name ()
       << "_ptr); // copying" << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index 279be99f9bc..e7f971bdcb3 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -17,8 +15,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface, 
-           any_op_cs, 
+ACE_RCSID (be_visitor_interface,
+           any_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -111,7 +109,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   *os << node->full_name () << ","
       << node->full_name () << "_var>;" << be_nl
-      << "template class TAO::Any_Impl_T<" << node->name () << ">;" 
+      << "template class TAO::Any_Impl_T<" << node->name () << ">;"
       << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl;
 
@@ -126,7 +124,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   *os << node->full_name () << ", "
       << node->full_name () << "_var>" << be_nl
-      << "# pragma instantiate TAO::Any_Impl_T<" << node->name () << ">" 
+      << "# pragma instantiate TAO::Any_Impl_T<" << node->name () << ">"
       << be_uidt_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 436ae255657..8d6075fd520 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -43,69 +39,13 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       return 0;
     }
 
+  // This will be a no-op if it has already been done by a forward
+  // declaration.
+  node->gen_var_out_seq_decls ();
+
   TAO_OutStream *os = this->ctx_->stream ();
   long i;
 
-  // == STEP 1:  generate the class name and class names we inherit ==
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // Generate the ifdefined macro for  the _ptr type.
-  os->gen_ifdef_macro (node->flat_name (),
-                       "_ptr");
-
-  // The following two are required to be under the ifdef macro to avoid
-  // multiple declarations.
-
-  // Forward declaration.
-  *os << be_nl << be_nl << "class " << node->local_name () << ";";
-  // Generate the _ptr declaration.
-  *os << be_nl << "typedef " << node->local_name () << " *"
-      << node->local_name () << "_ptr;";
-
-  os->gen_endif ();
-
-  // Generate the ifdefined macro for the var type.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-
-  // Generate the _var declaration.
-  if (node->gen_var_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ch::"
-                         "visit_interface - "
-                         "codegen for _var failed\n"),
-                        -1);
-    }
-
-  os->gen_endif ();
-
-  // Generate the ifdef macro for the _out class.
-  os->gen_ifdef_macro (node->flat_name (),
-                       "_out");
-
-  // Generate the _out declaration.
-  if (node->gen_out_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ch::"
-                         "visit_interface - "
-                         "codegen for _out failed\n"),
-                        -1);
-    }
-
-  // Generate the endif macro.
-  os->gen_endif ();
-
-  // The above code could have been executed by the forward declaration
-  // as long as it wasn't imported. The code below can only be
-  // executed by an interface definition, also non-imported.
-  if (node->imported ())
-    {
-      return 0;
-    }
-
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index 012254afd0c..a0661719285 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -181,7 +177,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
           << ")" << be_nl;
       *os << ": ACE_NESTED_CLASS (CORBA, Object) (ior, oc)";
 
-      *os << be_uidt_nl 
+      *os << be_uidt_nl
           << "{" << be_nl
           << "}" ;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 0437ece347e..685674b6236 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -1,8 +1,3 @@
-//
-// $Id$
-
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -23,7 +18,6 @@ ACE_RCSID (be_visitor_interface,
            interface_cs,
            "$Id$")
 
-
 // ************************************************************
 // Interface visitor for client stubs
 // ************************************************************
@@ -60,131 +54,140 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__;
 
   // Initialize the static narrrowing helper variable.
-  *os << "int " << node->full_name () << "::_tao_class_id = 0;"
-      << be_nl << be_nl;
+  *os << be_nl << be_nl
+      << "int " << node->full_name () << "::_tao_class_id = 0;";
 
-  // Global functions to allow non-defined forward declared interfaces
-  // access to some methods in the full definition.
-  *os << node->full_name () << "_ptr" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_duplicate (" << be_idt << be_idt_nl
-      << node->full_name () << "_ptr p" << be_uidt_nl
+  const char *fhname = node->fwd_helper_name ();
+
+  // Helper functions generated in case this interface was
+  // forward declared in some other IDL file and not defined there.
+  *os << be_nl << be_nl
+      << node->full_name () << "_ptr" << be_nl
+      << fhname << "_life::"
+      << "tao_duplicate (" << be_idt << be_idt_nl
+      << node->nested_type_name (this->ctx_->scope ()) 
+      << "_ptr p" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return " << node->full_name ()
+      << "return " << node->nested_type_name (this->ctx_->scope ())
       << "::_duplicate (p);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}";
 
-  *os << "void" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_release (" << be_idt << be_idt_nl
-      << node->full_name () << "_ptr p" << be_uidt_nl
+  *os << be_nl << be_nl
+      << "void" << be_nl
+      << fhname << "_life::"
+      << "tao_release (" << be_idt << be_idt_nl
+      << node->nested_type_name (this->ctx_->scope ()) 
+      << "_ptr p" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "CORBA::release (p);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "}";
 
-  *os << node->full_name () <<  "_ptr" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_nil (" << be_idt << be_idt_nl
+  *os << be_nl << be_nl
+      << node->full_name () <<  "_ptr" << be_nl
+      << fhname << "_life::"
+      << "tao_nil (" << be_idt << be_idt_nl
       << "void" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return " << node->full_name ()
+      << "return " << node->nested_type_name (this->ctx_->scope ())
       << "::_nil ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << node->full_name () << "_ptr" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_narrow (" << be_idt << be_idt_nl;
-
-  if (node->is_abstract ())
-    {
-      *os << "CORBA::AbstractBase *p" << be_nl;
-    }
-  else
-    {
-      *os << "CORBA::Object *p" << be_nl;
-    }
+      << "}";
 
-  *os << "ACE_ENV_ARG_DECL" << be_uidt_nl
+  *os << be_nl << be_nl
+      << "CORBA::Boolean" << be_nl
+      << fhname << "_life::"
+      << "tao_marshal (" << be_idt << be_idt_nl
+      << node->nested_type_name (this->ctx_->scope ()) 
+      << "_ptr p," << be_nl
+      << "TAO_OutputCDR &cdr" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return " << node->full_name ()
-      << "::_narrow (p ACE_ENV_ARG_PARAMETER);"
-      << be_uidt_nl
-      << "}" << be_nl << be_nl;
+      << "return p->marshal (cdr);" << be_uidt_nl
+      << "}";
 
-  if (node->is_abstract ())
-    {
-      *os << "CORBA::AbstractBase *" << be_nl;
-    }
-  else
+  if (! node->is_abstract ())
     {
-      *os << "CORBA::Object *" << be_nl;
-    }
+      *os << be_nl << be_nl
+          << node->full_name () << "_ptr" << be_nl
+          << fhname << "_cast::"
+          << "tao_narrow (" << be_idt << be_idt_nl
+          << "CORBA::Object *p" << be_nl
+          << "ACE_ENV_ARG_DECL" << be_uidt_nl
+          << ")" << be_uidt_nl
+          << "{" << be_idt_nl
+          << "return " << node->nested_type_name (this->ctx_->scope ())
+          << "::_narrow (p ACE_ENV_ARG_PARAMETER);"
+          << be_uidt_nl
+          << "}";
 
-  *os << "tao_" << node->flat_name ()
-      << "_upcast (" << be_idt << be_idt_nl
-      << "void *src" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << node->full_name () << " **tmp =" << be_idt_nl
-      << "ACE_static_cast (" << node->full_name ()
-      << " **, src);" << be_uidt_nl
-      << "return *tmp;" << be_uidt_nl
-      << "}";
+      *os << be_nl << be_nl
+          << "CORBA::Object *" << be_nl
+          << fhname << "_cast::"
+          << "tao_upcast (" << be_idt << be_idt_nl
+          << "void *src" << be_uidt_nl
+          << ")" << be_uidt_nl
+          << "{" << be_idt_nl
+          << node->nested_type_name (this->ctx_->scope ()) 
+          << " **tmp =" << be_idt_nl
+          << "ACE_static_cast (" 
+          << node->nested_type_name (this->ctx_->scope ())
+          << " **, src);" << be_uidt_nl
+          << "return *tmp;" << be_uidt_nl
+          << "}";
+    }
 
   if (node->has_mixed_parentage ())
     {
       *os << be_nl << be_nl
           << "void" << be_nl
-          << "CORBA::release (" << node->name () << "_ptr p)" << be_nl
+          << "CORBA::release (" 
+          << node->nested_type_name (this->ctx_->scope ()) 
+          << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "CORBA::AbstractBase_ptr abs = p;" << be_nl
           << "CORBA::release (abs);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
+          << "}";
 
-      *os << "CORBA::Boolean" << be_nl
-          << "CORBA::is_nil (" << node->name () << "_ptr p)" << be_nl
+      *os << be_nl << be_nl
+          << "CORBA::Boolean" << be_nl
+          << "CORBA::is_nil (" 
+          << node->nested_type_name (this->ctx_->scope ()) 
+          << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "CORBA::Object_ptr obj = p;" << be_nl
           << "return CORBA::is_nil (obj);" << be_uidt_nl
           << "}";
     }
 
-  *os << be_nl << be_nl
-      << "CORBA::Boolean" << be_nl
-      << "tao_" << node->flat_name () << "_marshal (" << be_idt << be_idt_nl
-      << node->name () << "_ptr p," << be_nl
-      << "TAO_OutputCDR &strm" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "return p->marshal (strm);" << be_uidt_nl
-      << "}";
-
-  // Generate the _var class.
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_cs::"
-                         "visit_interface - "
-                         "codegen for _var failed\n"),
-                        -1);
-    }
-
-  // Generate the _out class.
-  if (node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_cs::"
-                         "visit_interface - "
-                         "codegen for _out failed\n"),
-                        -1);
-    }
+  *os << be_nl
+      << "\n#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)" << be_idt_nl
+      << "template class" << be_idt_nl
+      << "TAO_Objref_Var_T<" << be_idt << be_idt_nl
+      << node->name () << "," << be_nl
+      << node->fwd_helper_name () << "_life" << be_uidt_nl
+      << ">;" << be_uidt << be_uidt_nl
+      << "template class" << be_idt_nl
+      << "TAO_Objref_Out_T<" << be_idt << be_idt_nl
+      << node->name () << "," << be_nl
+      << node->fwd_helper_name () << "_life" << be_uidt_nl
+      << ">;" << be_uidt << be_uidt << be_uidt_nl
+      << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
+      << "# pragma instantiate \\" << be_idt << be_idt_nl
+      << "TAO_Objref_Var_T< \\" << be_idt << be_idt_nl
+      << node->name () << ", \\" << be_nl
+      << node->fwd_helper_name () << "_life \\" << be_uidt_nl
+      << ">" << be_uidt << be_uidt << be_uidt_nl
+      << "# pragma instantiate \\" << be_idt << be_idt_nl
+      << "TAO_Objref_Out_T< \\" << be_idt << be_idt_nl
+      << node->name () << ", \\" << be_nl
+      << node->fwd_helper_name () << "_life \\" << be_uidt_nl
+      << ">" << be_uidt << be_uidt << be_uidt_nl
+      << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
   be_visitor_context ctx = (*this->ctx_);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
index dba8cd37da6..8be0d364095 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
@@ -47,64 +47,14 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
       return 0;
     }
 
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // All we do in this is generate a forward declaration of the class.
-  *os << be_nl << be_nl << "class " << node->local_name () << ";";
-
-  // Generate the ifdefined macro for the _ptr type.
-  os->gen_ifdef_macro (node->flat_name (), "_ptr");
-
-  // Generate the _ptr typedef.
-  *os << be_nl << be_nl 
-      << "typedef " << node->local_name () << " *" << node->local_name ()
-      << "_ptr;";
-
-  os->gen_endif ();
-
   AST_Interface *fd = node->full_definition ();
   be_interface *bfd = be_interface::narrow_from_decl (fd);
 
-  if (!fd->is_defined ())
-    {
-      // To generate extern declarations after all modules are closed.
-      be_global->non_defined_interfaces.enqueue_tail (node);
-    }
-
-  // Enclose under an ifdef macro.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-
-  // Generate the _var declaration.
-  if (bfd->gen_var_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_fwd_ch::"
-                         "visit_interface_fwd - "
-                         "codegen for _var failed\n"),
-                        -1);
-    }
-
-  // Generate an endif.
-  os->gen_endif ();
-
-  // Enclose under an ifdef macro.
-  os->gen_ifdef_macro (node->flat_name (), "_out");
-
-  // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-  if (bfd->gen_out_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_fwd_ch::"
-                         "visit_interface_fwd - "
-                         "codegen for _out failed\n"),
-                        -1);
-    }
+  // This will be a no-op if it has already been done for this node.
+  bfd->gen_var_out_seq_decls ();
 
-  // Generate the endif macro.
-  os->gen_endif ();
+  // Copy the fwd helper name back to the forward declared interface node.
+  node->fwd_helper_name (bfd->fwd_helper_name ());
 
   node->cli_hdr_gen (I_TRUE);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_exceptlist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_exceptlist.cpp
index f60dd96d77d..47364de4493 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_exceptlist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_exceptlist.cpp
@@ -106,6 +106,7 @@ be_visitor_operation_interceptors_exceptlist::gen_exceptlist (
   *os << be_uidt_nl << "};" << be_nl;
 
   long excp_count = (node->exceptions())->length ();
+
   *os << be_nl
       << "exception_list->length (" << excp_count << ");" << be_nl
       << "for (CORBA::ULong i = 0; i < " << excp_count << "; ++i)"
@@ -118,5 +119,5 @@ be_visitor_operation_interceptors_exceptlist::gen_exceptlist (
       << "(*exception_list)[i] = tcp_object;" << be_uidt_nl
       << "}\n" << be_uidt;
 
-return 0;
+  return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
index a92df07a4c2..1ab6279b956 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -173,6 +173,7 @@ be_visitor_operation_rettype::visit_predefined_type (be_predefined_type *node)
 
       break;
     case AST_PredefinedType::PT_any:
+    case AST_PredefinedType::PT_value:
       {
         *os << bt->name () << " *";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
index 9e7c70612f6..8dd768e1899 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
@@ -101,8 +101,18 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface (be_interface *node)
     }
   else
     {
-      *os << bt->name () << "_var _tao_retval ("
-          << " tao_" << node->flat_name () << "_nil ());";
+      *os << bt->name () << "_var _tao_retval (" << be_idt << be_idt_nl;
+
+      AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+      if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+        {
+          *os << parent->name () << "::";
+        }
+
+      *os << "tao_" << node->local_name () << "_life::tao_nil ()" 
+          << be_uidt_nl
+          << ");" << be_uidt_nl;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
index 067f4a28a6d..0b04a6890c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
@@ -45,9 +45,9 @@ be_visitor_root_cdr_op::visit_root (be_root *node)
   if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_CDR_OP_CH)
     {
       *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          << "// " << __FILE__ << ":" << __LINE__;
 
-      *os << "#ifndef __ACE_INLINE__";
+      *os << "\n\n#ifndef __ACE_INLINE__";
     }
 
   if (this->visit_scope (node) == -1)
@@ -61,9 +61,9 @@ be_visitor_root_cdr_op::visit_root (be_root *node)
   if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_CDR_OP_CH)
     {
       *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+          << "// " << __FILE__ << ":" << __LINE__;
 
-      *os << "#endif /* __ACE_INLINE__ */";
+      *os << "\n\n#endif /* __ACE_INLINE__ */";
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index f628b4483aa..e4edbad1c37 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -18,8 +14,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root, 
-           root, 
+ACE_RCSID (be_visitor_root,
+           root,
            "$Id$")
 
 // Generic Root visitor
@@ -47,7 +43,7 @@ int be_visitor_root::visit_root (be_root *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::init - "
-                         "failed to initialize context\n"), 
+                         "failed to initialize context\n"),
                         -1);
     }
 
@@ -55,7 +51,7 @@ int be_visitor_root::visit_root (be_root *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::visit_root - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
@@ -111,7 +107,7 @@ int be_visitor_root::visit_root (be_root *node)
 
           if (ifwd->is_valuetype ())
             {
-              *os << "// External declarations for undefined valuetype" 
+              *os << "// External declarations for undefined valuetype"
                   << be_nl << be_nl
                   << "// " << ifwd->full_name () << be_nl;
 
@@ -129,52 +125,6 @@ int be_visitor_root::visit_root (be_root *node)
                   << ifwd->full_name () << " *" << be_uidt_nl
                   << ");" << be_uidt;
             }
-          else
-            {
-              *os << "// External declarations for undefined interface" 
-                  << be_nl << be_nl
-                  << "// " << ifwd->full_name () << be_nl;
-
-              *os << be_global->stub_export_macro () << be_nl
-                  << ifwd->full_name () << "_ptr" << be_nl
-                  << "tao_" << ifwd->flat_name ()
-                  << "_duplicate ("
-                  << be_idt << be_idt_nl
-                  << ifwd->full_name  () << "_ptr" << be_uidt_nl
-                  << ");" << be_uidt_nl << be_nl
-                  << be_global->stub_export_macro () << be_nl
-                  << "void" << be_nl
-                  << "tao_" << ifwd->flat_name ()
-                  << "_release (" << be_idt << be_idt_nl
-                  << ifwd->full_name () << "_ptr" << be_uidt_nl
-                  << ");" << be_uidt_nl << be_nl
-                  << be_global->stub_export_macro () << be_nl
-                  << ifwd->full_name () << "_ptr" << be_nl
-                  << "tao_" << ifwd->flat_name ()
-                  << "_nil (" << be_idt << be_idt_nl
-                  << "void" << be_uidt_nl
-                  << ");" << be_uidt_nl << be_nl
-                  << be_global->stub_export_macro () << be_nl
-                  << ifwd->full_name () << "_ptr" << be_nl
-                  << "tao_" << ifwd->flat_name ()
-                  << "_narrow (" << be_idt << be_idt_nl
-                  << "CORBA::Object *" << be_nl
-                  << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
-                  << ");" << be_uidt_nl << be_nl
-                  << be_global->stub_export_macro () << be_nl
-                  << "CORBA::Object *" << be_nl
-                  << "tao_" << ifwd->flat_name ()
-                  << "_upcast (" << be_idt << be_idt_nl
-                  << "void *" << be_uidt_nl
-                  << ");" << be_uidt_nl << be_nl
-                  << be_global->stub_export_macro () << be_nl
-                  << "CORBA::Boolean" << be_nl
-                  << "tao_" << ifwd->flat_name () << "_marshal ("
-                  << be_idt << be_idt_nl
-                  << ifwd->full_name () << "_ptr," << be_nl
-                  << "TAO_OutputCDR &" << be_uidt_nl
-                  << ");" << be_uidt;
-            }
         }
 
       size = be_global->mixed_parentage_interfaces.size ();
@@ -184,7 +134,7 @@ int be_visitor_root::visit_root (be_root *node)
           *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
               << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-          *os << "// Overrides of CORBA::release and CORBA::is_nil for" 
+          *os << "// Overrides of CORBA::release and CORBA::is_nil for"
               << be_nl
               << "// interfaces that inherit from both CORBA::Object" << be_nl
               << "// and CORBA::AbstractBase." << be_nl << be_nl
@@ -246,7 +196,7 @@ int be_visitor_root::visit_root (be_root *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_root::"
                              "visit_root - "
-                             "failed to generate OBV_ things\n"),  
+                             "failed to generate OBV_ things\n"),
                             -1);
         }
     }
@@ -324,7 +274,7 @@ int be_visitor_root::visit_root (be_root *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_root::"
                            "visit_constant - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -334,7 +284,7 @@ int be_visitor_root::visit_root (be_root *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                      "(%N:%l) be_visitor_root::"
                          "visit_root - "
-                         "failed to generate Any operators\n"),  
+                         "failed to generate Any operators\n"),
                         -1);
     }
 
@@ -377,17 +327,17 @@ int be_visitor_root::visit_root (be_root *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_root::"
                            "visit_constant - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
-    }  
-    
+    }
+
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_root - "
-                         "failed to generate CDR operators\n"),  
+                         "failed to generate CDR operators\n"),
                         -1);
     }
 
@@ -442,7 +392,7 @@ be_visitor_root::visit_constant (be_constant *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_constant - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -505,7 +455,7 @@ be_visitor_root::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_enum - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -580,7 +530,7 @@ be_visitor_root::visit_exception (be_exception *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_exception - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -679,7 +629,7 @@ be_visitor_root::visit_interface (be_interface *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_root::"
                            "visit_interface - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -693,7 +643,7 @@ be_visitor_root::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_interface - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -707,7 +657,7 @@ be_visitor_root::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_interface - "
-                         "NUL visitor\n"), 
+                         "NUL visitor\n"),
                         -1);
     }
 
@@ -716,7 +666,7 @@ be_visitor_root::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_interface - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -738,7 +688,7 @@ be_visitor_root::visit_interface (be_interface *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_root::"
                              "visit_interface - "
-                             "NUL visitor\n"), 
+                             "NUL visitor\n"),
                             -1);
         }
 
@@ -747,7 +697,7 @@ be_visitor_root::visit_interface (be_interface *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_root::"
                              "visit_interface - "
-                             "failed to accept visitor\n"),  
+                             "failed to accept visitor\n"),
                             -1);
         }
 
@@ -803,7 +753,7 @@ be_visitor_root::visit_interface_fwd (be_interface_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_interface_fwd - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -896,7 +846,7 @@ be_visitor_root::visit_valuetype (be_valuetype *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_valuetype - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -947,7 +897,7 @@ be_visitor_root::visit_valuetype_fwd (be_valuetype_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_valuetype_fwd - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -1040,7 +990,7 @@ be_visitor_root::visit_eventtype (be_eventtype *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_module::"
                          "visit_eventtype - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -1091,14 +1041,14 @@ be_visitor_root::visit_eventtype_fwd (be_eventtype_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_module::"
                          "visit_eventtype_fwd - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
   return 0;
 }
 
-int 
+int
 be_visitor_root::visit_component (be_component *node)
 {
   // Instantiate a visitor context with a copy of our context. This info
@@ -1184,14 +1134,14 @@ be_visitor_root::visit_component (be_component *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_component - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
   return 0;
 }
 
-int 
+int
 be_visitor_root::visit_component_fwd (be_component_fwd *node)
 {
   // Instantiate a visitor context with a copy of our context. This info
@@ -1235,14 +1185,14 @@ be_visitor_root::visit_component_fwd (be_component_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_component_fwd - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
   return 0;
 }
 
-int 
+int
 be_visitor_root::visit_home (be_home *node)
 {
   // Instantiate a visitor context with a copy of our context. This info
@@ -1268,7 +1218,7 @@ be_visitor_root::visit_home (be_home *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_home - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -1344,7 +1294,7 @@ be_visitor_root::visit_module (be_module *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_root::"
                            "visit_module - "
-                           "Bad context state\n"), 
+                           "Bad context state\n"),
                           -1);
       }
     }
@@ -1354,7 +1304,7 @@ be_visitor_root::visit_module (be_module *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_module - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -1429,7 +1379,7 @@ be_visitor_root::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_structure - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -1462,7 +1412,7 @@ be_visitor_root::visit_structure_fwd (be_structure_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_structure_fwd - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -1537,7 +1487,7 @@ be_visitor_root::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_union - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -1571,7 +1521,7 @@ be_visitor_root::visit_union_fwd (be_union_fwd *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_interface_fwd - "
-                         "failed to accept visitor\n"),  
+                         "failed to accept visitor\n"),
                         -1);
     }
 
@@ -1646,7 +1596,7 @@ be_visitor_root::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root::"
                          "visit_typedef - "
-                         "failed to accept visitor"),  
+                         "failed to accept visitor"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence.cpp b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
index 288ceca735c..9a2fccd2b79 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
@@ -34,8 +34,10 @@
 #include "be_valuetype_fwd.h"
 #include "be_helper.h"
 #include "be_extern.h"
+#include "ast_root.h"
 #include "utl_identifier.h"
 #include "nr_extern.h"
+#include "global_extern.h"
 
 #include "be_visitor_sequence.h"
 #include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
index 495d8ed0dfd..b2a7107704f 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
@@ -66,7 +66,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
   *os << " CORBA::Boolean"
       << " operator>>= (const CORBA::Any &, ";
   *os << node->name ();
-  *os << " *&); // deprecated\n";
+  *os << " *&); // deprecated" << be_nl;
   *os << be_global->stub_export_macro ();
   *os << " CORBA::Boolean"
       << " operator>>= (const CORBA::Any &, const ";
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
index 03c5ebe2613..6db0c5878ef 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
@@ -127,13 +127,35 @@ be_visitor_sequence_buffer_type::visit_interface_fwd (be_interface_fwd *node)
 int
 be_visitor_sequence_buffer_type::visit_valuetype (be_valuetype *node)
 {
-  return this->visit_interface (node);
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
+    {
+      *os << node->nested_type_name (this->ctx_->scope (), " *");
+    }
+  else
+    {
+      *os << node->name () << " *";
+    }
+
+  return 0;
 }
 
 int
 be_visitor_sequence_buffer_type::visit_valuetype_fwd (be_valuetype_fwd *node)
 {
-  return this->visit_interface_fwd (node);
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH)
+    {
+      *os << node->nested_type_name (this->ctx_->scope (), " *");
+    }
+  else
+    {
+      *os << node->name () << " *";
+    }
+
+  return 0;
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
index 84feb113dcd..d74372c6f8c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
@@ -42,12 +42,25 @@ int
 be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
 {
   if (node->cli_hdr_cdr_op_gen ()
-      || node->imported ()
-      || node->is_local ())
+      || node->imported ())
     {
       return 0;
     }
 
+  be_type *base_type = be_type::narrow_from_decl (node->base_type ());
+
+  // If our base type is an anonymous sequence, generate code for it here.
+  if (base_type->node_type () == AST_Decl::NT_sequence)
+    {
+      if (base_type->accept (this) != 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_sequence_cdr_op_ch::visit_sequence -"
+                             "codegen for nested anonymous sequence failed\n"),
+                            -1);
+        }
+    }
+
   TAO_OutStream *os = this->ctx_->stream ();
 
   be_type *bt = be_type::narrow_from_decl (node);
@@ -61,8 +74,8 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
   if (!tdef)
     {
       *os << "\n\n#if !defined _TAO_CDR_OP_"
-          << node->flat_name () << "_H_" << be_nl
-          << "#define _TAO_CDR_OP_" << node->flat_name () << "_H_";
+          << node->flat_name () << "_H_"
+          << "\n#define _TAO_CDR_OP_" << node->flat_name () << "_H_";
     }
 
   *os << be_nl << be_nl 
@@ -79,8 +92,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
 
   if (!tdef)
     {
-      *os << be_nl << be_nl
-          << "#endif /* _TAO_CDR_OP_"
+      *os << "\n\n#endif /* _TAO_CDR_OP_"
           << node->flat_name () << "_H_ */";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp
index 9a37a785340..fb55cd594c0 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ci.cpp
@@ -43,8 +43,7 @@ int
 be_visitor_sequence_cdr_op_ci::visit_sequence (be_sequence *node)
 {
   if (node->cli_inline_cdr_op_gen ()
-      || node->imported ()
-      || node->is_local ())
+      || node->imported ())
     {
       return 0;
     }
@@ -55,15 +54,13 @@ be_visitor_sequence_cdr_op_ci::visit_sequence (be_sequence *node)
   // generate code for the sequence here.
 
   // Retrieve the base type.
-  AST_Type *base = node->base_type ();
+  be_type *base = be_type::narrow_from_decl(node->base_type ());
   AST_Decl::NodeType nt = base->node_type ();
 
+  // If our base type is an anonymous sequence, generate code for it here.
   if (nt == AST_Decl::NT_sequence && base->anonymous ())
     {
-      be_sequence *bs = be_sequence::narrow_from_decl (base);
-      be_visitor_sequence_cdr_op_ci visitor (this->ctx_);
-
-      if (bs->accept (&visitor) == -1)
+      if (base->accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "be_visitor_sequence_cdr_op_ci::"
@@ -73,8 +70,8 @@ be_visitor_sequence_cdr_op_ci::visit_sequence (be_sequence *node)
         }
     }
 
-  // Sequences are *always* generated in the .cpp file, it doesn't
-  // save all that time to generate them inline and this breaks
+  // Sequence CDR operators are always generated in the .cpp file, it doesn't
+  // save all that much time to generate them inline and this breaks
   // the dependencies for recursive types.
 
   be_type *bt = be_type::narrow_from_decl (node);
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 03740875566..b022b6f0cb7 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -1,7 +1,3 @@
-//
-// $Id$
-//
-
 // ============================================================================
 //
 // = LIBRARY
@@ -19,8 +15,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_sequence, 
-           cdr_op_cs, 
+ACE_RCSID (be_visitor_sequence,
+           cdr_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -42,18 +38,8 @@ be_visitor_sequence_cdr_op_cs::~be_visitor_sequence_cdr_op_cs (void)
 int
 be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
 {
-  if (this->ctx_->alias ())
-    {
-      // We are here because the base type of the sequence node is
-      // itself a typedef'd sequence i.e., this is nested call resulting
-      // from bt->accept(0 below. For the case of sequence of
-      // anonymous sequence, see comment below.
-      return this->visit_node (node);
-    }
-
   if (node->cli_stub_cdr_op_gen ()
-      || node->imported ()
-      || node->is_local ())
+      || node->imported ())
     {
       return 0;
     }
@@ -72,47 +58,35 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
                         -1);
     }
 
-  // If our base type is anonymous sequence,
-  // generate code for the base type sequence here.
+  // Generate the CDR << and >> operator defns.
+
+  // Save the sequence node for further use.
+  this->ctx_->node (node);
 
+  // If our element type is an anonymous sequence, generate code for it here.
   if (bt->node_type () == AST_Decl::NT_sequence)
     {
-      int status = 
-          this->gen_anonymous_base_type (
-              bt,
-              TAO_CodeGen::TAO_ROOT_CDR_OP_CS
-            );
-
-      if (status == -1)
+      if (bt->accept (this) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cdr_op_cs::"
+                             "be_visitor_sequence_cdr_op_cs::"
                              "visit_sequence - "
-                             "gen_anonymous_base_type failed\n"),
+                             "Base type codegen failed\n"),
                             -1);
         }
     }
 
-  // Generate the CDR << and >> operator defns.
-
-  // Save the sequence node for further use.
-  this->ctx_->node (node);
-
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
     << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  // If we're an anonymous sequence, we must protect against
-  // being declared more than once.
-  if (!this->ctx_->tdef ())
-    {
-      *os << "#if !defined _TAO_CDR_OP_"
-          << node->flat_name () << "_CPP_" << be_nl
-          << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_"
-          << be_nl << be_nl;
-    }
+  *os << "#if !defined _TAO_CDR_OP_"
+      << node->flat_name () << "_CPP_" << be_nl
+      << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_"
+      << be_nl << be_nl;
 
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
+
   *os << "CORBA::Boolean operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->name ()
@@ -121,133 +95,120 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       << "{" << be_idt_nl;
 
   // First encode the sequence length.
-  *os << "CORBA::ULong _tao_seq_len = _tao_sequence.length ();" 
+  *os << "CORBA::ULong _tao_seq_len = _tao_sequence.length ();"
       << be_nl << be_nl;
   *os << "if (strm << _tao_seq_len)" << be_idt_nl
       << "{" << be_idt_nl;
   // Now encode the sequence elements.
   *os << "// Encode all elements." << be_nl;
 
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      this->visit_node (node);
-    }
-  else
-    {
-      if (bt->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_sequence_cdr_op_cs::"
-                             "visit_sequence - "
-                             "Base type codegen failed\n"),
-                            -1);
-        }
-    }
+  this->visit_node (bt);
 
   *os << "}" << be_uidt_nl << be_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   //  Set the sub state as generating code for the input operator.
-  os->indent ();
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
 
   *os << "CORBA::Boolean operator>> (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &strm," << be_nl
-      << node->name () << " &_tao_sequence" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-  // First retrieve the length and adjust the sequence length accordingly.
-  *os << "CORBA::ULong _tao_seq_len;" << be_nl << be_nl;
-  *os << "if (strm >> _tao_seq_len)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  // Add a sanity check for the length of a sequence.
-  *os << "// Add a check to the length of the sequence" << be_nl;
-  *os << "// to make sure it does not exceed the length" << be_nl;
-  *os << "// of the stream. (See bug 58.)" << be_nl;
-  *os << "if (_tao_seq_len > strm.length ())" << be_idt_nl
-      << "{" << be_idt_nl;
-  *os << "return 0;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl;
-
-  // Now check if the length does not exceed the maximum. We do this only
-  // for bounded sequences
-  AST_Expression *expr = node->max_size ();
-
-  if (expr == 0 || (expr != 0 && expr->ev () == 0))
+      << "TAO_InputCDR &";
+      
+  if (! bt->is_local ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_sequence - "
-                         "bad sequence dimension\n"),
-                        -1);
+      *os << "strm";
     }
-
-  if (expr->ev ()->et == AST_Expression::EV_ulong)
+    
+  *os << "," << be_nl
+      << node->name () << " &";
+      
+  if (! bt->is_local ())
     {
-      if (expr->ev ()->u.ulval > 0)
-        {
-          // We are dealing with a bounded sequence. Check if we are within
-          // bounds.
-          *os << "if (_tao_seq_len <= _tao_sequence.maximum ())" << be_idt_nl
-              << "{" << be_idt_nl;
-        }
+      *os << "_tao_sequence";
     }
-  else
+    
+  *os << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl;
+
+  if (! bt->is_local ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cdr_op_cs::"
-                         "visit_sequence - "
-                         "bad sequence dimension value\n"),
-                        -1);
-    }
+      // First retrieve the length and adjust the sequence length accordingly.
+      *os << "CORBA::ULong _tao_seq_len;" << be_nl << be_nl;
+      *os << "if (strm >> _tao_seq_len)" << be_idt_nl
+          << "{" << be_idt_nl;
 
-  *os << "// Set the length of the sequence." << be_nl
-      << "_tao_sequence.length (_tao_seq_len);" << be_nl << be_nl;
-  // Now we do a check for the sequence length to be non zero.
-  // If length is 0 we return true.
-  *os << "// If length is 0 we return true." << be_nl;
-  *os << "if (0 >= _tao_seq_len) " << be_idt_nl
-      << "{" << be_idt_nl;
-  *os << "return 1;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl;
+      // Add a sanity check for the length of a sequence.
+      *os << "// Add a check to the length of the sequence" << be_nl;
+      *os << "// to make sure it does not exceed the length" << be_nl;
+      *os << "// of the stream. (See bug 58.)" << be_nl;
+      *os << "if (_tao_seq_len > strm.length ())" << be_idt_nl
+          << "{" << be_idt_nl;
+      *os << "return 0;" << be_uidt_nl
+          << "}" << be_uidt_nl << be_nl;
 
-  *os << "// Retrieve all the elements." << be_nl;
+      // Now check if the length does not exceed the maximum. We do this only
+      // for bounded sequences
+      AST_Expression *expr = node->max_size ();
 
+      if (expr == 0 || (expr != 0 && expr->ev () == 0))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_sequence_cdr_op_cs::"
+                             "visit_sequence - "
+                             "bad sequence dimension\n"),
+                            -1);
+        }
 
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      this->visit_node (node);
-    }
-  else
-    {
-      if (bt->accept (this) == -1)
+      if (expr->ev ()->et == AST_Expression::EV_ulong)
+        {
+          if (expr->ev ()->u.ulval > 0)
+            {
+              // We are dealing with a bounded sequence. Check if we are within
+              // bounds.
+              *os << "if (_tao_seq_len <= _tao_sequence.maximum ())" << be_idt_nl
+                  << "{" << be_idt_nl;
+            }
+        }
+      else
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_sequence_cdr_op_cs::"
+                             "(%N:%l) be_visitor_sequence_cdr_op_cs::"
                              "visit_sequence - "
-                             "Base type codegen failed\n"),
+                             "bad sequence dimension value\n"),
                             -1);
         }
-    }
 
-  if (expr->ev ()->u.ulval > 0)
-    {
-      // We are dealing with a bounded sequence.
-      *os << "}" << be_uidt << be_uidt_nl;
+      *os << "// Set the length of the sequence." << be_nl
+          << "_tao_sequence.length (_tao_seq_len);" << be_nl << be_nl;
+
+      // Now we do a check for the sequence length to be non zero.
+      // If length is 0 we return true.
+      *os << "// If length is 0 we return true." << be_nl;
+      *os << "if (0 >= _tao_seq_len) " << be_idt_nl
+          << "{" << be_idt_nl;
+      *os << "return 1;" << be_uidt_nl
+          << "}" << be_uidt_nl << be_nl;
+
+      *os << "// Retrieve all the elements." << be_nl;
+
+      this->visit_node (bt);
+
+      if (expr->ev ()->u.ulval > 0)
+        {
+          // We are dealing with a bounded sequence.
+          *os << be_nl << "}" << be_uidt << be_uidt;
+        }
+
+      *os << be_nl << "}" << be_uidt_nl << be_nl;
     }
 
-  *os << "}" << be_uidt_nl << be_nl
-      << "return 0;" << be_uidt_nl
+  *os << "return 0;" << be_uidt_nl
       << "}";
 
-  if (!this->ctx_->tdef ())
-    {
-      *os << be_nl << be_nl
-          << "#endif /* _TAO_CDR_OP_"
-          << node->flat_name () << "_CPP_ */";
-    }
+  *os << be_nl << be_nl
+      << "#endif /* _TAO_CDR_OP_"
+      << node->flat_name () << "_CPP_ */";
 
   node->cli_stub_cdr_op_gen (1);
   return 0;
@@ -299,6 +260,7 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_object:
+    case AST_PredefinedType::PT_value:
     case AST_PredefinedType::PT_pseudo:
     case AST_PredefinedType::PT_any:
       return this->visit_node (node);
@@ -306,7 +268,7 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_cdr_op_cs::"
                          "visit_predefined_type - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     default:
       break;
@@ -526,7 +488,7 @@ be_visitor_sequence_cdr_op_cs::visit_typedef (be_typedef *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_cdr_op_cs::"
                          "visit_typedef - "
-                         "Bad primitive type\n"), 
+                         "Bad primitive type\n"),
                         -1);
     }
 
@@ -586,15 +548,19 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                         -1);
     }
 
-  // If the type was a string, an obj ref, or a pseudo-obj, we are dealing
-  // with a manager type and hence we must use the appropriate in() and
-  // out() methods.
-  //
+  AST_Decl::NodeType nt = bt->node_type ();
+  be_typedef *td = 0;
+
+  if (nt == AST_Decl::NT_typedef)
+    {
+      td = be_typedef::narrow_from_decl (bt);
+      nt = td->base_node_type ();
+    }
 
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      switch (bt->node_type ())
+      switch (nt)
         {
         case AST_Decl::NT_array:
           if (bt->accept (&visitor) == -1)
@@ -646,7 +612,10 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
         case AST_Decl::NT_string:
         case AST_Decl::NT_wstring:
           {
-            be_string *str = be_string::narrow_from_decl (bt);
+            be_string *str =
+              be_string::narrow_from_decl (
+                  td == 0 ? bt : td->primitive_base_type ()
+                );
 
             if (!str)
               {
@@ -676,7 +645,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                         << "CORBA::Any::to_wstring (_tao_sequence[i].out (), ";
                   }
 
-                *os << str->max_size ()->ev ()->u.ulval << "));" 
+                *os << str->max_size ()->ev ()->u.ulval << "));"
                     << be_uidt_nl;
               }
           }
@@ -685,16 +654,17 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
         case AST_Decl::NT_interface_fwd:
         case AST_Decl::NT_valuetype:
         case AST_Decl::NT_valuetype_fwd:
-          *os << "_tao_marshal_flag = (strm >> _tao_sequence[i].out ());" 
-              << be_uidt_nl;
+          *os << "_tao_marshal_flag = (strm >> _tao_sequence[i].out ());";
 
           break;
         case AST_Decl::NT_pre_defined:
           {
             // We need to separately handle this case of pseudo objects
             // because they have a _var type.
-            be_predefined_type *pt = 
-              be_predefined_type::narrow_from_decl (bt);
+            be_predefined_type *pt =
+              be_predefined_type::narrow_from_decl (
+                  td == 0 ? bt : td->primitive_base_type ()
+                );
 
             if (!pt)
               {
@@ -705,34 +675,53 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                                   -1);
               }
 
-            AST_PredefinedType::PredefinedType pdt = pt->pt ();
-
-            if (pdt == AST_PredefinedType::PT_pseudo
-                || pdt == AST_PredefinedType::PT_object)
+            switch (pt->pt ())
               {
-                *os << "_tao_marshal_flag = (strm >> _tao_sequence[i].out ());"
-                    << be_uidt_nl;
-              }
-            else
-              {
-                *os << "_tao_marshal_flag = (strm >> _tao_sequence[i]);" 
-                    << be_uidt_nl;
+                case AST_PredefinedType::PT_pseudo:
+                case AST_PredefinedType::PT_object:
+                case AST_PredefinedType::PT_value:
+                  *os << "_tao_marshal_flag = (strm >> _tao_sequence[i].out ());";
+                  break;
+                case AST_PredefinedType::PT_char:
+                  *os << "_tao_marshal_flag =" << be_idt_nl
+                      << "(strm >> CORBA::Any::to_char (_tao_sequence[i]));" 
+                      << be_uidt;
+                  break;
+                case AST_PredefinedType::PT_wchar:
+                  *os << "_tao_marshal_flag =" << be_idt_nl
+                      << "(strm >> CORBA::Any::to_wchar (_tao_sequence[i]));" 
+                      << be_uidt;
+                  break;
+                case AST_PredefinedType::PT_boolean:
+                  *os << "_tao_marshal_flag =" << be_idt_nl 
+                      << "(strm >> CORBA::Any::to_boolean (_tao_sequence[i]));" 
+                      << be_uidt;
+                  break;
+                case AST_PredefinedType::PT_octet:
+                  *os << "_tao_marshal_flag =" << be_idt_nl 
+                      << "(strm >> CORBA::Any::to_octet (_tao_sequence[i]));" 
+                      << be_uidt;
+                  break;
+                default:
+                  *os << "_tao_marshal_flag = (strm >> _tao_sequence[i]);";
+                  break;
               }
           }
 
           break;
         default:
-          *os << "_tao_marshal_flag = (strm >> _tao_sequence[i]);" 
+          *os << "_tao_marshal_flag = (strm >> _tao_sequence[i]);"
               << be_uidt_nl;
 
           break;
         }
 
-      *os << "}";
+      *os << be_uidt_nl
+          << "}";
 
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      switch (bt->node_type ())
+      switch (nt)
         {
         case AST_Decl::NT_array:
           if (bt->accept (&visitor) == -1)
@@ -804,10 +793,17 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
             }
           else
             {
-              *os << "tao_" << bt->flat_name () << "_marshal ("
+              AST_Decl *parent = ScopeAsDecl (bt->defined_in ());
+
+              if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+                {
+                  *os << parent->name () << "::";
+                }
+
+              *os << "tao_" << bt->local_name () << "_life::tao_marshal ("
                   << "_tao_sequence[i].in (), strm);" << be_uidt;
             }
-          
+
           break;
         case AST_Decl::NT_string:
         case AST_Decl::NT_wstring:
@@ -818,8 +814,10 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
           break;
         case AST_Decl::NT_pre_defined:
           {
-            be_predefined_type *pt = 
-              be_predefined_type::narrow_from_decl (bt);
+            be_predefined_type *pt =
+              be_predefined_type::narrow_from_decl (
+                  td == 0 ? bt : td->primitive_base_type ()
+                );
 
             if (!pt)
               {
@@ -830,16 +828,36 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                                   -1);
               }
 
-            AST_PredefinedType::PredefinedType pdt = pt->pt ();
-
-            if (pdt == AST_PredefinedType::PT_pseudo
-                || pdt == AST_PredefinedType::PT_object)
+            switch (pt->pt ())
               {
-                *os << "_tao_marshal_flag = (strm << _tao_sequence[i].in ());";
-              }
-            else
-              {
-                *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);";
+                case AST_PredefinedType::PT_pseudo:
+                case AST_PredefinedType::PT_object:
+                case AST_PredefinedType::PT_value:
+                  *os << "_tao_marshal_flag = (strm << _tao_sequence[i].in ());";
+                  break;
+                case AST_PredefinedType::PT_char:
+                  *os << "_tao_marshal_flag =" << be_idt_nl
+                      << "(strm << CORBA::Any::from_char (_tao_sequence[i]));" 
+                      << be_uidt;
+                  break;
+                case AST_PredefinedType::PT_wchar:
+                  *os << "_tao_marshal_flag =" << be_idt_nl
+                      << "(strm << CORBA::Any::from_wchar (_tao_sequence[i]));" 
+                      << be_uidt;
+                  break;
+                case AST_PredefinedType::PT_boolean:
+                  *os << "_tao_marshal_flag =" << be_idt_nl 
+                      << "(strm << CORBA::Any::from_boolean (_tao_sequence[i]));" 
+                      << be_uidt;
+                  break;
+                case AST_PredefinedType::PT_octet:
+                  *os << "_tao_marshal_flag =" << be_idt_nl 
+                      << "(strm << CORBA::Any::from_octet (_tao_sequence[i]));" 
+                      << be_uidt;
+                  break;
+                default:
+                  *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);";
+                  break;
               }
           }
 
@@ -862,8 +880,8 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                         -1);
     }
 
-  *os << be_uidt_nl<< be_nl;
+  *os << be_uidt_nl << be_nl;
   *os << "return _tao_marshal_flag;" << be_uidt_nl;
-
+ 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
index 82e95785b2b..73133b8fbf1 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
@@ -24,176 +24,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_obj_sequence_ch,
            "$Id$")
 
-int
-be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  // Generate the class name.
-  be_type *pt;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
-      pt = t->primitive_base_type ();
-    }
-  else
-    {
-      pt = bt;
-    }
-
-  const char * class_name = node->instance_name ();
-
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // !! Branching in either compile time template instantiation
-  // or manual template instantiation.
-  os->gen_ifdef_AHETI ();
-  os->gen_ifdef_macro (class_name);
-
-  *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro ()
-      << " " << class_name << be_idt_nl
-      << ": public TAO_Bounded_Base_Sequence" << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl;
-
-  // Default constructor.
-  *os << class_name << " (void);" << be_nl;
-
-  // Constructor.
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<"* *value," << be_nl
-      << "CORBA::Boolean release = 0" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // Constructor.
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // operator=
-  *os << class_name << " &operator= (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // Destructor.
-  *os << "virtual ~" << class_name << " (void);" << be_nl << be_nl;
-
-  // Accessors.
-  *os << "// = Accessors." << be_nl;
-
-  be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
-  AST_Decl::NodeType nt = pt->node_type ();
-
-  int is_pseudo_object =
-    nt == AST_Decl::NT_pre_defined
-    && prim
-    && prim->pt () == AST_PredefinedType::PT_pseudo;
-
-  // operator[]
-  if (is_pseudo_object)
-    {
-      *os << "TAO_Pseudo_Object_Manager<";
-    }
-  else if (nt == AST_Decl::NT_valuetype)
-    {
-      *os << "TAO_Valuetype_Manager<";
-    }
-  else if (node->base_type ()->is_abstract ())
-    {
-      *os << "TAO_Abstract_Manager<";
-    }
-  else
-    {
-      *os << "TAO_Object_Manager<";
-    }
-
-  *os << bt->name () << ","
-      << bt->name () << "_var>"
-      << " operator[] (CORBA::ULong index) const;" << be_nl << be_nl;
-
-  // Static operations
-  *os << "// = Static operations." << be_nl;
-
-  // allocbuf
-  *os << "static ";
-
-  bt->accept (&visitor);
-
-  *os << " **allocbuf (CORBA::ULong length);" << be_nl;
-
-  // freebuf
-  *os << "static void freebuf (";
-
-  bt->accept (&visitor);
-
-  *os << " **buffer);" << be_nl << be_nl;
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" << be_nl;
-
-  // allocate_buffer
-  *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl;
-
-  // deallocate_buffer
-  *os << "virtual void _deallocate_buffer (void);" << be_nl;
-
-  // get_buffer
-  bt->accept (&visitor);
-
-  *os << "* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
-
-  // get_buffer
-  *os << "const ";
-
-  bt->accept (&visitor);
-
-  *os << "* *get_buffer (void) const;" << be_nl;
-
-  // shrink_buffer
-  *os << "virtual void _shrink_buffer (" << be_idt << be_idt_nl
-      << "CORBA::ULong nl," << be_nl
-      << "CORBA::ULong ol" << be_uidt_nl
-      << ");" << be_uidt;
-
-  if (! (is_pseudo_object || nt == AST_Decl::NT_valuetype))
-    {
-      // Pseudo objects do not require these methods.
-      *os << be_nl << be_nl
-          << "virtual void _downcast (" << be_idt << be_idt_nl
-          << "void* target," << be_nl
-          << "CORBA::Object *src" << be_nl
-          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
-          << ");" << be_uidt_nl;
-      *os << "virtual CORBA::Object* _upcast (void *src) const;";
-    }
-
-  *os << be_uidt_nl << "};";
-
-  os->gen_endif ();
-
-  // Generate #endif for AHETI.
-  os->gen_endif_AHETI ();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
index a2baf85435e..100456ed2fc 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
@@ -23,573 +23,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_obj_sequence_ci, 
            "$Id$")
 
-int
-be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "Bad element type\n"),
-                        -1);
-    }
-
-  // Generate the class name.
-  be_type *pt;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
-      pt = t->primitive_base_type ();
-    }
-  else
-    {
-      pt = bt;
-    }
-
-  const char *name =
-    be_decl::narrow_from_decl (pt)->full_name ();
-
-  idl_bool bt_is_defined;
-
-  // Special cases.
-  if (ACE_OS::strcmp (name, "CORBA::Object") == 0
-      || ACE_OS::strcmp (name, "CORBA::TypeCode") == 0)
-    {
-      bt_is_defined = 1;
-    }
-  else if (pt->node_type () == AST_Decl::NT_interface_fwd)
-    {
-      AST_InterfaceFwd *ifbt = AST_InterfaceFwd::narrow_from_decl (pt);
-      bt_is_defined = ifbt->full_definition ()->is_defined ();
-    }
-  else
-    {
-      AST_Interface *ibt = AST_Interface::narrow_from_decl (pt);
-      bt_is_defined = ibt->is_defined ();
-    }
-
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
-
-      ACE_OS::sprintf (full_class_name,
-                       "%s::%s",
-                       parent->decl ()->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name,
-                       "%s",
-                       class_name);
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // Branching in either compile time template instantiation
-  // or manual template instatiation.
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // First generate the static methods since they are used by others. Since
-  // they are inlined, their definition needs to come before their use else
-  // some compilers give lots of warnings.
-
-  // allocbuf
-  *os << be_nl << be_nl 
-      << "ACE_INLINE "; 
-      
-  bt->accept (&visitor);
-
-  *os << " **" << be_nl;
-  *os << full_class_name << "::allocbuf (CORBA::ULong /* length */) " << be_nl
-      << "{" << be_idt_nl;
-
-  // The accept is here the first time used and if an
-  // error occurs, it will occur here. Later no check
-  // for errors will be done.
-  if (bt->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-
-  *os <<" **buf = 0;" << be_nl
-      << "ACE_NEW_RETURN (buf, ";
-
-  bt->accept (&visitor);
-
-  *os << "*[" << node->max_size () << "], 0);" << be_nl
-      << be_nl
-      << "for (CORBA::ULong i = 0; i < " << node->max_size ()
-      << "; i++)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "buf[i] = ";
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "0;";
-    }
-  else if (bt_is_defined)
-    {
-      bt->accept (&visitor);
-
-      *os << "::_nil ();";
-    }
-  else
-    {
-      *os << "tao_" << pt->flat_name () << "_nil ();";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return buf;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // freebuf.
-  *os << "ACE_INLINE void" << be_nl
-      << full_class_name << "::freebuf (";
-
-  bt->accept (&visitor);
-
-  *os << " **buffer)" << be_nl
-      << "{" << be_idt_nl
-      << "for (CORBA::ULong i = 0; i < " << node->max_size ()
-      << "; ++i)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (buffer[i] != ";
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "0)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          *os << "buffer[i]->_remove_ref ();" << be_nl;
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_remove_ref (buffer[i]);";
-        }
-
-      *os  << "buffer[i] = 0;" << be_uidt_nl;
-    }
-  else if (bt_is_defined)
-    {
-      bt->accept (&visitor);
-
-      *os << "::_nil ())" << be_idt_nl
-          << "{" << be_idt_nl
-          << "CORBA::release (buffer[i]);" << be_nl
-          << "buffer[i] = ";
-
-      bt->accept (&visitor);
-
-      *os << "::_nil ();" << be_uidt_nl;
-    }
-  else
-    {
-      *os << "tao_" << pt->flat_name () << "_nil ())" << be_nl
-          << "{" << be_idt_nl
-          << "tao_" << pt->flat_name () << "_release (buffer[i]);" << be_nl
-          << "buffer[i] = "
-          << "tao_" << pt->flat_name () << "_nil ();" << be_uidt_nl;
-    }
-
-  *os << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "delete[] buffer;" << be_uidt_nl
-      << "} " << be_nl
-      << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (void)" << be_idt_nl
-      << "  :  TAO_Bounded_Base_Sequence (" << node->max_size ()
-      << ", 0)" << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<"* *value," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Bounded_Base_Sequence (" << node->max_size ()
-      << ", length, value, release)" << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "const "
-      << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (rhs.buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp1 =" << be_idt_nl
-      << class_name << "::allocbuf (" << node->max_size () << ");" 
-      << be_uidt_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" ** const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "** ACE_CAST_CONST, rhs.buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "if (tmp2[i] != 0)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          *os << "tmp2[i]->_add_ref ();";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_add_ref ();";
-        }
-
-      *os << be_uidt_nl << "}" << be_uidt_nl << be_nl
-          << "tmp1[i] = tmp2[i];";
-    }
-  else
-    {
-      *os << "tmp1[i] = ";
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << "::_duplicate (tmp2[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_duplicate (tmp2[i]);";
-        }
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->buffer_ = tmp1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Assignment operator.
-  *os << "ACE_INLINE " << full_class_name << " &" << be_nl
-      << full_class_name << "::operator= (" << be_idt << be_idt_nl
-      << "const "
-      << class_name << " &rhs" << be_uidt_nl 
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (this == &rhs)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "if (this->release_ && this->buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " **, this->buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "if (tmp[i] != 0)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          *os << "tmp[i]->_remove_ref ();";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_remove_ref ();";
-        }
-
-      *os << be_uidt_nl << "}" << be_uidt_nl << be_nl
-          << "tmp[i] = 0;";
-    }
-  else if (bt_is_defined)
-    {
-      *os << "CORBA::release (tmp[i]);" << be_nl
-          << "tmp[i] = ";
-
-      bt->accept (&visitor);
-
-      *os << "::_nil ();";
-    }
-  else
-    {
-      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
-          << "tmp[i] = "
-          << "tao_" << pt->flat_name () << "_nil ();";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ =" << be_idt_nl
-      << class_name
-      << "::allocbuf (rhs.maximum_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp1 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " **, this->buffer_);" << be_uidt_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" ** const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i=0; i < rhs.length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "if (tmp2[i] != 0)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          *os << "tmp2[i]->_add_ref ();";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_add_ref ();";
-        }
-
-      *os << be_uidt_nl << "}" << be_uidt_nl << be_nl
-          << "tmp1[i] = tmp2[i];";
-    }
-  else
-    {
-      *os << "tmp1[i] = ";
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << "::_duplicate (tmp2[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_duplicate (tmp2[i]);";
-        }
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
-
-  int is_pseudo_object =
-    pt->node_type () == AST_Decl::NT_pre_defined
-    && prim 
-    && prim->pt () == AST_PredefinedType::PT_pseudo;
-
-  // operator[].
-
-  *os << "ACE_INLINE" << be_nl;
-
-  if (is_pseudo_object)
-    {
-      *os << "TAO_Pseudo_Object_Manager<";
-    }
-  else
-    {
-      if (pt->node_type () == AST_Decl::NT_valuetype)
-        {
-          *os << "TAO_Valuetype_Manager<";
-        }
-      else if (node->base_type ()->is_abstract ())
-        {
-          *os << "TAO_Abstract_Manager<";
-        }
-      else
-        {
-          *os << "TAO_Object_Manager<";
-        }
-    }
-
-  *os << bt->name () << ","
-      << bt->name () << "_var>" << be_nl
-      << full_class_name << "::operator[] (CORBA::ULong index) const" << be_nl
-      << "{" << be_idt_nl
-      << "ACE_ASSERT (index < this->maximum_);" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **const tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "return ";
-
-  if (is_pseudo_object)
-    {
-      *os << "TAO_Pseudo_Object_Manager<";
-    }
-  else
-    {
-      if (pt->node_type () == AST_Decl::NT_valuetype)
-        {
-          *os << "TAO_Valuetype_Manager<";
-        }
-      else if (node->base_type()->is_abstract ())
-        {
-          *os << "TAO_Abstract_Manager<";
-        }
-      else
-        {
-          *os << "TAO_Object_Manager<";
-        }
-    }
-
-  *os << bt->name () << ","
-      << bt->name () << "_var> "
-      << "(tmp + index, this->release_);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer
-  *os << "ACE_INLINE" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os << " **" << be_nl;
-  *os << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os << " **result = 0;" << be_nl << be_nl
-      << "if (orphan == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We retain ownership." << be_nl
-      << "if (this->buffer_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << class_name << "::allocbuf (this->maximum_);" << be_uidt_nl
-      << "this->buffer_ = result;" << be_nl
-      << "this->release_ = 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "**, this->buffer_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else // if (orphan == 1)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (this->release_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We set the state back to default and relinquish ownership." 
-      << be_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "**, this->buffer_);" << be_uidt_nl
-      << "this->maximum_ = 0;" << be_nl
-      << "this->length_ = 0;" << be_nl
-      << "this->buffer_ = 0;" << be_nl
-      << "this->release_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}" << be_nl  << be_nl;
-
-  // get_buffer.
-  *os << "ACE_INLINE" << be_nl
-      << "const ";
-
-  bt->accept (&visitor);
-
-  *os << "* *" << be_nl
-      << full_class_name << "::get_buffer (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return ACE_reinterpret_cast (const ";
-
-  bt->accept (&visitor);
-
-  *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "}";
-
-  os->gen_endif ();
-
-  // Generate #endif for AHETI.
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
index 1a3bc56f405..e3a08272644 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
@@ -23,259 +23,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_obj_sequence_cs,
            "$Id$")
 
-int
-be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "Bad element type\n"),
-                        -1);
-    }
-
-  // Generate the class name.
-  be_type *pt;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
-      pt = t->primitive_base_type ();
-    }
-  else
-    {
-      pt = bt;
-    }
-
-  const char *name =
-    be_decl::narrow_from_decl (pt)->full_name ();
-
-  idl_bool bt_is_defined;
-
-  // Special cases.
-  if (ACE_OS::strcmp (name, "CORBA::Object") == 0
-      || ACE_OS::strcmp (name, "CORBA::TypeCode") == 0)
-    {
-      bt_is_defined = 1;
-    }
-  else if (pt->node_type () == AST_Decl::NT_interface_fwd)
-    {
-      AST_InterfaceFwd *ifbt = AST_InterfaceFwd::narrow_from_decl (pt);
-      bt_is_defined = ifbt->full_definition ()->is_defined ();
-    }
-  else
-    {
-      AST_Interface *ibt = AST_Interface::narrow_from_decl (pt);
-      bt_is_defined = ibt->is_defined ();
-    }
-
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
-
-      ACE_OS::sprintf (full_class_name,
-                       "%s::%s",
-                       parent->decl ()->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name,
-                       "%s",
-                       class_name);
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // Branching in either compile time template instantiation
-  // or manual template instatiation.
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // First generate the static methods since they are used by others. Since
-  // they are inlined, their definition needs to come before their use else
-  // some compilers give lots of warnings.
-
-  // Allocate_buffer.
-  *os << be_nl << be_nl
-      << "// The Base_Sequence functions, please see tao/sequence.h"
-      << be_nl
-      << "void " << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong length)"
-      << be_nl
-      << "{" << be_idt_nl
-      << "// For this class memory is never reallocated so the implementation"
-      << be_nl
-      << "// is *really* simple." << be_nl
-      << "this->buffer_ = " << class_name << "::allocbuf (length);"
-      << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // deallocate_buffer.
-  *os << "void" << be_nl
-      << full_class_name << "::_deallocate_buffer (void)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp = ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " **, this->buffer_);" << be_nl
-      << class_name << "::freebuf (tmp);" << be_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // destructor
-  *os << full_class_name << "::~" << class_name << " (void)" << be_nl
-      << "// destructor" << be_nl
-      << "{" << be_idt_nl
-      << "this->_deallocate_buffer ();" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // _shrink_buffer
-  *os << "void" << be_nl
-      << full_class_name
-      << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)"
-      << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp = ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " **, this->buffer_);" << be_nl
-      << be_nl
-      << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      if (bt_is_defined)
-        {
-          *os << "CORBA::remove_ref (tmp[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_remove_ref (tmp[i]);";
-        }
-
-      *os << be_nl << "tmp[i] = 0;";
-    }
-  else if (bt_is_defined)
-    {
-      *os << "CORBA::release (tmp[i]);" << be_nl
-          << "tmp[i] = ";
-
-      bt->accept (&visitor);
-
-      *os << "::_nil ();";
-    }
-  else
-    {
-      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
-          << "tmp[i] = "
-          << "tao_" << pt->flat_name () << "_nil ();";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "}\n" << be_nl;
-
-  be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
-
-  if (pt->node_type () != AST_Decl::NT_pre_defined
-      || (prim
-          && prim->pt () == AST_PredefinedType::PT_object))
-    {
-      // Pseudo objects do not require these methods.
-      *os << "void" << be_nl
-          << full_class_name << "::_downcast (" << be_idt << be_idt_nl
-                << "void* target," << be_nl
-                << "CORBA::Object *src" << be_nl
-                << "ACE_ENV_ARG_DECL" << be_uidt_nl
-                << ")" << be_uidt_nl
-                << "{" << be_idt_nl;
-
-      bt->accept (&visitor);
-
-      *os << " **tmp = ACE_static_cast (";
-
-      bt->accept (&visitor);
-
-      *os << "**, target);" << be_nl
-                << "*tmp = ";
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << "::_narrow (src ACE_ENV_ARG_PARAMETER);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name ()
-              << "_narrow (src ACE_ENV_ARG_PARAMETER);";
-        }
-
-      *os << be_nl
-          << "ACE_CHECK;" << be_uidt_nl
-          << "}\n" << be_nl;
-
-      *os << "CORBA::Object*" << be_nl
-          << full_class_name << "::_upcast (void *src) const" <<  be_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << " **tmp = ACE_static_cast (";
-
-          bt->accept (&visitor);
-
-          *os << "**, src);" << be_nl
-              << "return *tmp;";
-        }
-      else
-        {
-          *os << "return tao_" << pt->flat_name () << "_upcast (src);";
-        }
-
-      *os << be_uidt_nl
-          << "}" << be_nl;
-    }
-
-  os->gen_endif ();
-
-  // Generate #endif for AHETI.
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp
index d129a478e9b..27d6dd922ab 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp
@@ -22,153 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_sequence_ch, 
            "$Id$")
 
-int
-be_visitor_sequence_ch::gen_bounded_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  // If we contain an anonymous sequence,
-  // generate code for that sequence here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      int status = 
-        this->gen_anonymous_base_type (bt,
-                                       TAO_CodeGen::TAO_ROOT_CH);
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ch::"
-                             "gen_bounded_sequence - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }
-    }
-
-  const char * class_name = node->instance_name ();
-
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // !! branching in either compile time template instantiation
-  // or manual template instatiation
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro () 
-      << " " << class_name << be_idt_nl
-      << ": public TAO_Bounded_Base_Sequence" << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl;
-
-  // default Constructor
-  *os << class_name << " (void);" << be_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *data," << be_nl
-      << "CORBA::Boolean release = 0" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // operator=
-  *os << class_name << " &operator= (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // destructor
-  *os << "virtual ~" << class_name << " (void);" << be_nl << be_nl;
-
-  // Accessors
-  // operator[]
-  *os << "// = Accessors." << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" &operator[] (CORBA::ULong i);" << be_nl;
-
-  // operator[]
-  *os << "const ";
-
-  bt->accept (&visitor);
-
-  *os << " &operator[] (CORBA::ULong i) const;" << be_nl << be_nl;
-
-  // Static Operations
-  *os << "// = Static operations." << be_nl
-      << "static ";
-
-  bt->accept (&visitor);
-
-  *os << " *allocbuf (CORBA::ULong);" << be_nl;
-
-  // free_buf
-  *os << "static void freebuf (";
-
-  bt->accept (&visitor);
-
-  *os << " *buffer);" << be_nl << be_nl;
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" 
-      << be_nl;
-
-  // allocate_buffer
-  *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl;
-
-  // deallocate_buffer
-  *os << "virtual void _deallocate_buffer (void);" << be_nl;
-
-  // get_buffer
-  bt->accept (&visitor);
-  *os << " *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
-
-  // get_buffer
-  *os << "const ";
-
-  bt->accept (&visitor);
-
-  *os << " *get_buffer (void) const;" << be_nl;
-
-  // replace
-  *os << "void replace (" << be_idt << be_idt_nl
-      << "CORBA::ULong max," << be_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *data," << be_nl
-      << "CORBA::Boolean release = 0" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-
-  *os << "};";
-
-  os->gen_endif ();
-
-  // generate #endif for AHETI.
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp
index 24b2a666569..ea7ac940810 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp
@@ -22,422 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_sequence_ci, 
            "$Id$")
 
-int
-be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  // Retrieve the base type since we may need to do some code
-  // generation for the base type.
-  bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "Bad element type\n"), 
-                        -1);
-    }
-
-  // If we contain an anonymous sequence,
-  // generate code for that sequence here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      if (this->gen_anonymous_base_type (bt,
-                                         TAO_CodeGen::TAO_ROOT_CI)
-          == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ci::"
-                             "gen_bounded_sequence - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }
-    }
-
-  // Generate the class name.
-  be_type *pt = 0;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
-      pt = t->primitive_base_type ();
-    }
-  else
-    {
-      pt = bt;
-    }
-
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_scope *s =
-        be_scope::narrow_from_scope (node->defined_in ());
-
-      ACE_OS::sprintf (full_class_name,
-                       "%s::%s",
-                       s->decl ()->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name,
-                       "%s",
-                       class_name);
-    }
-
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // !! Branching in either compile time template instantiation
-  // or manual template instatiation
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // First generate the static methods since they are used by others. Since
-  // they are inlined, their definition needs to come before their use else
-  // some compilers give lots of warnings.
-
-  // Static Operations.
-  // allocbuf.
-  *os << be_nl << be_nl 
-      << "ACE_INLINE" << be_nl;
-
-  // The accept is used the first time here, and if an
-  // error occurs, it will occur here. Later, no check
-  // for errors will be done.
-  if (bt->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence::"
-                         "gen_bounded_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-
-  *os << " *" << be_nl
-      << full_class_name << "::allocbuf (CORBA::ULong) " << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os << " *retval = 0;" << be_nl
-      << "ACE_NEW_RETURN (retval, ";
-
-  bt->accept (&visitor);
-
-  *os << "[" << node->max_size () << "], 0);" << be_nl
-      << "return retval;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // free_buf.
-  *os << "ACE_INLINE void " << be_nl
-      << full_class_name << "::freebuf (";
-
-  bt->accept (&visitor);
-
-  *os << " *buffer)" << be_nl
-      << "{" << be_idt_nl
-      << "delete [] buffer;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // Default constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (void)" << be_nl
-      << "  : TAO_Bounded_Base_Sequence (" << node->max_size ()
-      << ", 0)" << be_nl
-      << "{" << be_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl;
-  *os << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *data," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "  : TAO_Bounded_Base_Sequence (" << node->max_size () 
-      << ", length, data, release)" << be_nl
-      << "{" << be_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name
-      << " (const " << class_name << " &rhs)" << be_idt_nl
-      << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (rhs.buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *tmp1 =" << be_idt_nl 
-      << class_name << "::allocbuf (" << node->max_size ()
-      << ");" << be_uidt_nl << be_nl;
-
-  bt->accept  (&visitor);
-
-  *os <<" * const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_array)
-    {
-      bt->accept (&visitor);
-      *os << "_var::copy (tmp1[i], tmp2[i]);";
-    }
-  else
-    {
-      *os << "tmp1[i] = tmp2[i];";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl;
-
-  *os << be_nl
-      << "this->buffer_ = tmp1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // operator=.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << " &" << be_nl
-      << full_class_name << "::operator= (" << be_idt << be_idt_nl
-      << "const " 
-      << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (this == &rhs)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "if (! this->release_ || this->buffer_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ =" << be_idt_nl 
-      << class_name 
-      << "::allocbuf (rhs.maximum_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      <<"TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<"* tmp1 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " *, this->buffer_);" << be_uidt_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<"* const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_array)
-    {
-      bt->accept (&visitor);
-      *os << "_var::copy (tmp1[i], tmp2[i]);";
-    }
-  else
-    {
-      *os << "tmp1[i] = tmp2[i];";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl;
-
-  *os << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // Accessors.
-  *os << "ACE_INLINE" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os << " &" << be_nl;
-  *os << full_class_name << "::operator[] (CORBA::ULong i)" << be_nl
-      << "{" << be_idt_nl
-      << "ACE_ASSERT (i < this->maximum_);" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "*, this->buffer_);" << be_uidt_nl
-      << "return tmp[i];" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << "const ";
-
-  bt->accept (&visitor);
-
-  *os << " &" << be_nl
-      << full_class_name << "::operator[] (CORBA::ULong i) const" 
-      << be_nl
-      << "{" << be_idt_nl
-      << "ACE_ASSERT (i < this->maximum_);" << be_nl
-      << "const ";
-
-  bt->accept (&visitor);
-
-  *os << "* tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (const ";
-
-  bt->accept (&visitor);
-
-  *os << "* ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "return tmp[i];" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // get_buffer.
-  *os << "ACE_INLINE" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os << " *" << be_nl
-      << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os << " *result = 0;" << be_nl << be_nl
-      << "if (orphan == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We retain ownership." << be_nl
-      << "if (this->buffer_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << class_name << "::allocbuf (this->maximum_);" << be_uidt_nl
-      << "this->buffer_ = result;" << be_nl
-      << "this->release_ = 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "*, this->buffer_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else // if (orphan == 1)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (this->release_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We set the state back to default and relinquish ownership." 
-      << be_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast(";
-
-  bt->accept (&visitor);
-
-  *os << "*, this->buffer_);" << be_uidt_nl
-      << "this->maximum_ = 0;" << be_nl
-      << "this->length_ = 0;" << be_nl
-      << "this->buffer_ = 0;" << be_nl
-      << "this->release_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer.
-  *os << "ACE_INLINE" << be_nl
-      << "const ";
-
-  bt->accept (&visitor);
-
-  *os << " *" << be_nl
-      << full_class_name << "::get_buffer (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return ACE_reinterpret_cast (const ";
-
-  bt->accept (&visitor);
-
-  *os << " * ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // replace.
-  *os << "ACE_INLINE" << be_nl
-      << "void " << be_nl
-      << full_class_name << "::replace (" << be_idt << be_idt_nl
-      << "CORBA::ULong max," << be_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *data," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "this->maximum_ = max;" << be_nl
-      << "this->length_ = length;" << be_nl << be_nl
-      << "if (this->buffer_ && this->release_ == 1)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<"* tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "* ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << class_name << "::freebuf (tmp);" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->buffer_ = data;" << be_nl
-      << "this->release_ = release;" << be_uidt_nl
-      << "}";
-
-  os->gen_endif ();
-
-  // Generate #endif for AHETI.
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
index fc46694356e..6c662d4f0c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_cs.cpp
@@ -22,119 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_sequence_cs, 
            "$Id$")
 
-int
-be_visitor_sequence_cs::gen_bounded_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  // If we contain an anonymous sequence,
-  // generate code for that sequence here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      int status =
-        this->gen_anonymous_base_type (bt,
-                                       TAO_CodeGen::TAO_ROOT_CS);
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_cs::"
-                             "gen_bounded_sequence - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }
-    }
-
-  const char * class_name = node->instance_name ();
-  static char full_class_name [NAMEBUFSIZE];
-
-  ACE_OS::memset (full_class_name, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  be_decl *tmp =
-    be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-  if (node->is_nested ())
-    {
-      ACE_OS::sprintf (full_class_name, 
-                       "%s::%s",
-                       tmp->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name, 
-                       "%s",
-                       class_name);
-    }
-
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // allocate_buffer
-  *os << be_nl << be_nl << "void " << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong /* length */)" 
-      << be_nl
-      << "// allocate a buffer of the requested length. "
-      << "The buffer is allocated for the" << be_nl
-      << "// right type" << be_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ = " << class_name << "::allocbuf ("
-      << node->max_size () << ");" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // deallocate_buffer
-  *os << "void " << be_nl
-      << full_class_name << "::_deallocate_buffer (void)" << be_nl
-      << "// deallocate the buffer" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return;" << be_uidt_nl
-      << "}" <<  be_uidt_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *tmp = ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " *, this->buffer_);" << be_nl
-      << class_name << "::freebuf (tmp);" << be_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // destructor
-  *os << full_class_name << "::~" << class_name 
-      << " (void) // Dtor." << be_nl
-      << "{" << be_idt_nl
-      << "this->_deallocate_buffer ();" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  os->gen_endif (); // endif macro
-
-  // generate #endif for AHETI
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp
index c646832a0df..00f5995e18c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp
@@ -23,91 +23,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_str_sequence_ch, 
            "$Id$")
 
-int
-be_visitor_sequence_ch::gen_bounded_str_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  const char *class_name = node->instance_name ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro ()
-      << " " << class_name << be_idt_nl
-      << ": public TAO_Bounded_Base_Sequence" << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl;
-
-  // constructor
-  *os << class_name << " (void);" << be_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong length," << be_nl
-      << "char* *value," << be_nl
-      << "CORBA::Boolean release = 0" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // operator=
-  *os << class_name << " &operator= (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // destructor
-  *os << "virtual ~" << class_name << " (void);" << be_nl << be_nl;
-
-  // Accessors
-  *os << "// = Accessors." << be_nl;
-
-  // operator[]
-  *os << "TAO_SeqElem_String_Manager operator[] (CORBA::ULong index) const;"
-      << be_nl << be_nl;
-
-  // Static operations
-  *os << "// = Static operations." << be_nl;
-
-  // allocbuf
-  *os << "static char **allocbuf (CORBA::ULong length);" << be_nl;
-
-  // freebuf
-  *os << "static void freebuf (char **buffer);" << be_nl << be_nl;
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" << be_nl;
-
-  // allocate_buffer
-  *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl;
-
-  // deallocate_buffer
-  *os << "virtual void _deallocate_buffer (void);" << be_nl;
-
-  // get_buffer
-  *os << "char* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
-
-  // get_buffer
-  *os << "const char* *get_buffer (void) const;" << be_nl;
-
-  // shrink_buffer
-  *os << "virtual void _shrink_buffer (" << be_idt << be_idt_nl
-      << "CORBA::ULong nl," << be_nl
-      << "CORBA::ULong ol" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-
-  *os << "};";
-
-  os->gen_endif ();
-
-  // generate #endif for AHETI.
-  os->gen_endif_AHETI ();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
index 517b1e262d5..cf2327fbee7 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp
@@ -24,234 +24,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_str_sequence_ci, 
            "$Id$")
 
-int
-be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_decl *tmp =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-      ACE_OS::sprintf (full_class_name, 
-                       "%s::%s",
-                       tmp->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name, 
-                       "%s",
-                       class_name);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // first generate the static methods since they are used by others. Since
-  // they are inlined, their definition needs to come before their use else
-  // some compilers (e.g., g++) produce lots of warnings.
-
-  // allocbuf
-  *os << be_nl << be_nl 
-      << "ACE_INLINE" << be_nl
-      << "char **" << be_nl
-      << full_class_name << "::allocbuf (CORBA::ULong /* length */)" << be_nl
-      << "{" << be_idt_nl
-      << "char **buf = 0;" << be_nl
-      << "ACE_NEW_RETURN (buf, char *[" << node->max_size () << "], 0);" 
-      << be_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" 
-      << be_idt_nl
-      << "{" << be_idt_nl
-      << "buf[i] = 0;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return buf;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // freebuf
-  *os << "ACE_INLINE" << be_nl
-      << "void " << be_nl
-      << full_class_name << "::freebuf (char **buffer)" << be_nl
-      << "{" << be_idt_nl
-      << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" 
-      << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (buffer[i] != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "CORBA::string_free (buffer[i]);" << be_nl
-      << "buffer[i] = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "delete [] buffer;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (void)" << be_nl
-      << "  : TAO_Bounded_Base_Sequence (" << node->max_size ()
-      << ", 0)" << be_nl
-      << "{" << be_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong length," << be_nl
-      << "char* *value," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Bounded_Base_Sequence (" << node->max_size () 
-      << ", length, value, release)" << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "const "
-      << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (rhs.buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "char **tmp1 ="<< be_idt_nl
-      << class_name << "::allocbuf (this->maximum_);" << be_uidt_nl
-      << "char ** const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_);" 
-      << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i=0; i < rhs.length_; i++)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "tmp1[i] = CORBA::string_dup (tmp2[i]);" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->buffer_ = tmp1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // operator=
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "& " << be_nl
-      << full_class_name << "::operator= (" << be_idt << be_idt_nl
-      << "const "
-      << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (this == &rhs)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "if (this->release_ && this->buffer_ != 0)" << be_idt_nl
-      << "{ " << be_idt_nl
-      << "char **tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (char **, this->buffer_);" 
-      << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "CORBA::string_free (tmp[i]);" << be_nl
-      << "tmp[i] = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ =" << be_idt_nl
-      << class_name << "::allocbuf (rhs.maximum_);" 
-      << be_uidt << be_uidt_nl 
-      << "}" << be_uidt_nl << be_nl
-      << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl << be_nl
-      << "char **tmp1 =" << be_idt_nl
-      << "ACE_reinterpret_cast (char **, this->buffer_);" 
-      << be_uidt_nl << be_nl
-      << "char ** const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_);" 
-      << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "tmp1[i] = CORBA::string_dup (tmp2[i]);" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // operator[]
-  *os << "ACE_INLINE" << be_nl
-      << "TAO_SeqElem_String_Manager " << be_nl
-      << full_class_name << "::operator[] (CORBA::ULong index) const" << be_nl
-      << "{" << be_idt_nl
-      << "ACE_ASSERT (index < this->maximum_);" << be_nl
-      << "char **const tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (char ** ACE_CAST_CONST, this->buffer_);" 
-      << be_uidt_nl
-      << "return TAO_SeqElem_String_Manager (tmp + index, this->release_);" 
-      << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer
-  *os << "ACE_INLINE" << be_nl
-      << "char**" << be_nl
-      << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
-      << "{" << be_idt_nl
-      << "char **result = 0;" << be_nl << be_nl
-      << "if (orphan == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We retain ownership. " << be_nl
-      << "if (this->buffer_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << class_name << "::allocbuf (this->maximum_);" << be_uidt_nl
-      << "this->buffer_ = result;" << be_nl
-      << "this->release_ = 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast (char **, this->buffer_);" 
-      << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else // if (orphan == 1)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (this->release_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We set state back to default and relinquish ownership." << be_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast (char **, this->buffer_);" << be_uidt_nl
-      << "this->maximum_ = 0;" << be_nl
-      << "this->length_ = 0;" << be_nl
-      << "this->buffer_ = 0;" << be_nl
-      << "this->release_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer
-  *os << "ACE_INLINE" << be_nl
-      << "const char**" << be_nl
-      << full_class_name << "::get_buffer (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return ACE_reinterpret_cast (const char ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "}";
-
-  os->gen_endif (); // endif macro
-
-  // generate #endif for AHETI
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
index a0f5701cf7f..302fb866119 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_cs.cpp
@@ -24,92 +24,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_str_sequence_cs, 
            "$Id$")
 
-int
-be_visitor_sequence_cs::gen_bounded_str_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_decl *tmp =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-      ACE_OS::sprintf (full_class_name, 
-                       "%s::%s",
-                       tmp->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name, 
-                       "%s",
-                       class_name);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // allocate_buffer
-  *os << be_nl << be_nl 
-      << "void" << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong /* length */)"
-      << be_nl
-      << "{" << be_idt_nl
-      << "// For this class memory is never reallocated so the implementation"
-      << be_nl
-      << "// is *really* simple." << be_nl
-      << "this->buffer_ = " << class_name << "::allocbuf ("
-      << node->max_size () << ");" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // deallocate_buffer
-  *os << "void" << be_nl
-      << full_class_name << "::_deallocate_buffer (void)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "char **tmp = ACE_reinterpret_cast (char **, this->buffer_);"
-      << be_nl
-      << class_name << "::freebuf (tmp);" << be_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // destructor
-  *os << full_class_name << "::~" << class_name << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "this->_deallocate_buffer ();" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // shrink_buffer
-  *os << "void" << be_nl
-      << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
-      << "{" << be_idt_nl
-      << "char **tmp = ACE_reinterpret_cast (char **,this->buffer_);" << be_nl
-      << be_nl
-      << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::string_free (tmp[i]);" << be_nl
-      << "tmp[i] = 0;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "}" << be_nl;
-
-  os->gen_endif (); // endif macro
-
-  // generate #endif for AHETI
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ch.cpp
index 56592dd8a67..57aaaf56ff9 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ch.cpp
@@ -22,91 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_wstr_sequence_ch, 
            "$Id$")
 
-int
-be_visitor_sequence_ch::gen_bounded_wstr_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  const char * class_name = node->instance_name ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  *os << be_nl << be_nl 
-      << "class " << be_global->stub_export_macro () 
-      << " " << class_name << be_idt_nl
-      << ": public TAO_Bounded_Base_Sequence" << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl;
-
-  // constructor
-  *os << class_name << " (void);" << be_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong length," << be_nl
-      << "CORBA::WChar* *value," << be_nl
-      << "CORBA::Boolean release = 0" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // operator=
-  *os << class_name << " &operator= (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // destructor
-  *os << "virtual ~" << class_name << " (void);" << be_nl << be_nl;
-
-  // Accessors
-  *os << "// = Accessors." << be_nl;
-
-  // operator[]
-  *os << "TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index) const;"
-      << be_nl << be_nl;
-
-  // Static operations
-  *os << "// = Static operations." << be_nl;
-
-  // allocbuf
-  *os << "static CORBA::WChar **allocbuf (CORBA::ULong length);" << be_nl;
-
-  // freebuf
-  *os << "static void freebuf (CORBA::WChar **buffer);" << be_nl << be_nl;
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" << be_nl;
-
-  // allocate_buffer
-  *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl;
-
-  // deallocate_buffer
-  *os << "virtual void _deallocate_buffer (void);" << be_nl;
-
-  // get_buffer
-  *os << "CORBA::WChar* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
-
-  // get_buffer
-  *os << "const CORBA::WChar* *get_buffer (void) const;" << be_nl;
-
-  // shrink_buffer
-  *os << "virtual void _shrink_buffer (" << be_idt << be_idt_nl
-      << "CORBA::ULong nl," << be_nl
-      << "CORBA::ULong ol" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-
-  *os << "};";
-
-  os->gen_endif ();
-
-  // generate #endif for AHETI.
-  os->gen_endif_AHETI ();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ci.cpp
index 2b64014d9d8..b380c4c640c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_ci.cpp
@@ -22,233 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_wstr_sequence_ci, 
            "$Id$")
 
-int
-be_visitor_sequence_ci::gen_bounded_wstr_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_decl *tmp =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-      ACE_OS::sprintf (full_class_name, 
-                       "%s::%s",
-                       tmp->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name, 
-                       "%s",
-                       class_name);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // First generate the static methods since they are used by others. Since
-  // they are inlined, their definition needs to come before their use else
-  // some compilers (e.g., g++) produce lots of warnings.
-
-  // allocbuf
-  *os << be_nl << be_nl 
-      << "ACE_INLINE" << be_nl
-      << "CORBA::WChar **" << be_nl
-      << full_class_name << "::allocbuf (CORBA::ULong /* length */)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::WChar **buf = 0;" << be_nl
-      << "ACE_NEW_RETURN (buf, CORBA::WChar *[" << node->max_size () 
-      << "], 0);" << be_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; i++)" 
-      << be_idt_nl
-      << "{" << be_idt_nl
-      << "buf[i] = 0;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return buf;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // freebuf
-  *os << "ACE_INLINE" << be_nl
-      << "void " << be_nl
-      << full_class_name << "::freebuf (CORBA::WChar **buffer)" << be_nl
-      << "{" << be_idt_nl
-      << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" 
-      << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (buffer[i] != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "CORBA::wstring_free (buffer[i]);" << be_nl
-      << "buffer[i] = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "delete [] buffer;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (void)" << be_nl
-      << "  : TAO_Bounded_Base_Sequence (" << node->max_size ()
-      << ", 0)" << be_nl
-      << "{" << be_nl
-      << "}" << be_nl << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " ("
-      << be_idt << be_idt_nl
-      << "CORBA::ULong length," << be_nl
-      << "CORBA::WChar* *value," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Bounded_Base_Sequence (" << node->max_size ()
-      << ", length, value, release)" << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "const "
-      << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (rhs.buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "CORBA::WChar **tmp1 =" << be_idt_nl 
-      << class_name
-      << "::allocbuf (this->maximum_);" << be_uidt_nl << be_nl
-      << "CORBA::WChar ** const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, rhs.buffer_);"
-      << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i=0; i < rhs.length_; i++)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "tmp1[i] = CORBA::wstring_dup (tmp2[i]);" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->buffer_ = tmp1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // operator=
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "& " << be_nl
-      << full_class_name << "::operator= (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (this == &rhs)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "if (this->release_ && this->buffer_ != 0)" << be_idt_nl
-      << "{ " << be_idt_nl
-      << "CORBA::WChar **tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (CORBA::WChar **, this->buffer_);"
-      << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "CORBA::wstring_free (tmp[i]);" << be_nl
-      << "tmp[i] = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ =" << be_idt_nl
-      << class_name
-      << "::allocbuf (rhs.maximum_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl << be_nl
-      << "CORBA::WChar **tmp1 =" << be_idt_nl
-      << "ACE_reinterpret_cast (CORBA::WChar **, this->buffer_);"
-      << be_uidt_nl
-      << "CORBA::WChar ** const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, rhs.buffer_);"
-      << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "tmp1[i] = CORBA::wstring_dup (tmp2[i]);" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // operator[]
-  *os << "ACE_INLINE" << be_nl
-      << "TAO_SeqElem_WString_Manager " << be_nl
-      << full_class_name << "::operator[] (CORBA::ULong index) const" << be_nl
-      << "{" << be_idt_nl
-      << "ACE_ASSERT (index < this->maximum_);" << be_nl
-      << "CORBA::WChar **const tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, this->buffer_);" 
-      << be_uidt_nl
-      << "return TAO_SeqElem_WString_Manager (tmp + index, this->release_);" 
-      << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer
-  *os << "ACE_INLINE" << be_nl
-      << "CORBA::WChar**" << be_nl
-      << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::WChar **result = 0;" << be_nl << be_nl
-      << "if (orphan == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We retain ownership. " << be_nl
-      << "if (this->buffer_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result = " << class_name << "::allocbuf (this->maximum_);"
-      << be_nl
-      << "this->buffer_ = result;" << be_nl
-      << "this->release_ = 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result = ACE_reinterpret_cast (CORBA::WChar **, this->buffer_);"
-      << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else // if (orphan == 1)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (this->release_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We set state back to default and relinquish ownership." << be_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast (CORBA::WChar **, this->buffer_);"
-      << be_uidt_nl
-      << "this->maximum_ = 0;" << be_nl
-      << "this->length_ = 0;" << be_nl
-      << "this->buffer_ = 0;" << be_nl
-      << "this->release_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer
-  *os << "ACE_INLINE" << be_nl
-      << "const CORBA::WChar**" << be_nl
-      << full_class_name << "::get_buffer (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return ACE_reinterpret_cast (const CORBA::WChar ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "}";
-
-  os->gen_endif (); // endif macro
-
-  // generate #endif for AHETI
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_cs.cpp
index 6335e23593c..b7f0ccacc28 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_wstr_sequence_cs.cpp
@@ -22,92 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_bounded_wstr_sequence_cs, 
            "$Id$")
 
-int
-be_visitor_sequence_cs::gen_bounded_wstr_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name, '\0', NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_decl *tmp =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-      ACE_OS::sprintf (full_class_name, 
-                       "%s::%s",
-                       tmp->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name, 
-                       "%s",
-                       class_name);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // allocate_buffer
-  *os << be_nl << be_nl 
-      << "void" << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong /* length */)"
-      << be_nl
-      << "{" << be_idt_nl
-      << "// For this class memory is never reallocated so the implementation"
-      << be_nl
-      << "// is *really* simple." << be_nl
-      << "this->buffer_ = " << class_name << "::allocbuf ("
-      << node->max_size () << ");" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // deallocate_buffer
-  *os << "void" << be_nl
-      << full_class_name << "::_deallocate_buffer (void)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "CORBA::WChar **tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (CORBA::WChar **, this->buffer_);"
-      << be_uidt_nl
-      << class_name << "::freebuf (tmp);" << be_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // destructor
-  *os << full_class_name << "::~" << class_name << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "this->_deallocate_buffer ();" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // shrink_buffer
-  *os << "void" << be_nl
-      << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::WChar **tmp = ACE_reinterpret_cast (CORBA::WChar **,this->buffer_);" << be_nl
-      << be_nl
-      << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::wstring_free (tmp[i]);" << be_nl
-      << "tmp[i] = 0;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "}" << be_nl;
-
-  os->gen_endif (); // endif macro
-
-  // generate #endif for AHETI
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
index 364ac9dffaa..1e20fc4ede0 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
@@ -24,180 +24,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_unbounded_obj_sequence_ch,
            "$Id$")
 
-int
-be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  be_type *pt;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
-      pt = t->primitive_base_type ();
-    }
-  else
-    {
-      pt = bt;
-    }
-
-  // Generate the class name.
-  const char *class_name = node->instance_name ();
-
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro ()
-      << " " << class_name << be_idt_nl
-      << ": public TAO_Unbounded_Base_Sequence" << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl;
-
-  // default constructor
-  *os << class_name << " (void);" << be_nl;
-
-  // constructor
-  *os << class_name << " (CORBA::ULong maximum);" << be_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong maximum," << be_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<"* *value," << be_nl
-      << "CORBA::Boolean release = 0" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // operator=
-  *os << class_name << " &operator= (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // destructor
-  *os << "virtual ~" << class_name << " (void);" << be_nl << be_nl;
-
-  // Accessors
-  *os << "// = Accessors." << be_nl;
-
-  AST_Decl::NodeType nt = pt->node_type ();
-
-  // operator[]
-  be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
-
-  int is_pseudo_object =
-    nt == AST_Decl::NT_pre_defined
-    && prim
-    && prim->pt () == AST_PredefinedType::PT_pseudo;
-
-  if (is_pseudo_object)
-    {
-      *os << "TAO_Pseudo_Object_Manager<";
-    }
-  else if (nt == AST_Decl::NT_valuetype)
-    {
-      *os << "TAO_Valuetype_Manager<";
-    }
-  else if (node->base_type ()->is_abstract ())
-    {
-      *os << "TAO_Abstract_Manager<";
-    }
-  else
-    {
-      *os << "TAO_Object_Manager<";
-    }
-
-  *os << bt->name () << ","
-      << bt->name () << "_var>"
-      << " operator[] (CORBA::ULong index) const;" << be_nl << be_nl;
-
-  // Static operations
-  *os << "// = Static operations." << be_nl;
-
-  // allocbuf
-  *os << "static ";
-
-  bt->accept (&visitor);
-
-  *os << " **allocbuf (CORBA::ULong nelems);" << be_nl;
-
-  // freebuf
-  *os << "static void freebuf (";
-
-  bt->accept (&visitor);
-
-  *os << " **buffer);" << be_nl << be_nl;
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" << be_nl;
-
-  // allocate_buffer
-  *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl;
-
-  // deallocate_buffer
-  *os << "virtual void _deallocate_buffer (void);" << be_nl;
-
-  // get_buffer
-  bt->accept (&visitor);
-
-  *os << "* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
-
-  // get_buffer
-  *os << "const ";
-
-  bt->accept (&visitor);
-
-  *os << "* *get_buffer (void) const;" << be_nl;
-
-  // shrink_buffer
-  *os << "virtual void _shrink_buffer (" << be_idt << be_idt_nl
-      << "CORBA::ULong nl," << be_nl
-      << "CORBA::ULong ol" << be_uidt_nl
-      << ");" << be_uidt;
-
-  if (! (is_pseudo_object || nt == AST_Decl::NT_valuetype))
-    {
-      // Pseudo objects do not require these methods.
-      *os << be_nl << be_nl
-          << "virtual void _downcast (" << be_idt << be_idt_nl
-          << "void* target," << be_nl
-          << "CORBA::Object *src" << be_nl
-          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
-          << ");" << be_uidt_nl;
-
-      *os << "virtual CORBA::Object* _upcast (void *src) const;";
-    }
-
-  *os << be_uidt_nl << "};";
-
-  os->gen_endif ();
-
-  // generate #endif for AHETI.
-  os->gen_endif_AHETI ();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
index 31660353d25..27fa6b543fb 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
@@ -23,542 +23,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_unbounded_obj_sequence_ci, 
            "$Id$")
 
-int
-be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Retrieve the base type since we may need to do some code
-  // generation for the base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "Bad element type\n"),
-                        -1);
-    }
-
-  // Generate the class name;
-  be_type *pt;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
-      pt = t->primitive_base_type ();
-    }
-  else
-    {
-      pt = bt;
-    }
-
-  const char *name =
-    be_decl::narrow_from_decl (pt)->full_name ();
-
-  idl_bool bt_is_defined;
-
-  // Special cases.
-  if (ACE_OS::strcmp (name, "CORBA::Object") == 0
-      || ACE_OS::strcmp (name, "CORBA::TypeCode") == 0)
-    {
-      bt_is_defined = 1;
-    }
-  else if (pt->node_type () == AST_Decl::NT_interface_fwd)
-    {
-      AST_InterfaceFwd *ifbt = AST_InterfaceFwd::narrow_from_decl (pt);
-      bt_is_defined = ifbt->full_definition ()->is_defined ();
-    }
-  else
-    {
-      AST_Interface *ibt = AST_Interface::narrow_from_decl (pt);
-      bt_is_defined = ibt->is_defined ();
-    }
-
-  const char *class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
-
-      ACE_OS::sprintf (full_class_name,
-                       "%s::%s",
-                       parent->decl ()->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name,
-                       "%s",
-                       class_name);
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // allocbuf.
-  *os << be_nl << be_nl 
-      << "ACE_INLINE" << be_nl;
-
-  // The accept is here the first time used and if an
-  // error occurs, it will occur here. Later no check
-  // for errors will be done.
-  if (bt->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_unbounded_obj_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-
-  *os << " **" << be_nl
-      << full_class_name << "::allocbuf (CORBA::ULong nelems)" << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **buf = 0;" << be_nl
-      << be_nl
-      << "ACE_NEW_RETURN (buf, "
-      ;
-  bt->accept (&visitor);
-
-  *os << "*[nelems], 0);" << be_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < nelems; i++)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "buf[i] = ";
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "0;";
-    }
-  else if (bt_is_defined)
-    {
-      bt->accept (&visitor);
-
-      *os << "::_nil ();";
-    }
-  else
-    {
-      *os << "tao_" << pt->flat_name () << "_nil ();";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return buf;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Freebuf.
-  *os << "ACE_INLINE" << be_nl
-      << "void " << be_nl
-      << full_class_name << "::freebuf (";
-
-  bt->accept (&visitor);
-
-  *os << " **buffer)" << be_nl
-      << "{" << be_idt_nl
-      << "if (buffer == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "delete[] buffer;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (void)" << be_nl
-      << "{" << be_nl
-      << "}" << be_nl << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name
-      << " (CORBA::ULong maximum)" << be_idt_nl
-      << ": TAO_Unbounded_Base_Sequence (maximum, "
-      << class_name << "::allocbuf (maximum))" << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong maximum," << be_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<"* *value," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Unbounded_Base_Sequence (maximum, length, value, release)"
-      << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl << be_nl;
-
-  // Constructor.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << "(" << be_idt << be_idt_nl
-      << "const "
-      << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Unbounded_Base_Sequence (rhs)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (rhs.buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp1 =" << be_idt_nl
-      << class_name << "::allocbuf (this->maximum_);" << be_uidt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" ** const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "if (tmp2[i] != 0)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          *os << "tmp2[i]->_add_ref ();";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_add_ref ();";
-        }
-
-      *os << be_uidt_nl << "}" << be_uidt_nl << be_nl
-          << "tmp1[i] = tmp2 [i];";
-    }
-  else
-    {
-      *os << "tmp1[i] = ";
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << "::_duplicate (tmp2[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_duplicate (tmp2[i]);";
-        }
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->buffer_ = tmp1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Operator =.
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << " &" << be_nl
-      << full_class_name << "::operator= (" << be_idt << be_idt_nl
-      << "const "
-      << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (this == &rhs)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "if (this->release_)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " **, this->buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "if (tmp[i] != 0)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          *os << "tmp[i]->_remove_ref ();";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_remove_ref ();";
-        }
-
-      *os << be_uidt_nl << "}" << be_uidt_nl << be_nl
-          << "tmp[i] = 0;";
-    }
-  else if (bt_is_defined)
-    {
-      *os << "CORBA::release (tmp[i]);" << be_nl
-          << "tmp[i] = ";
-
-      bt->accept (&visitor);
-
-      *os << "::_nil ();";
-    }
-  else
-    {
-      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
-          << "tmp[i] = "
-          << "tao_" << pt->flat_name () << "_nil ();";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "if (this->maximum_ < rhs.maximum_)" << be_idt_nl
-      << "{" << be_idt_nl
-      << class_name << "::freebuf (tmp);" << be_nl
-      << "this->buffer_ = " << class_name
-      << "::allocbuf (rhs.maximum_);" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ =" << be_idt_nl
-      << class_name
-      << "::allocbuf (rhs.maximum_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "TAO_Unbounded_Base_Sequence::operator= (rhs);" << be_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp1 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " **, this->buffer_);" << be_uidt_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" ** const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      *os << "if (tmp2[i] != 0)" << be_idt_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          *os << "tmp2[i]->_add_ref ();";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_add_ref ();";
-        }
-
-      *os << be_uidt_nl << "}" << be_uidt_nl << be_nl
-          << "tmp1[i] = tmp2 [i];";
-    }
-  else
-    {
-      *os << "tmp1[i] = ";
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << "::_duplicate (tmp2[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_duplicate (tmp2[i]);";
-        }
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Operator[].
-  be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
-
-  int is_pseudo_object =
-    pt->node_type () == AST_Decl::NT_pre_defined
-    && prim 
-    && prim->pt () == AST_PredefinedType::PT_pseudo;
-
-  *os << "ACE_INLINE" << be_nl;
-
-  if (is_pseudo_object)
-    {
-      *os << "TAO_Pseudo_Object_Manager<";
-    }
-  else
-    {
-      if (pt->node_type () == AST_Decl::NT_valuetype)
-        {
-          *os << "TAO_Valuetype_Manager<";
-        }
-      else if (node->base_type ()->is_abstract ())
-        {
-          *os << "TAO_Abstract_Manager<";
-        }
-      else
-        {
-          *os << "TAO_Object_Manager<";
-        }
-    }
-
-  *os << bt->name () << ","
-      << bt->name () << "_var>" << be_nl
-      << full_class_name << "::operator[] (CORBA::ULong index) const"
-      << be_nl
-      << "{" << be_idt_nl
-      << "ACE_ASSERT (index < this->maximum_);" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" ** const tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "return ";
-
-  if (is_pseudo_object)
-    {
-      *os << "TAO_Pseudo_Object_Manager<";
-    }
-  else
-    {
-      if (pt->node_type () == AST_Decl::NT_valuetype)
-        {
-          *os << "TAO_Valuetype_Manager<";
-        }
-      else if (node->base_type ()->is_abstract ())
-        {
-          *os << "TAO_Abstract_Manager<";
-        }
-      else
-        {
-          *os << "TAO_Object_Manager<";
-        }
-    }
-
-  *os << bt->name () << ","
-      << bt->name () << "_var>"
-      << " (tmp + index, this->release_);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer
-  *os << "ACE_INLINE" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os << "* *" << be_nl
-      << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os << " **result = 0;" << be_nl << be_nl
-      << "if (orphan == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We retain ownership." << be_nl
-      << "if (this->buffer_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl << class_name 
-      << "::allocbuf (this->maximum_);" << be_uidt_nl
-      << "this->buffer_ = result;" << be_nl
-      << "this->release_ = 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "**, this->buffer_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else // if (orphan == 1)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (this->release_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We set the state back to default and relinquish ownership." 
-      << be_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast(";
-
-  bt->accept (&visitor);
-
-  *os << "**,this->buffer_);" << be_uidt_nl
-      << "this->maximum_ = 0;" << be_nl
-      << "this->length_ = 0;" << be_nl
-      << "this->buffer_ = 0;" << be_nl
-      << "this->release_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer.
-  *os << "ACE_INLINE" << be_nl;
-  *os << "const ";
-
-  bt->accept (&visitor);
-
-  *os << "* *" << be_nl
-      << full_class_name << "::get_buffer (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return ACE_reinterpret_cast (const ";
-
-  bt->accept (&visitor);
-
-  *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "}";
-
-  os->gen_endif ();
-
-  // Generate #endif for AHETI.
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
index ec7ed507be9..bb879229dda 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
@@ -23,341 +23,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_unbounded_obj_sequence_cs,
            "$Id$")
 
-int
-be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  // Generate the class name.
-  be_type  *pt;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
-      pt = t->primitive_base_type ();
-    }
-  else
-    {
-      pt = bt;
-    }
-
-  const char *name = be_decl::narrow_from_decl (pt)->full_name ();
-
-  idl_bool bt_is_defined;
-
-  // Special cases.
-  if (ACE_OS::strcmp (name, "CORBA::Object") == 0
-      || ACE_OS::strcmp (name, "CORBA::TypeCode") == 0)
-    {
-      bt_is_defined = 1;
-    }
-  else if (pt->node_type () == AST_Decl::NT_interface_fwd)
-    {
-      AST_InterfaceFwd *ifbt = AST_InterfaceFwd::narrow_from_decl (pt);
-      bt_is_defined = ifbt->full_definition ()->is_defined ();
-    }
-  else
-    {
-      AST_Interface *ibt = AST_Interface::narrow_from_decl (pt);
-      bt_is_defined = ibt->is_defined ();
-    }
-
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
-
-      ACE_OS::sprintf (full_class_name,
-                       "%s::%s",
-                       parent->decl ()->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name,
-                       "%s",
-                       class_name);
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // allocate_buffer.
-  *os << be_nl << be_nl
-      << "// The Base_Sequence functions, please see tao/Sequence.h"
-      << be_nl
-      << "void" << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong length)"
-      << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp = 0;" << be_nl
-      << "tmp = " << class_name << "::allocbuf (length);" << be_nl
-      << be_nl
-      << "if (this->buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **old = ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "**, this->buffer_);" << be_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (!this->release_)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      if (bt_is_defined)
-        {
-          *os << "CORBA::add_ref (old[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_add_ref (old[i]);";
-        }
-
-      *os << be_nl << "tmp[i] = old[i];";
-    }
-  else
-    {
-      *os << "tmp[i] = ";
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << "::_duplicate (old[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_duplicate (old[i]);";
-        }
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "tmp[i] = old[i];" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "if (this->release_)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "delete [] old;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->buffer_ = tmp;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // deallocate_buffer.
-  *os << "void" << be_nl
-      << full_class_name << "::_deallocate_buffer (void)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp = ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "**, this->buffer_);" << be_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      if (bt_is_defined)
-        {
-          *os << "CORBA::remove_ref (tmp[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_remove_ref (tmp[i]);";
-        }
-
-      *os << be_nl << "tmp[i] = 0;";
-    }
-  else if (bt_is_defined)
-    {
-      *os << "CORBA::release (tmp[i]);" << be_nl
-          << "tmp[i] = ";
-
-      bt->accept (&visitor);
-
-      *os << "::_nil ();";
-    }
-  else
-    {
-      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
-          << "tmp[i] = "
-          << "tao_" << pt->flat_name () << "_nil ();";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << class_name << "::freebuf (tmp);" << be_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // Destructor.
-  *os << full_class_name << "::~" << class_name << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "this->_deallocate_buffer ();" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // shrink_buffer.
-  *os << "void" << be_nl
-      << full_class_name
-      << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" **tmp = ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "**, this->buffer_);" << be_nl << be_nl
-      << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_valuetype)
-    {
-      if (bt_is_defined)
-        {
-          *os << "CORBA::remove_ref (tmp[i]);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name () << "_remove_ref (tmp[i]);";
-        }
-
-      *os << be_nl << "tmp[i] = 0;";
-    }
-  else if (bt_is_defined)
-    {
-      *os << "CORBA::release (tmp[i]);" << be_nl
-          << "tmp[i] = ";
-
-      bt->accept (&visitor);
-
-      *os << "::_nil ();";
-    }
-  else
-    {
-      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
-          << "tmp[i] = "
-          << "tao_" << pt->flat_name () << "_nil ();";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-
-  be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
-
-  if (pt->node_type () != AST_Decl::NT_valuetype
-      && (pt->node_type () != AST_Decl::NT_pre_defined)
-      || (prim &&
-          prim->pt () == AST_PredefinedType::PT_object))
-    {
-      // Pseudo objects do not require these methods.
-      *os << "void " << be_nl
-          << full_class_name << "::_downcast (" << be_idt << be_idt_nl
-                << "void* target," << be_nl
-                << "CORBA::Object *src" << be_nl
-                << "ACE_ENV_ARG_DECL" << be_uidt_nl
-                << ")" << be_uidt_nl
-                << "{" << be_idt_nl;
-
-      bt->accept (&visitor);
-
-      *os << " **tmp = ACE_static_cast (";
-
-      bt->accept (&visitor);
-
-      *os << "**, target);" << be_nl
-                << "*tmp = ";
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << "::_narrow (src ACE_ENV_ARG_PARAMETER);";
-        }
-      else
-        {
-          *os << "tao_" << pt->flat_name ()
-              << "_narrow (src ACE_ENV_ARG_PARAMETER);";
-        }
-
-      *os << be_nl
-          << "ACE_CHECK;" << be_uidt_nl
-                << "}\n" << be_nl;
-
-      *os << "CORBA::Object*" << be_nl
-          << full_class_name << "::_upcast (void *src) const" <<  be_nl
-          << "{" << be_idt_nl;
-
-      if (bt_is_defined)
-        {
-          bt->accept (&visitor);
-
-          *os << " **tmp = ACE_static_cast (";
-
-          bt->accept (&visitor);
-
-          *os << "**, src);" << be_nl
-              << "return *tmp;";
-        }
-      else
-        {
-          *os << "return tao_" << pt->flat_name () << "_upcast (src);";
-        }
-
-      *os << be_uidt_nl
-          << "}";
-    }
-
-  os->gen_endif ();
-
-  // Generate #endif for AHETI.
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
index 70efcbd664e..88913fd39c5 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
@@ -22,164 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_unbounded_sequence_ch, 
            "$Id$")
 
-int
-be_visitor_sequence_ch::gen_unbounded_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  // If we contain an anonymous sequence,
-  // generate code for that sequence here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      int status =
-        this->gen_anonymous_base_type (bt,
-                                       TAO_CodeGen::TAO_ROOT_CH);
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ch::"
-                             "gen_unbounded_sequence - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }
-    }
-
-  const char * class_name = node->instance_name ();
-
-  // Get the visitor for the type of the sequence.
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI ();
-  os->gen_ifdef_macro (class_name);
-
-  *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro () << " "
-      << class_name << be_idt_nl
-      << ": public TAO_Unbounded_Base_Sequence" << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl;
-
-  // constructor
-  *os << class_name << " (void);" << be_nl;
-
-  // constructor
-  *os << class_name << " (CORBA::ULong maximum); " << be_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong maximum," << be_nl
-      << "CORBA::ULong length," << be_nl;
-
-  // The accept is used here the first time and if an
-  // error occurs, it will occur here. Later no check
-  // for errors will be done.
-  if (bt->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                         -1);
-    }
-
-  *os << " *data," << be_nl
-      << "CORBA::Boolean release = 0" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // constructor
-  *os << class_name << " (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // operator =
-  *os << class_name << " &operator= (" << be_idt << be_idt_nl
-      << "const " << class_name << " &rhs" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  // destructor
-  *os << "virtual ~" << class_name << " (void);" << be_nl << be_nl;
-
-  // Accessors
-  *os << "// = Accessors." << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" &operator[] (CORBA::ULong i);" << be_nl;
-
-  // operator[]
-  *os << "const ";
-
-  bt->accept (&visitor);
-
-  *os << " &operator[] (CORBA::ULong i) const;" << be_nl << be_nl;
-
-  // Static operations
-  *os << "// = Static operations." << be_nl
-      << "static ";
-
-  bt->accept (&visitor);
-
-  *os << " *allocbuf (CORBA::ULong size);" << be_nl;
-
-  *os << "static void freebuf (";
-
-  bt->accept (&visitor);
-
-  *os << " *buffer);" << be_nl << be_nl;
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" 
-      << be_nl;
-
-  // allocate_buffer
-  *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl;
-
-  // deallocate_buffer
-  *os << "virtual void _deallocate_buffer (void);" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os << " *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
-
-  // get_buffer
-  *os << "const ";
-
-  bt->accept (&visitor);
-
-  *os << " *get_buffer (void) const;" << be_nl;
-
-  // replace
-  *os << "void replace (" << be_idt << be_idt_nl
-      << "CORBA::ULong max," << be_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *data," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-
-  *os << "};";
-
-  os->gen_endif (); // endif macro
-
-  // generate #endif for AHETI
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
index d170d256dfb..3d6deb0a35b 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
@@ -22,441 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_unbounded_sequence_ci, 
            "$Id$")
 
-int
-be_visitor_sequence_ci::gen_unbounded_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "Bad element type\n"), 
-                        -1);
-    }
-
-  // If we contain an anonymous sequence,
-  // generate code for that sequence here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      int status =
-        this->gen_anonymous_base_type (bt,
-                                         TAO_CodeGen::TAO_ROOT_CI);
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ci::"
-                             "gen_unbounded_sequence - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }
-    }
-
-  // Generate the class name
-  be_type  *pt;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-  {
-    // Get the primitive base type of this typedef node.
-    be_typedef *t = be_typedef::narrow_from_decl (bt);
-    pt = t->primitive_base_type ();
-  }
-  else
-    pt = bt;
-
-
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name, '\0', NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_decl *tmp =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-      ACE_OS::sprintf (full_class_name, 
-                       "%s::%s",
-                       tmp->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name, 
-                       "%s",
-                       class_name);
-    }
-
-  // Get the visitor for the type of the sequence.
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // Static operations
-  // allocbuf
-  *os << be_nl << be_nl 
-      << "ACE_INLINE" << be_nl;
-  // the accept is here the first time used and if an
-  // error occurs, it will occur here. Later no check
-  // for errors will be done.
-  if (bt->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_unbounded_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-
-  *os << " *" << be_nl
-      << full_class_name << "::allocbuf (CORBA::ULong size)" << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os << " *retval = 0;" << be_nl
-      << "ACE_NEW_RETURN (retval, ";
-
-  bt->accept (&visitor);
-
-  *os << "[size], 0);" << be_nl
-      << "return retval;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << "void "
-      << full_class_name << "::freebuf (";
-
-  bt->accept (&visitor);
-
-  *os << " *buffer)" << be_nl
-      << "{" << be_idt_nl
-      << "delete [] buffer;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name 
-      << " (void)" << be_nl
-      << "{" << be_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name 
-      << " (CORBA::ULong maximum) " << be_idt_nl
-      << ": TAO_Unbounded_Base_Sequence (maximum, "
-      << class_name << "::allocbuf (maximum))"
-      << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "CORBA::ULong maximum," << be_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os << " *data," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ")" << be_nl
-      << ": TAO_Unbounded_Base_Sequence (maximum, length, data, release)" 
-      << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl << be_nl;
-
-  // constructor
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (" << be_idt << be_idt_nl
-      << "const "
-      << class_name << " &rhs" << be_uidt_nl
-      << ")" << be_nl;
-  *os << ": TAO_Unbounded_Base_Sequence (rhs)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (rhs.buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *tmp1 =" << be_idt_nl
-      << class_name << "::allocbuf (this->maximum_);" << be_uidt_nl;
-
-  bt->accept (&visitor);
-
-  *os << " * const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_array)
-    {
-      bt->accept (&visitor);
-      *os << "_var::copy (tmp1[i], tmp2[i]);";
-    }
-  else
-    {
-      *os << "tmp1[i] = tmp2[i];";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl;
-
-  *os << be_nl
-      << "this->buffer_ = tmp1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
-  // operator =
-  *os << "ACE_INLINE" << be_nl
-      << full_class_name << " &" << be_nl
-      << full_class_name << "::operator= (" << be_idt << be_idt_nl
-      << "const " 
-      << class_name << " &rhs" << be_uidt_nl 
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (this == &rhs)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "if (this->release_)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (this->maximum_ < rhs.maximum_)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// Free the old buffer." << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " *, this->buffer_);" << be_uidt_nl << be_nl
-      << class_name << "::freebuf (tmp);" << be_nl << be_nl
-      << "this->buffer_ =" << be_idt_nl 
-      << class_name
-      << "::allocbuf (rhs.maximum_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "this->buffer_ =" << be_idt_nl
-      << class_name
-      << "::allocbuf (rhs.maximum_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "TAO_Unbounded_Base_Sequence::operator= (rhs);" << be_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *tmp1 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " *, this->buffer_);" << be_uidt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" * const tmp2 =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_array)
-    {
-      bt->accept (&visitor);
-      *os << "_var::copy (tmp1[i], tmp2[i]);";
-    }
-  else
-    {
-      *os << "tmp1[i] = tmp2[i];";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl;
-
-  *os << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Accessors
-  *os << "// = Accessors." << be_nl;
-  *os << "ACE_INLINE" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" &" << be_nl
-      << full_class_name << "::operator[] (CORBA::ULong i)" << be_nl
-      << "{" << be_idt_nl
-      << "ACE_ASSERT (i < this->maximum_);" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<"* tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "*, this->buffer_);" << be_uidt_nl
-      << "return tmp[i];" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // operator[]
-  *os << "ACE_INLINE" << be_nl
-      << "const ";
-
-  bt->accept (&visitor);
-
-  *os << " &" << be_nl
-      << full_class_name << "::operator[] (CORBA::ULong i) const" << be_nl
-      << "{" << be_idt_nl
-      << "ACE_ASSERT (i < this->maximum_);" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" * const tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "* ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "return tmp[i];" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" << be_nl
-      << be_nl;
-  *os << "ACE_INLINE" << be_nl;
-
-  bt->accept (&visitor);
-
-  *os << " *" << be_nl
-      << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *result = 0;" << be_nl << be_nl
-      << "if (orphan == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We retain ownership." << be_nl
-      << "if (this->buffer_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << class_name << "::allocbuf (this->length_);" << be_uidt_nl
-      << "this->buffer_ = result;" << be_nl
-      << "this->release_ = 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "*, this->buffer_);" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else // if (orphan == 1)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (this->release_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "// We set the state back to default and relinquish ownership." 
-      << be_nl
-      << "result =" << be_idt_nl
-      << "ACE_reinterpret_cast(";
-
-  bt->accept (&visitor);
-
-  *os << "*,this->buffer_);" << be_uidt_nl
-      << "this->maximum_ = 0;" << be_nl
-      << "this->length_ = 0;" << be_nl
-      << "this->buffer_ = 0;" << be_nl
-      << "this->release_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return result;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // get_buffer
-  *os << "ACE_INLINE" << be_nl;
-  *os << "const ";
-
-  bt->accept (&visitor);
-
-  *os << " *" << be_nl
-      << full_class_name << "::get_buffer (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return ACE_reinterpret_cast (const ";
-
-  bt->accept (&visitor);
-
-  *os << " * ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // replace
-  *os << "ACE_INLINE" << be_nl
-      << "void" << be_nl
-      << full_class_name << "::replace (" << be_idt << be_idt_nl 
-      << "CORBA::ULong max," << be_nl
-      << "CORBA::ULong length," << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *data," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "this->maximum_ = max;" << be_nl
-      << "this->length_ = length;" << be_nl << be_nl
-      << "if (this->buffer_ && this->release_ == 1)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << "*, this->buffer_);" << be_uidt_nl
-      << class_name << "::freebuf (tmp);" << be_uidt_nl
-      << "}" << be_uidt_nl <<  be_nl
-      << "this->buffer_ = data;" << be_nl
-      << "this->release_ = release;" << be_uidt_nl
-      << "}";
-
-  os->gen_endif (); // endif macro
-
-  // generate #endif for AHETI
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp
index b562dfc62de..badbbec605d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp
@@ -22,163 +22,3 @@ ACE_RCSID (be_visitor_sequence,
            gen_unbounded_sequence_cs, 
            "$Id$")
 
-int
-be_visitor_sequence_cs::gen_unbounded_sequence (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  // If we contain an anonymous sequence,
-  // generate code for that sequence here.
-  if (bt->node_type () == AST_Decl::NT_sequence)
-    {
-      int status =
-        this->gen_anonymous_base_type (bt,
-                                         TAO_CodeGen::TAO_ROOT_CS);
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_cs::"
-                             "gen_unbounded_sequence - "
-                             "gen_anonymous_base_type failed\n"),
-                            -1);
-        }
-    }
-
-  // Generate the class name.
-  be_type  *pt;
-
-  if (bt->node_type () == AST_Decl::NT_typedef)
-    {
-      // Get the primitive base type of this typedef node.
-      be_typedef *t = be_typedef::narrow_from_decl (bt);
-      pt = t->primitive_base_type ();
-    }
-  else
-    {
-      pt = bt;
-    }
-
-  const char * class_name = node->instance_name ();
-
-  static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  if (node->is_nested ())
-    {
-      be_decl *tmp = 
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-      
-      ACE_OS::sprintf (full_class_name, 
-                       "%s::%s",
-                       tmp->full_name (),
-                       class_name);
-    }
-  else
-    {
-      ACE_OS::sprintf (full_class_name, 
-                       "%s",
-                       class_name);
-    }
-
-  // Get the visitor for the type of the sequence.
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base visitor (&ctx);
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// "__FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI();
-  os->gen_ifdef_macro (class_name);
-
-  // allocate_buffer
-  *os << be_nl << be_nl 
-      << "void" << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os << "* tmp = 0;" << be_nl
-      << "tmp = " << class_name << "::allocbuf (length);" << be_nl
-      << be_nl
-      << "if (this->buffer_ != 0)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *old =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " *, this->buffer_);" << be_uidt_nl << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
-      << "{" << be_idt_nl;
-
-  if (pt->node_type () == AST_Decl::NT_array)
-    {
-      bt->accept (&visitor);
-
-      *os << "_var::copy (tmp[i], old[i]);";
-    }
-  else
-    {
-      *os << "tmp[i] = old[i];";
-    }
-
-  *os << be_uidt_nl << "}" << be_uidt_nl << be_nl
-      << "if (this->release_)" << be_idt_nl
-      << "{" << be_idt_nl
-      << class_name << "::freebuf (old);" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "this->buffer_ = tmp;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // deallocate_buffer
-  *os << "void" << be_nl
-      << full_class_name << "::_deallocate_buffer (void)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return;" << be_uidt_nl 
-      << "}" << be_uidt_nl << be_nl;
-
-  bt->accept (&visitor);
-
-  *os <<" *tmp =" << be_idt_nl
-      << "ACE_reinterpret_cast (";
-
-  bt->accept (&visitor);
-
-  *os << " *, this->buffer_);" << be_uidt_nl
-      << class_name << "::freebuf (tmp);" << be_nl
-      << "this->buffer_ = 0;" << be_uidt_nl
-      << "} " << be_nl
-      << be_nl;
-
-  // destructor
-  *os << full_class_name << "::~" << class_name << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "this->_deallocate_buffer ();" << be_uidt_nl
-      << "}";
-
-  os->gen_endif (); // endif macro
-
-  // generate #endif for AHETI
-  os->gen_endif_AHETI();
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 5f0d748aa38..68023c6578d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_sequence, 
-           sequence_ch, 
+ACE_RCSID (be_visitor_sequence,
+           sequence_ch,
            "$Id$")
 
 // Root visitor for client header.
@@ -32,291 +32,8 @@ be_visitor_sequence_ch::~be_visitor_sequence_ch (void)
 {
 }
 
-int
-be_visitor_sequence_ch::gen_base_sequence_class (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (bt == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "Bad element type\n"), 
-                        -1);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// "__FILE__ << ":" << __LINE__;
-
-  os->gen_ifdef_AHETI ();
-
-  // This is the instantiation branch.
-  *os << be_nl << node->instance_name ();
-
-  os->gen_else_AHETI ();
-
-  // Generate the appropriate sequence type.
-  switch (node->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_Object_Sequence<";
-        }
-      else
-        {
-          *os << "TAO_Bounded_Object_Sequence<";
-        }
-
-      break;
-    case be_sequence::MNG_ABSTRACT:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_Abstract_Sequence<";
-        }
-      else
-        {
-          *os << "TAO_Bounded_Abstract_Sequence<";
-        }
-
-      break;
-    case be_sequence::MNG_PSEUDO:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_Pseudo_Sequence<";
-        }
-      else
-        {
-          *os << "TAO_Bounded_Pseudo_Sequence<";
-        }
-
-      break;
-    case be_sequence::MNG_VALUE:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_Valuetype_Sequence<";
-        }
-      else
-        {
-          *os << "TAO_Bounded_Valuetype_Sequence<";
-        }
-
-      break;
-    case be_sequence::MNG_STRING:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_String_Sequence";
-        }
-      else
-        {
-          *os << "TAO_Bounded_String_Sequence";
-        }
-
-      break;
-    case be_sequence::MNG_WSTRING:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_WString_Sequence";
-        }
-      else
-        {
-          *os << "TAO_Bounded_WString_Sequence";
-        }
-
-      break;
-    default: // Not a managed type.
-      if (bt->base_node_type () == AST_Decl::NT_array)
-        {
-          if (node->unbounded ())
-            {
-              *os << "TAO_Unbounded_Array_Sequence<";
-            }
-          else
-            {
-              *os << "TAO_Bounded_Array_Sequence<";
-            }
-        }
-      else
-        {
-          if (node->unbounded ())
-            {
-              *os << "TAO_Unbounded_Sequence<";
-            }
-          else
-            {
-              *os << "TAO_Bounded_Sequence<";
-            }
-        }
-
-      break;
-    }
-
-  be_visitor_context ctx (*this->ctx_);
-
-  be_visitor_sequence_base_template_args visitor (&ctx,
-                                                  node);
-
-  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
-
-  if (bt->accept (&visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                        -1);
-    }
-
-  // Find out if the sequence is of a managed type and if
-  // it is bounded or not.
-  if (node->managed_type () == be_sequence::MNG_STRING
-      || node->managed_type () == be_sequence::MNG_WSTRING)
-    {
-      if (!node->unbounded ())
-        {
-          *os << "<" << node->max_size () << ">";
-        }
-    }
-  else
-    {
-      // If we are a sequence of arrays, the template includes
-      // a _var parameter.
-      if (bt->base_node_type () == AST_Decl::NT_array)
-        {
-          *os << ", ";
-
-          // So the call to nested_type_name will have "_var" suffix.
-          ctx.sub_state (TAO_CodeGen::TAO_ARRAY_SEQ_CH_TEMPLATE_VAR);
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_ch::"
-                                 "visit_sequence - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          ctx.sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
-        }
-
-      if (node->unbounded ())
-        {
-          *os << ">";
-        }
-      else
-        {
-          *os << ", " << node->max_size () << ">";
-        }
-    }
-
-  os->gen_endif_AHETI ();
-
-  return 0;
-}
-
-
-int
-be_visitor_sequence_ch::instantiate_sequence (be_sequence *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (bt == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "gen_instantiate_template_name - "
-                         "Bad element type\n"), 
-                        -1);
-    }
-
-  // Generate the appropriate sequence type.
-  switch (node->managed_type ())
-    {
-    case be_sequence::MNG_PSEUDO:
-    case be_sequence::MNG_OBJREF:
-    case be_sequence::MNG_VALUE:
-    case be_sequence::MNG_ABSTRACT:
-      if (node->unbounded ())
-        {
-          this->gen_unbounded_obj_sequence (node);
-        }
-      else
-        {
-          this->gen_bounded_obj_sequence (node);
-        }
-
-      break;
-    case be_sequence::MNG_STRING: // Sequence of strings.
-      if (!node->unbounded ())
-        {
-          this->gen_bounded_str_sequence (node);
-        }
-
-      break;
-    case be_sequence::MNG_WSTRING: // Sequence of wstrings.
-      if (!node->unbounded ())
-        {
-          this->gen_bounded_wstr_sequence (node);
-        }
-
-      break;
-    default: // Not a managed type.
-      if (node->unbounded ())
-	      {
-	        // TAO provides extensions for octet sequences, first find out
-	        // if the base type is an octet (or an alias for octet)
-	        be_predefined_type *predef = 0;
-
-	        if (bt->base_node_type () == AST_Type::NT_pre_defined)
-	          {
-	            be_typedef* alias =
-		            be_typedef::narrow_from_decl (bt);
-
-	            if (alias == 0)
-		            {
-		              predef =
-		                be_predefined_type::narrow_from_decl (bt);
-		            }
-	            else
-		            {
-		              predef =
-                    be_predefined_type::narrow_from_decl (
-                        alias->primitive_base_type ()
-                      );
-		            }
-	          }
-	        if (predef != 0)
-	          {
-	            if (predef->pt() != AST_PredefinedType::PT_octet)
-                {
-		              this->gen_unbounded_sequence (node);
-                }
-	          }
-	        else
-            {
-	            this->gen_unbounded_sequence (node);
-            }
-	      }
-      else
-        {
-          this->gen_bounded_sequence (node);
-        }
-
-      break;
-    } // End of switch.
-
-  return 0;
-}
-
-
 int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 {
-  be_type *bt = 0;
-  TAO_OutStream *os = this->ctx_->stream ();
-
   if (node->defined_in () == 0)
     {
       // The node is a nested sequence, and has had no scope defined.
@@ -329,7 +46,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_ch::"
                          "visit_sequence - "
-                         "failed creating name\n"), 
+                         "failed creating name\n"),
                         -1);
     }
 
@@ -338,21 +55,8 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       return 0;
     }
 
-  // Instantiation.
-
-  if (this->instantiate_sequence (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "codegen. for the primitive type sequence\n"), 
-                        -1);
-    }
-
-  // End of instantiation.
-
-  // Generate the ifdefined macro for the sequence type.
-  os->gen_ifdef_macro (node->flat_name ());
+  be_type *bt = 0;
+  TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the base type since we may need to do some code
   // generation for the base type.
@@ -363,62 +67,81 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_ch::"
                          "visit_sequence - "
-                         "Bad element type\n"), 
+                         "Bad element type\n"),
                         -1);
     }
 
+  // If our base type is an anonymouse sequence, we must create a  name
+  // and generate a class declaration for it as well.
+  if (bt->node_type () == AST_Decl::NT_sequence)
+    {
+      if (bt->accept (this) != 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_sequence_ch::"
+                             "visit_sequence - "
+                             "codegen for anonymous base type failed\n"),
+                            -1);
+        }
+    }
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+      << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << "class " << node->local_name () << ";" << be_nl;
+  os->gen_ifdef_macro (node->flat_name ());
 
-  // No _var class for anonymous sequences.
   if (this->ctx_->tdef () != 0)
     {
-      *os << "class " << node->local_name () << "_var;" << be_nl;
+      *os << be_nl << be_nl
+          << "class " << node->local_name () << ";";
     }
 
-  *os << be_nl;
-
-  *os << "// *************************************************************"
-      << be_nl
-      << "// " << node->name () << be_nl
-      << "// *************************************************************"
-      << be_nl << be_nl;
+  if (this->ctx_->tdef () != 0)
+    {
+      this->gen_varout_typedefs (node,
+                                 bt);
+    }
 
-  // Generate a typedef to a parametrized sequence.
-  *os << "class " << be_global->stub_export_macro ()
-      << " " << node->local_name () << " : public ";
+  *os << be_nl << be_nl
+      << "class " << be_global->stub_export_macro () << " "
+      << node->local_name () << be_idt_nl
+      << ": public" << be_idt << be_idt_nl;
 
-  if (this->gen_base_sequence_class (node) == -1)
+  if (node->gen_base_class_name (os, this->ctx_->scope ()) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_ch::"
                          "visit_sequence - "
-                         "codegen for base sequence class\n"),
+                         "Base class name generation failed\n"),
                         -1);
     }
 
-  *os << be_nl << "{" << be_nl
-      << "public:" << be_idt_nl
-      << node->local_name () << " (void);" << be_nl;
+  *os << be_uidt << be_uidt << be_uidt;
+
+  *os << be_nl
+      << "{" << be_nl
+      << "public:" << be_idt;
+
+  *os << be_nl
+      << node->local_name () << " (void);";
 
-  // For unbounded sequences, we have a different set of constructors.
   if (node->unbounded ())
     {
-      *os << node->local_name () << " (CORBA::ULong max);"
-          << be_nl;
+      *os << be_nl
+          << node->local_name () << " (CORBA::ULong max);";
     }
 
-  *os << node->local_name () << " (" << be_idt << be_idt_nl;
+  *os << be_nl
+      << node->local_name () << " (" << be_idt << be_idt;
 
   if (node->unbounded ())
     {
-      // Unbounded seq takes this extra parameter.
-      *os << "CORBA::ULong max, " << be_nl;
+      *os << be_nl
+          << "CORBA::ULong max,";
     }
 
-  *os << "CORBA::ULong length, " << be_nl;
+  *os << be_nl
+      << "CORBA::ULong length," << be_nl;
 
   // Generate the base type for the buffer.
   be_visitor_context ctx (*this->ctx_);
@@ -434,7 +157,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
                         -1);
     }
 
-  *os << " *buffer, " << be_nl
+  *os << "* buffer, " << be_nl
       << "CORBA::Boolean release = 0" << be_uidt_nl
       << ");" << be_uidt_nl;
   *os << node->local_name () << " (const " << node->local_name ()
@@ -443,7 +166,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 
   if (be_global->any_support ())
     {
-      *os << "static void _tao_any_destructor (void*);" << be_nl << be_nl;
+      *os << "static void _tao_any_destructor (void *);" << be_nl << be_nl;
     }
 
   // Generate the _var_type typedef (only if we are not anonymous).
@@ -459,356 +182,237 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   if (bt->base_node_type () == AST_Type::NT_pre_defined)
     {
       be_typedef* alias =
-	    be_typedef::narrow_from_decl (bt);
+            be_typedef::narrow_from_decl (bt);
 
       if (alias == 0)
-	      {
-	        predef = be_predefined_type::narrow_from_decl (bt);
-	      }
+              {
+                predef = be_predefined_type::narrow_from_decl (bt);
+              }
       else
-	      {
-	        predef =
+              {
+                predef =
             be_predefined_type::narrow_from_decl (
                 alias->primitive_base_type ()
               );
-	      }
+              }
     }
 
   // Now generate the extension...
   if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet
       && node->unbounded ())
     {
-      *os << "\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl
-	        << node->local_name () << " (" << be_idt << be_idt_nl
-	        << "CORBA::ULong length," << be_nl
-	        << "const ACE_Message_Block* mb" << be_uidt_nl
-	        << ")" << be_uidt_nl
-	        << "  : " << node->instance_name ()
-	        << " (length, mb) {}" << "\n"
-	        << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */";
+      *os << "\n\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl
+                << node->local_name () << " (" << be_idt << be_idt_nl
+                << "CORBA::ULong length," << be_nl
+                << "const ACE_Message_Block* mb" << be_uidt_nl
+                << ")" << be_uidt_nl
+                << "  : " << node->instance_name ()
+                << " (length, mb) {}" << "\n"
+                << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */";
     }
 
-  *os << be_uidt_nl << "};";
-
-  os->gen_endif (); // Endif macro.
-
-  // No _var or _out class for an anonymous (non-typedef'd) sequence.
-  if (this->ctx_->tdef () != 0)
-    {
-      // Generate the ifdefined macro for the var type.
-      os->gen_ifdef_macro (node->flat_name (), "_var");
-
-      // Generate the var and out types.
-      if (this->gen_var_defn (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ch::"
-                             "visit_sequence - "
-                             "codegen for _var failed\n"), 
-                            -1);
-        }
-
-      os->gen_endif ();
-
-      // Generate the ifdefined macro for the _out type.
-      os->gen_ifdef_macro (node->flat_name (), "_out");
-
-      if (this->gen_out_defn (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ch::"
-                             "visit_sequence - "
-                             "codegen for _out failed\n"),
-                            -1);
-        }
+  *os << be_uidt_nl
+      << "};";
 
-      os->gen_endif ();
-    }
+  os->gen_endif ();
 
   node->cli_hdr_gen (1);
-
-  return 0;
-}
-
-// Generate the _var definition for ourself.
-int
-be_visitor_sequence_ch::gen_var_defn (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  char namebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf,
-                   "%s_var",
-                   node->local_name ()->get_string ());
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// class " << node->name () << "_var" << be_nl;
-  *os << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Retrieve base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "gen_var_defn - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  // Generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  *os << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << be_nl;
-  *os << "{" << be_nl;
-  *os << "public:" << be_idt_nl;
-
-  // Default constuctor.
-  *os << namebuf << " (void);" << be_nl;
-
-  // Constuctor.
-  *os << namebuf << " (" << node->local_name () << " *);" << be_nl;
-
-  // Copy constructor.
-  *os << namebuf << " (const " << namebuf <<  " &);";
-
-  // Fixed-size base types only.
-  if (bt->size_type () == AST_Type::FIXED)
-    {
-      *os << be_nl << be_nl 
-          << "// Fixed-size base types only." << be_nl;
-      *os << namebuf << " (const " << node->local_name ()
-          << " &);" << be_nl;
-    }
-
-  // Destructor.
-  *os << be_nl << "~" << namebuf << " (void);" << be_nl;
-  *os << be_nl;
-
-  // Assignment operator from a pointer.
-  *os << namebuf << " &operator= ("
-      << node->local_name () << " *);" << be_nl;
-
-  // Assignment from _var.
-  *os << namebuf << " &operator= (const " << namebuf << " &);";
-
-  // Fixed-size base types only.
-  if (bt->size_type () == AST_Type::FIXED)
-    {
-      *os << be_nl << be_nl 
-          << "// Fixed-size base types only." << be_nl;
-      *os << namebuf << " &operator= (const " << node->local_name ()
-          << " &);" << be_nl;
-    }
-
-  // Arrow operator.
-  *os << be_nl << node->local_name () << " *operator-> (void);" << be_nl;
-  *os << "const " << node->local_name ()
-      << " *operator-> (void) const;" << be_nl << be_nl;
-
-  // Other extra types (cast operators, [] operator, and others).
-
-  // Cast operator.
-  *os << "operator const " << node->local_name () << " &() const;" << be_nl;
-  *os << "operator " << node->local_name () << " &();" << be_nl;
-  *os << "operator " << node->local_name () << " &() const;";
-
-  if (bt->size_type () == AST_Type::VARIABLE)
-    {
-      *os << be_nl << be_nl 
-          << "// Variable-size base types only." << be_nl
-          << "operator " << node->local_name ()
-          << " *&();" << be_nl;
-    }
-
-  *os << be_nl;
-
-  // Overloaded [] operators.
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH);
-  be_visitor_sequence_elemtype sr_visitor (&ctx);
-
-  if (bt->accept (&sr_visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-
-  *os << " operator[] (CORBA::ULong index);" << be_nl;
-
-  AST_Decl::NodeType nt = bt->base_node_type ();
-  AST_PredefinedType::PredefinedType pdt = AST_PredefinedType::PT_void;
-
-  if (nt == AST_Decl::NT_pre_defined)
-    {
-      AST_PredefinedType *p = 0;
-      be_typedef *btd = be_typedef::narrow_from_decl (bt);
-
-      if (btd == 0)
-        {
-          p = AST_PredefinedType::narrow_from_decl (bt);
-        }
-      else
-        {
-          p = AST_PredefinedType::narrow_from_decl (
-                  btd->primitive_base_type ()
-                );
-        }
-
-      pdt = p->pt ();
-    }
-
-  // @@ (JP) Problems with constant instantiations of TAO_Object_Manager,
-  // TAO_Pseudo_Object_Manager, TAO_SeqElem_WString_Manager and
-  // TAO_SeqElem_String_Manager make these impossible right now [BUGID:676].
-  if (nt != AST_Decl::NT_string
-      && nt != AST_Decl::NT_wstring
-      && nt != AST_Decl::NT_interface
-      && nt != AST_Decl::NT_interface_fwd
-      && nt != AST_Decl::NT_valuetype
-      && nt != AST_Decl::NT_array
-      && pdt != AST_PredefinedType::PT_pseudo
-      && pdt != AST_PredefinedType::PT_object)
-    {
-      *os << "const ";
-
-      if (bt->accept (&sr_visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_sequence::"
-                             "gen_var_defn - "
-                             "[] ret type gen failed\n"),
-                            -1);
-        }
-
-      *os << " operator[] (CORBA::ULong index) const;" << be_nl;
-    }
-
-  *os << be_nl;
-
-  *os << "// in, inout, out, _retn " << be_nl;
-
-  // The return types of in, out, inout, and _retn are based on the parameter.
-  // passing rules and the base type.
-  *os << "const " << node->local_name () << " &in (void) const;" << be_nl;
-  *os << node->local_name () << " &inout (void);" << be_nl;
-  *os << node->local_name () << " *&out (void);" << be_nl;
-  *os << node->local_name () << " *_retn (void);" << be_nl;
-
-  // Generate an additional member function that
-  // returns the underlying pointer.
-  *os << node->local_name () << " *ptr (void) const;" << be_uidt_nl << be_nl;
-
-  // Generate the private section.
-  *os << "private:" << be_idt_nl;
-  *os << node->local_name () << " *ptr_;" << be_uidt_nl;
-
-  *os << "};";
-
   return 0;
 }
 
-// Generate the _out definition.
-int
-be_visitor_sequence_ch::gen_out_defn (be_sequence *node)
+void
+be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node,
+                                             be_type *elem)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  char namebuf [NAMEBUFSIZE];
+  be_decl *scope = this->ctx_->scope ();
 
-  ACE_OS::memset (namebuf,
-                  '\0',
-                  NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf,
-                   "%s_out",
-                   node->local_name ()->get_string ());
+  *os << be_nl << be_nl;
 
-  // Retrieve base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (bt == 0)
+  switch (node->managed_type ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "gen_out_defn - "
-                         "Bad base type\n"),
-                        -1);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // Generate the out definition (always in the client header).
-  *os << "class " << be_global->stub_export_macro () << " "
-      << namebuf << be_nl;
-  *os << "{" << be_nl;
-  *os << "public:" << be_idt_nl;
-
-  // No default constructor.
-
-  // Constructor from a pointer.
-  *os << namebuf << " (" << node->local_name () << " *&);" << be_nl;
-
-  // Constructor from a _var &.
-  *os << namebuf << " (" << node->local_name () << "_var &);" << be_nl;
-
-  // Constructor from a _out &.
-  *os << namebuf << " (const " << namebuf << " &);" << be_nl;
-
-  // Assignment operator from a _out &.
-  *os << namebuf << " &operator= (const " << namebuf << " &);" << be_nl;
+    case be_sequence::MNG_OBJREF:
+      *os << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << "TAO_Object_Manager<" << be_idt << be_idt_nl
+          << elem->nested_type_name (scope) << "," << be_nl;
+      *os << elem->nested_type_name (scope, "_var") << "," << be_nl
+          << elem->fwd_helper_name () << "_life" << be_uidt_nl
+          << ">" << be_uidt << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_var;" << be_uidt;
+
+      *os << be_nl << be_nl
+          << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << node->local_name () << "_var," << be_nl
+          << "TAO_Object_Manager<" << be_idt << be_idt_nl
+          << elem->nested_type_name (scope) << "," << be_nl;
+      *os << elem->nested_type_name (scope, "_var") << "," << be_nl
+          << elem->fwd_helper_name () << "_life" << be_uidt_nl
+          << ">" << be_uidt << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_out;" << be_uidt;
 
-  // Assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators.
+      break;
+    case be_sequence::MNG_ABSTRACT:
+      *os << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << "TAO_Abstract_Manager<" << be_idt << be_idt_nl
+          << elem->nested_type_name (scope) << "," << be_nl;
+      *os << elem->nested_type_name (scope, "_var") << "," << be_nl
+          << elem->fwd_helper_name () << "_life" << be_uidt_nl
+          << ">" << be_uidt << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_var;" << be_uidt;
+
+      *os << be_nl << be_nl
+          << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << node->local_name () << "_var," << be_nl
+          << "TAO_Abstract_Manager<" << be_idt << be_idt_nl
+          << elem->nested_type_name (scope) << "," << be_nl;
+      *os << elem->nested_type_name (scope, "_var") << "," << be_nl
+          << elem->fwd_helper_name () << "_life" << be_uidt_nl
+          << ">" << be_uidt << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_out;" << be_uidt;
 
-  // Assignment.
-  *os << namebuf << " &operator= (" << node->local_name () << " *);" << be_nl;
+      break;
+    case be_sequence::MNG_PSEUDO:
+      *os << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl
+          << elem->nested_type_name (scope) << "," << be_nl;
+      *os << elem->nested_type_name (scope, "_var") << be_uidt_nl
+          << ">" << be_uidt << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_var;" << be_uidt;
+
+      *os << be_nl << be_nl
+          << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << node->local_name () << "_var," << be_nl
+          << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl
+          << elem->nested_type_name (scope) << "," << be_nl;
+      *os << elem->nested_type_name (scope, "_var") << be_uidt_nl
+          << ">" << be_uidt << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_out;" << be_uidt;
 
-  // operator ().
-  *os << "operator " << node->local_name () << " *&();" << be_nl;
+      break;
+    case be_sequence::MNG_VALUE:
+      *os << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl
+          << elem->nested_type_name (scope) << "," << be_nl;
+      *os << elem->nested_type_name (scope, "_var") << "," << be_nl
+          << elem->fwd_helper_name () << "_life" << be_uidt_nl
+          << ">" << be_uidt << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_var;" << be_uidt;
+
+      *os << be_nl << be_nl
+          << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << node->local_name () << "_var," << be_nl
+          << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl
+          << elem->nested_type_name (scope) << "," << be_nl;
+      *os << elem->nested_type_name (scope, "_var") << "," << be_nl
+          << elem->fwd_helper_name () << "_life" << be_uidt_nl
+          << ">" << be_uidt << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_out;" << be_uidt;
 
-  // ptr function.
-  *os << node->local_name () << " *&ptr (void);" << be_nl;
+      break;
+    case be_sequence::MNG_STRING:
+      *os << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << "TAO_SeqElem_String_Manager" << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_var;" << be_uidt;
+
+      *os << be_nl << be_nl
+          << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << node->local_name () << "_var," << be_nl
+          << "TAO_SeqElem_String_Manager" << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_out;" << be_uidt;
 
-  // operator ->.
-  *os << node->local_name () << " *operator-> (void);" << be_nl;
+      break;
+    case be_sequence::MNG_WSTRING:
+      *os << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << "TAO_SeqElem_WString_Manager" << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_var;" << be_uidt;
+
+      *os << be_nl << be_nl
+          << "typedef" << be_idt_nl
+          << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+          << node->local_name () << "," << be_nl
+          << node->local_name () << "_var," << be_nl
+          << "TAO_SeqElem_WString_Manager" << be_uidt_nl
+          << ">" << be_uidt_nl
+          << node->local_name () << "_out;" << be_uidt;
 
-  // Overloaded [] operator only for sequence. The const version is not
-  // required
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_SEQELEM_RETTYPE_CH);
-  be_visitor_sequence_elemtype sr_visitor (&ctx);
+      break;
+    default: // Not a managed type.
+      {
+        AST_Type::SIZE_TYPE st = elem->size_type ();
+        be_typedef *td = be_typedef::narrow_from_decl (elem);
+        AST_Decl::NodeType nt = elem->node_type ();
+
+        if (td != 0)
+          {
+            nt = td->base_node_type ();
+          }
+
+        *os << "typedef" << be_idt_nl
+            << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<"
+                                      : "TAO_VarSeq_Var_T<")
+            << be_idt << be_idt_nl
+            << node->local_name () << "," << be_nl
+            << elem->nested_type_name (scope);
+
+        /*if (nt == AST_Decl::NT_array)
+          {
+            *os << "_slice *";
+            }*/
+
+        *os << be_uidt_nl
+            << ">" << be_uidt_nl
+            << node->local_name () << "_var;" << be_uidt;
+
+        *os << be_nl << be_nl
+            << "typedef" << be_idt_nl
+            << "TAO_Seq_Out_T<" << be_idt << be_idt_nl
+            << node->local_name () << "," << be_nl
+            << node->local_name () << "_var," << be_nl
+            << elem->nested_type_name (scope);
+
+        /*if (nt == AST_Decl::NT_array)
+          {
+            *os << "_slice *";
+            }*/
+
+        *os << be_uidt_nl
+            << ">" << be_uidt_nl
+            << node->local_name () << "_out;" << be_uidt;
+      }
 
-  if (bt->accept (&sr_visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_sequence::"
-                         "gen_var_defn - "
-                         "[] ret type gen failed\n"),
-                        -1);
+      break;
     }
-
-  *os << " operator[] (CORBA::ULong index);" << be_uidt_nl << be_nl;
-  *os << "private:" << be_idt_nl;
-  *os << node->local_name () << " *&ptr_;" << be_nl;
-  *os << "// Assignment from T_var not allowed." << be_nl;
-  *os << "void operator= (const " << node->local_name ()
-      << "_var &);" << be_uidt_nl;
-  *os << "};";
-
-  return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
index 874a74fbad9..f0ceddced60 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_sequence, 
-           sequence_ci, 
+ACE_RCSID (be_visitor_sequence,
+           sequence_ci,
            "$Id$")
 
 // ***********************************************************
@@ -39,663 +39,11 @@ be_visitor_sequence_ci::~be_visitor_sequence_ci (void)
 int
 be_visitor_sequence_ci::visit_sequence (be_sequence *node)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
-
   if (node->cli_inline_gen () || node->imported ())
     {
       return 0;
     }
 
-  // Instantiation.
-
-  if (this->instantiate_sequence (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "codegen. for the primitive type sequence\n"),
-                        -1);
-    }
-
-  // End of instantiation.
-
-  // No _var or _out class for an anonymous (non-typedef'd) sequence.
-  if (this->ctx_->tdef () != 0)
-    {
-      // Generate the ifdefined macro for the sequence type.
-      os->gen_ifdef_macro (node->flat_name ());
-
-      // All we do is generate the _var and _out implementations.
-      if (this->gen_var_impl (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ci::"
-                             "visit_sequence - "
-                             "codegen for _var failed\n"), 
-                            -1);
-        }
-
-      if (this->gen_out_impl (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ci::"
-                             "visit_sequence - "
-                             "codegen for _out failed\n"), 
-                            -1);
-        }
-
-      // Generate the endif macro for the sequence type.
-      os->gen_endif ();
-    }
-
-  // Since we don't generate CDR stream operators for types that
-  // explicitly contain a local interface (at some level), we 
-  // must override these Any template class methods to avoid
-  // calling the non-existent operators. The zero return value
-  // will eventually cause CORBA::MARSHAL to be raised if this
-  // type is inserted into an Any and then marshaled.
-  if (node->is_local () && be_global->any_support ())
-    {
-      TAO_OutStream *os = this->ctx_->stream ();
-
-      *os << be_nl << be_nl
-          << "template<>" << be_nl
-          << "ACE_INLINE" << be_nl
-          << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
-          << ">::marshal_value (TAO_OutputCDR &)" << be_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}";
-
-      *os << be_nl << be_nl
-          << "template<>" << be_nl
-          << "ACE_INLINE" << be_nl
-          << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
-          << ">::demarshal_value (TAO_InputCDR &)" << be_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}";
-    }
-
   node->cli_inline_gen (1);
-
-  return 0;
-}
-
-int
-be_visitor_sequence_ci::instantiate_sequence (be_sequence *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (bt == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "gen_instantiate_template_name - "
-                         "Bad element type\n"), 
-                        -1);
-    }
-
-  // Generate the appropriate sequence type.
-  switch (node->managed_type ())
-    {
-    case be_sequence::MNG_PSEUDO:
-    case be_sequence::MNG_OBJREF:
-    case be_sequence::MNG_VALUE:
-    case be_sequence::MNG_ABSTRACT:
-      if (node->unbounded ())
-        {
-          this->gen_unbounded_obj_sequence (node);
-        }
-      else
-        {
-          this->gen_bounded_obj_sequence (node);
-        }
-
-      break;
-    case be_sequence::MNG_STRING: // Sequence of strings
-      if (!node->unbounded ())
-        {
-          this->gen_bounded_str_sequence (node);
-        }
-
-      break;
-    case be_sequence::MNG_WSTRING: // Sequence of wstrings
-      if (!node->unbounded ())
-        {
-          this->gen_bounded_wstr_sequence (node);
-        }
-
-      break;
-    default: // Not a managed type.
-      if (node->unbounded ())
-	      {
-	        // TAO provides extensions for octet sequences, first find out
-	        // if the base type is an octet (or an alias for octet).
-	        be_predefined_type *predef = 0;
-
-	        if (bt->base_node_type () == AST_Type::NT_pre_defined)
-	          {
-	            be_typedef* alias =
-		            be_typedef::narrow_from_decl (bt);
-
-	            if (alias == 0)
-		            {
-		              predef =
-		                be_predefined_type::narrow_from_decl (bt);
-		            }
-	            else
-		            {
-		              predef =
-                    be_predefined_type::narrow_from_decl (
-                        alias->primitive_base_type ()
-                      );
-		            }
-	          }
-
-	        if (predef != 0)
-	          {
-	            if (predef->pt() != AST_PredefinedType::PT_octet)
-                {
-		              this->gen_unbounded_sequence (node);
-                }
-	          }
-	        else
-            {
-	            this->gen_unbounded_sequence (node);
-            }
-	      }
-      else
-        {
-          this->gen_bounded_sequence (node);
-        }
-
-      break;
-    } // End of switch.
-
-  return 0;
-}
-
-int
-be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  char fname [NAMEBUFSIZE];
-  char lname [NAMEBUFSIZE];
-
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname,
-                   "%s_var",
-                   node->full_name ());
-
-  ACE_OS::memset (lname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname,
-                   "%s_var",
-                   node->local_name ()->get_string ());
-
-  // Retrieve base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (bt == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "visit_sequence - "
-                         "Bad element type\n"), 
-                        -1);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// Inline operations for class " << fname << be_nl;
-  *os << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Default constuctor.
-  *os << "ACE_INLINE" << be_nl
-      << fname << "::" << lname
-      << " (void)" << be_nl
-      << "  " << ": ptr_ (0)" << be_nl
-      << "{}" << be_nl << be_nl;
-
-  // Constuctor from a _ptr.
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->local_name ()
-      << " *p)" << be_nl;
-  *os << "  : ptr_ (p)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const ::" << fname
-      << " &p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "if (p.ptr_)" << be_idt_nl
-      << "{" << be_idt_nl;
-  *os << "ACE_NEW (this->ptr_, ::" << node->name ()
-      << " (*p.ptr_));" << be_uidt_nl
-      << "}" << be_uidt_nl;
-  *os << "else" << be_idt_nl
-      << "{" << be_idt_nl;
-  *os << "this->ptr_ = 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Fixed-size base types only.
-  if (bt->size_type () == AST_Type::FIXED)
-    {
-      *os << "// Fixed-size base types only." << be_nl;
-      *os << "ACE_INLINE" << be_nl;
-      *os << fname << "::" << lname << " (const ::"
-          << node->name () << " &p)" << be_nl;
-      *os << "{" << be_idt_nl;
-      *os << "ACE_NEW (this->ptr_, ::" << node->name ()
-          << " (p));" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
-    }
-
-  // Destructor.
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::~" << lname << " (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "delete this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Assignment operator from a pointer.
-  *os << "ACE_INLINE" << be_nl
-      << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << node->local_name ()
-      << " *p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "delete this->ptr_;" << be_nl;
-  *os << "this->ptr_ = p;" << be_nl;
-  *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Assignment operator from _var.
-  *os << "ACE_INLINE" << be_nl
-      << "::" << fname << " &" << be_nl
-      << fname << "::operator= (const ::" << fname
-      << " &p)" << be_nl
-      << "{" << be_idt_nl
-      << "if (this != &p)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "if (p.ptr_ == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "delete this->ptr_;" << be_nl
-      << "this->ptr_ = 0;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << node->local_name () << " *deep_copy = 0;" << be_nl
-      << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-      << "deep_copy," << be_nl
-      << node->local_name () << " (*p.ptr_)," << be_nl
-      << "*this" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl
-      << "if (deep_copy != 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << node->local_name () << " *tmp = deep_copy;" << be_nl
-      << "deep_copy = this->ptr_;" << be_nl
-      << "this->ptr_ = tmp;" << be_nl
-      << "delete deep_copy;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return *this;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
-  // Fixed-size base types only.
-  if (bt->size_type () == AST_Type::FIXED)
-    {
-      *os << "// Fixed-size types only." << be_nl;
-      *os << "ACE_INLINE" << be_nl
-          << "::" << fname << " &" << be_nl;
-      *os << fname << "::operator= (const ::" << node->name ()
-          << " &p)" << be_nl;
-      *os << "{" << be_idt_nl;
-      *os << "if (this->ptr_ != &p)" << be_idt_nl;
-      *os << "{" << be_idt_nl;
-      *os << "delete this->ptr_;" << be_nl;
-      *os << "ACE_NEW_RETURN (this->ptr_, ::"
-          << node->name () << " (p), *this);" << be_uidt_nl;
-      *os << "}" << be_uidt_nl <<  be_nl;
-      *os << "return *this;" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
-    }
-
-  // Two arrow operators.
-  *os << "ACE_INLINE" << be_nl
-      << "const ::" << node->name () << " *" << be_nl;
-  *os << fname << "::operator-> (void) const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << "::" << node->name () << " *" << be_nl;
-  *os << fname << "::operator-> (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Other extra methods - 3 cast operators.
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::operator const ::" << node->name ()
-      << " &() const // cast" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return *this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::operator ::" << node->name ()
-      << " &() // cast " << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return *this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::operator ::" << node->name ()
-      << " &() const // cast " << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return *this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Variable-size base types only.
-  if (bt->size_type () == AST_Type::VARIABLE)
-    {
-      *os << "// Variable-size types only." << be_nl;
-      *os << "ACE_INLINE" << be_nl;
-      *os << fname << "::operator ::" << node->name ()
-          << " *&() // cast " << be_nl;
-      *os << "{" << be_idt_nl;
-      *os << "return this->ptr_;" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
-    }
-
-  // The [] operators.
-
-  // Non-const.
-  *os << "ACE_INLINE" << be_nl;
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_elemtype sr_visitor (&ctx);
-
-  if (bt->accept (&sr_visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_var_impl - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-
-  *os << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_->operator[] (index);" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  AST_Decl::NodeType nt = bt->base_node_type ();
-  AST_PredefinedType::PredefinedType pdt = AST_PredefinedType::PT_void;
-
-  if (nt == AST_Decl::NT_pre_defined)
-    {
-      AST_PredefinedType *p = 0;
-      be_typedef *btd = be_typedef::narrow_from_decl (bt);
-
-      if (btd == 0)
-        {
-          p = AST_PredefinedType::narrow_from_decl (bt);
-        }
-      else
-        {
-          p = AST_PredefinedType::narrow_from_decl (
-                  btd->primitive_base_type ()
-                );
-        }
-
-      pdt = p->pt ();
-    }
-
-  // @@ (JP) Problems with constant instantiations of TAO_Object_Manager,
-  // TAO_Pseudo_Object_Manager, TAO_SeqElem_WString_Manager and
-  // TAO_SeqElem_String_Manager make these impossible right now [BUGID:676].
-  if (nt != AST_Decl::NT_string
-      && nt != AST_Decl::NT_wstring
-      && nt != AST_Decl::NT_interface
-      && nt != AST_Decl::NT_interface_fwd
-      && nt != AST_Decl::NT_valuetype
-      && nt != AST_Decl::NT_array
-      && pdt != AST_PredefinedType::PT_pseudo
-      && pdt != AST_PredefinedType::PT_object)
-    {
-      // Const.
-      *os << "ACE_INLINE" << be_nl
-          << "const ";
-
-      if (bt->accept (&sr_visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ci::"
-                             "gen_var_impl - "
-                             "[] ret type gen failed\n"),
-                            -1);
-        }
-
-      *os << be_nl;
-      *os << fname << "::operator[] (CORBA::ULong index) const" << be_nl;
-      *os << "{" << be_idt_nl;
-
-      *os << "return ACE_const_cast (const ";
-
-      if (bt->accept (&sr_visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ci::"
-                             "gen_var_impl - "
-                             "[] ret type gen failed\n"),
-                            -1);
-        }
-
-      *os << ", this->ptr_->operator[] (index));" << be_uidt_nl;
-
-      *os << "}" << be_nl << be_nl;
-    }
-
-  // in, inout, out, and _retn.
-  *os << "ACE_INLINE" << be_nl
-      << "const ::" << node->name () << " &" << be_nl;
-  *os << fname << "::in (void) const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return *this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << "::" << node->name () << " &" << be_nl;
-  *os << fname << "::inout (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return *this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << "::" << node->name () << " *&" << be_nl;
-  *os << fname << "::out (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "delete this->ptr_;" << be_nl;
-  *os << "this->ptr_ = 0;" << be_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl
-      << "::" << node->name () << " *" << be_nl;
-  *os << fname << "::_retn (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "::" << node->name () << " *tmp = this->ptr_;" << be_nl;
-  *os << "this->ptr_ = 0;" << be_nl;
-  *os << "return tmp;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // The additional ptr () member function.
-  *os << "ACE_INLINE" << be_nl
-      << "::" << node->name () << " *" << be_nl;
-  *os << fname << "::ptr (void) const" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}";
-
-  return 0;
-}
-
-int
-be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  char fname [NAMEBUFSIZE];
-  char lname [NAMEBUFSIZE];
-
-
-  ACE_OS::memset (fname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname, 
-                   "%s_out", 
-                   node->full_name ());
-
-  ACE_OS::memset (lname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname, 
-                   "%s_out", 
-                   node->local_name ()->get_string ());
-
-  // Retrieve base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (bt == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_out_impl - "
-                         "Bad element type\n"), -1);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "// *************************************************************"
-      << be_nl;
-  *os << "// Inline operations for class " << fname << be_nl;
-  *os << "// *************************************************************"
-      << be_nl << be_nl;
-
-  // Constuctorr from a pointer.
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->local_name ()
-      << " *&p)" << be_nl;
-  *os << "  : ptr_ (p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = 0;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Constructor from _var &.
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->local_name ()
-      << "_var &p)" << be_nl;
-  *os << "  : ptr_ (p.out ())" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "delete this->ptr_;" << be_nl;
-  *os << "this->ptr_ = 0;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Copy constructor.
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const ::" << fname
-      << " &p)" << be_nl;
-  *os << "  : ptr_ (ACE_const_cast (" << lname
-      << "&, p).ptr_)" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  // Assignment operator from _out &.
-  *os << "ACE_INLINE" << be_nl
-      << "::" << fname << " &" << be_nl;
-  *os << fname << "::operator= (const ::" << fname
-      << " &p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = ACE_const_cast (" << lname
-      << "&, p).ptr_;" << be_nl;
-  *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Assignment from _var is not allowed by a private declaration.
-
-  // Assignment operator from pointer.
-  *os << "ACE_INLINE" << be_nl
-      << "::" << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << node->local_name ()
-      << " *p)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "this->ptr_ = p;" << be_nl;
-  *os << "return *this;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Other extra methods - cast operator ().
-  *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::operator ::" << node->name ()
-      << " *&() // cast" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // ptr function.
-  *os << "ACE_INLINE" << be_nl
-      << "::" << node->name () << " *&" << be_nl;
-  *os << fname << "::ptr (void) // ptr" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // operator ->.
-  *os << "ACE_INLINE" << be_nl
-      << "::" << node->name () << " *" << be_nl;
-  *os << fname << "::operator-> (void)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  // Sequence has an additional method.
-  *os << "ACE_INLINE" << be_nl;
-
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_elemtype sr_visitor (&ctx);
-
-  if (bt->accept (&sr_visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ci::"
-                         "gen_out_impl - "
-                         "[] ret type gen failed\n"),
-                        -1);
-    }
-
-  *os << be_nl;
-  *os << fname << "::operator[] (CORBA::ULong index)" << be_nl;
-  *os << "{" << be_idt_nl;
-  *os << "return this->ptr_->operator[] (index);" << be_uidt_nl;
-  *os << "}";
-
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index becf4b1ca0a..560ca3c870c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_sequence, 
-           sequence_cs, 
+ACE_RCSID (be_visitor_sequence,
+           sequence_cs,
            "$Id$")
 
 // ************************************************************
@@ -35,254 +35,75 @@ be_visitor_sequence_cs::~be_visitor_sequence_cs (void)
 {
 }
 
-int
-be_visitor_sequence_cs::gen_base_sequence_class (be_sequence *node)
+int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
 
-  if (!bt)
+  if (node->imported ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "gen_base_sequence_class - "
-                         "Bad element type\n"), 
-                        -1);
-    }
-
-  os->gen_ifdef_AHETI();
-
-  // This is the instantiation branch.
-  *os << be_nl << node->instance_name ();
-
-  os->gen_else_AHETI();
-
-  // Generate the appropriate sequence type.
-  switch (node->managed_type ())
-    {
-    case be_sequence::MNG_OBJREF:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_Object_Sequence<";
-        }
-      else
-        {
-          *os << "TAO_Bounded_Object_Sequence<";
-        }
-
-      break;
-    case be_sequence::MNG_ABSTRACT:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_Abstract_Sequence<";
-        }
-      else
-        {
-          *os << "TAO_Bounded_Abstract_Sequence<";
-        }
-
-      break;
-    case be_sequence::MNG_PSEUDO:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_Pseudo_Sequence<";
-        }
-      else
-        {
-          *os << "TAO_Bounded_Pseudo_Sequence<";
-        }
-
-      break;
-    case be_sequence::MNG_VALUE:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_Valuetype_Sequence<";
-        }
-      else
-        {
-          *os << "TAO_Bounded_Valuetype_Sequence<";
-        }
-
-      break;
-    case be_sequence::MNG_STRING:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_String_Sequence";
-        }
-      else
-        {
-          *os << "TAO_Bounded_String_Sequence";
-        }
-
-      break;
-    case be_sequence::MNG_WSTRING:
-      if (node->unbounded ())
-        {
-          *os << "TAO_Unbounded_WString_Sequence";
-        }
-      else
-        {
-          *os << "TAO_Bounded_WString_Sequence";
-        }
-
-      break;
-    default: // not a managed type
-      if (bt->base_node_type () == AST_Decl::NT_array)
-        {
-          if (node->unbounded ())
-            {
-              *os << "TAO_Unbounded_Array_Sequence<";
-            }
-          else
-            {
-              *os << "TAO_Bounded_Array_Sequence<";
-            }
-        }
-      else
-        {
-          if (node->unbounded ())
-            {
-              *os << "TAO_Unbounded_Sequence<";
-            }
-          else
-            {
-              *os << "TAO_Bounded_Sequence<";
-            }
-        }
-
-      break;
+      bt->seen_in_sequence (I_TRUE);
+      return 0;
     }
 
-  be_visitor_context ctx (*this->ctx_);
-  be_visitor_sequence_base_template_args visitor (&ctx,
-                                                  node);
-
-  if (bt->accept (&visitor) == -1)
+  if (node->cli_stub_gen ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "base type visit failed\n"),
-                        -1);
+      return 0;
     }
 
-  // Find out if the sequence is of a managed type and if it is bounded or not.
-  if (node->managed_type () == be_sequence::MNG_STRING
-      || node->managed_type () == be_sequence::MNG_WSTRING)
+  // If our base type is an anonymous sequence, generate code for it here.
+  if (bt->node_type () == AST_Decl::NT_sequence)
     {
-      if (!node->unbounded ())
+      if (bt->accept (this) != 0)
         {
-          *os << "<" << node->max_size () << ">";
-        }
-    }
-  else
-    {
-      // If we are a sequence of arrays, the template includes
-      // a _var parameter.
-      if (bt->base_node_type () == AST_Decl::NT_array)
-        {
-          *os << ", ";
-
-          if (bt->accept (&visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_sequence_ch::"
-                                 "visit_sequence - "
-                                 "base type visit failed\n"),
-                                -1);
-            }
-
-          *os << "_var";
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_sequence_cs::"
+                             "visit_sequence - "
+                            "codegen for anonymous base type failed\n"),
+                           -1);
         }
 
-      if (node->unbounded ())
-        {
-          *os << ">";
-        }
-      else
-        {
-          *os << ", " << node->max_size () << ">";
-        }
     }
 
-  os->gen_endif_AHETI ();
-
-  return 0;
-}
-
-int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
-{
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->cli_stub_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-  if (this->instantiate_sequence (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_ch::"
-                         "visit_sequence - "
-                         "codegen. for the primitive type sequence\n"), 
-                        -1);
-    }
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
+      << "// "__FILE__ << ":" << __LINE__;
 
-  // Generate the ifdefined macro for the sequence type.
   os->gen_ifdef_macro (node->flat_name ());
 
-  os->indent (); // start with the current indentation level
-
-  // Retrieve the base type since we may need to do some code
-  // generation for the base type.
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "visit_sequence - "
-                         "Bad element type\n"), -1);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  *os << "// *************************************************************"
-      << be_nl
-      << "// " << node->name () << be_nl
-      << "// *************************************************************"
-      << be_nl << be_nl;
-
   // default constructor
-  *os << node->name () << "::" << node->local_name () << " (void)" << be_nl
+  *os << be_nl << be_nl
+      << node->name () << "::" << node->local_name () << " (void)" << be_nl
       << "{}";
 
   // for unbounded sequences, we have a different set of constructors
   if (node->unbounded ())
     {
       *os << be_nl << be_nl
-          << node->name () << "::" << node->local_name ()
-          << " (CORBA::ULong max)" << be_nl
-          << "  : ";
-
-      // pass it to the base constructor
-      if (this->gen_base_sequence_class (node) == -1)
+          << node->name () << "::" << node->local_name () << " ("
+          << be_idt << be_idt_nl
+          << "CORBA::ULong max" << be_uidt_nl
+          << ")" << be_nl
+          << ": " << be_idt;
+
+      // Pass it to the base constructor.
+      if (node->gen_base_class_name (os, idl_global->root ()) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_sequence_cs::"
                              "visit_sequence - "
-                            "codegen for base sequence class\n"), -1);
+                            "codegen for base sequence class failed\n"),
+                           -1);
         }
 
 
-      *os << be_nl << " (max)" << be_nl
+      *os << be_nl << "(max)" << be_uidt << be_uidt_nl
           << "{}";
     }
 
   // constructor with the buffer
-  *os << be_nl << be_nl 
-      << node->name () << "::" << node->local_name () << " (" 
+  *os << be_nl << be_nl
+      << node->name () << "::" << node->local_name () << " ("
       << be_idt << be_idt_nl;
 
   if (node->unbounded ())
@@ -306,163 +127,533 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
                         -1);
     }
 
-  *os << " *buffer," << be_nl
+  *os << " * buffer," << be_nl
       << "CORBA::Boolean release" << be_uidt_nl
       << ")" << be_uidt_nl
-      << "  : ";
+      << "  : " << be_idt << be_idt;
 
   // Pass it to the base constructor.
-  if (this->gen_base_sequence_class (node) == -1)
+  if (node->gen_base_class_name (os, idl_global->root ()) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_cs::"
                          "visit_sequence - "
-                         "codegen for base sequence class\n"), 
+                         "codegen for base sequence class\n"),
                         -1);
     }
 
-  *os << be_nl << " (";
+  *os << be_nl << "(";
 
   if (node->unbounded ())
     {
       *os << "max, ";
     }
 
-  *os << "length, buffer, release)" << be_nl
+  *os << "length, buffer, release)" << be_uidt << be_uidt_nl
       << "{}";
 
   // Copy constructor.
-  *os << be_nl << be_nl << node->name () << "::" << node->local_name ()
-      << " (const " << node->local_name ()
-      << " &seq)" << be_nl
-      << "  : ";
+  *os << be_nl << be_nl
+      << node->name () << "::" << node->local_name ()
+      << " (" << be_idt << be_idt_nl
+      << "const " << node->local_name ()
+      << " &seq" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "  : " << be_idt << be_idt;
 
   // Pass it to the base constructor.
-  if (this->gen_base_sequence_class (node) == -1)
+  if (node->gen_base_class_name (os, idl_global->root ()) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_cs::"
                          "visit_sequence - "
-                         "codegen for base sequence class\n"), 
+                         "codegen for base sequence class\n"),
                         -1);
     }
 
-  *os << be_nl << " (seq)" << be_nl
+  *os << be_nl << "(seq)" << be_uidt << be_uidt_nl
       << "{}";
 
   // Destructor.
   *os << be_nl << be_nl
       << node->name () << "::~" << node->local_name ()
-      << " (void) // dtor" << be_nl
-      << "{}" << be_nl << be_nl;
+      << " (void)" << be_nl
+      << "{}";
 
 
   if (be_global->any_support ())
     {
-      *os << "void "
-          << node->name () << "::_tao_any_destructor (void *_tao_void_pointer)" 
-          << be_nl
+      *os << be_nl << be_nl
+          << "void "
+          << node->name () << "::_tao_any_destructor (" << be_idt << be_idt_nl
+          << "void * _tao_void_pointer" << be_uidt_nl
+          << ")" << be_uidt_nl
           << "{" << be_idt_nl
-          << node->local_name () << " *tmp = ACE_static_cast ("
-          << node->local_name () << "*, _tao_void_pointer);" << be_nl
+          << node->local_name () << " * tmp =" << be_idt_nl
+          << "ACE_static_cast (" << be_idt << be_idt_nl
+          << node->local_name () << " *," << be_nl
+          << "_tao_void_pointer" << be_uidt_nl
+          << ");" << be_uidt << be_uidt_nl
           << "delete tmp;" << be_uidt_nl
           << "}";
     }
 
+  if (!bt->seen_in_sequence ())
+    {
+      // This is a no-op unless our element is a managed type.
+      this->gen_managed_type_tmplinst (node, bt);
+      bt->seen_in_sequence (I_TRUE);
+    }
+
+  if (this->ctx_->tdef () != 0)
+    {
+      this->gen_varout_tmplinst (node,
+                                 bt);
+    }
+
   os->gen_endif ();
-  node->cli_stub_gen (1);
 
+  node->cli_stub_gen (1);
   return 0;
 }
 
-int
-be_visitor_sequence_cs::instantiate_sequence (be_sequence *node)
+void
+be_visitor_sequence_cs::gen_managed_type_tmplinst (be_sequence *node,
+                                                   be_type *bt)
 {
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+  TAO_OutStream *os = this->ctx_->stream ();
 
-  if (!bt)
+  switch (node->managed_type ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_sequence_cs::"
-                         "gen_instantiate_template_name - "
-                         "Bad element type\n"), -1);
+      case be_sequence::MNG_OBJREF:
+        os->gen_ifdef_AHETI ();
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_Object_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        os->gen_elif_AHETI ();
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt << be_idt_nl
+            << "TAO_Object_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << ">" << be_uidt << be_uidt << be_uidt;
+
+        os->gen_endif_AHETI ();
+
+        break;
+      case be_sequence::MNG_ABSTRACT:
+        os->gen_ifdef_AHETI ();
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_Abstract_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        os->gen_elif_AHETI ();
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt << be_idt_nl
+            << "TAO_Abstract_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << ">" << be_uidt << be_uidt << be_uidt;
+
+        os->gen_endif_AHETI ();
+
+        break;
+      case be_sequence::MNG_VALUE:
+        os->gen_ifdef_AHETI ();
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        os->gen_elif_AHETI ();
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt << be_idt_nl
+            << "TAO_Valuetype_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << ">" << be_uidt << be_uidt << be_uidt;
+
+        os->gen_endif_AHETI ();
+
+        break;
+      case be_sequence::MNG_PSEUDO:
+        os->gen_ifdef_AHETI ();
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var" << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        os->gen_elif_AHETI ();
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt << be_idt_nl
+            << "TAO_Pseudo_Object_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var \\" << be_uidt_nl
+            << ">" << be_uidt << be_uidt << be_uidt;
+
+        os->gen_endif_AHETI ();
+
+        break;
+      default:
+        //  String and Wstring managed types are not template classes.
+        break;
     }
+}
+
+int
+be_visitor_sequence_cs::gen_varout_tmplinst (be_sequence *node,
+                                             be_type *bt)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  os->gen_ifdef_AHETI ();
 
-  // Generate the appropriate sequence type.
   switch (node->managed_type ())
     {
-    case be_sequence::MNG_PSEUDO:
-    case be_sequence::MNG_OBJREF:
-    case be_sequence::MNG_VALUE:
-    case be_sequence::MNG_ABSTRACT:
-      if (node->unbounded ())
-        {
-          this->gen_unbounded_obj_sequence (node);
-        }
-      else
+      case be_sequence::MNG_OBJREF:
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << "TAO_Object_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">" << be_uidt << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << node->name () << "_var," << be_nl
+            << "TAO_Object_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">" << be_uidt << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_ABSTRACT:
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << "TAO_Abstract_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">" << be_uidt << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << node->name () << "_var," << be_nl
+            << "TAO_Abstract_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">" << be_uidt << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_PSEUDO:
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var" << be_uidt_nl
+            << ">" << be_uidt << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << node->name () << "_var," << be_nl
+            << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var" << be_uidt_nl
+            << ">" << be_uidt << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_VALUE:
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">" << be_uidt << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << node->name () << "_var," << be_nl
+            << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl
+            << bt->name () << "," << be_nl
+            << bt->name () << "_var," << be_nl
+            << bt->fwd_helper_name () << "_life" << be_uidt_nl
+            << ">" << be_uidt << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_STRING:
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            <<"TAO_SeqElem_String_Manager" << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << node->name () << "_var," << be_nl
+            << "TAO_SeqElem_String_Manager" << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_WSTRING:
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            <<"TAO_SeqElem_WString_Manager" << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "template class" << be_idt_nl
+            << "TAO_MngSeq_Out_T<" << be_idt << be_idt_nl
+            << node->name () << "," << be_nl
+            << node->name () << "_var," << be_nl
+            << "TAO_SeqElem_WString_Manager" << be_uidt_nl
+            << ">;" << be_uidt << be_uidt;
+
+        break;
+      default: // not a managed type
         {
-          this->gen_bounded_obj_sequence (node);
+          AST_Type::SIZE_TYPE st = bt->size_type ();
+
+          *os << be_nl << be_nl
+              << "template class" << be_idt_nl
+              << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<"
+                                        : "TAO_VarSeq_Var_T<")
+              << be_idt << be_idt_nl
+              << node->local_name () << "," << be_nl
+              << bt->name () << be_uidt_nl
+              << ">;" << be_uidt << be_uidt;
+
+          *os << be_nl << be_nl
+              << "template class" << be_idt_nl
+              << "TAO_Seq_Out_T<" << be_idt << be_idt_nl
+              << node->local_name () << "," << be_nl
+              << node->local_name () << "_var," << be_nl
+              << bt->name () << be_uidt_nl
+              << ">;" << be_uidt << be_uidt;
         }
 
-      break;
-    case be_sequence::MNG_STRING:
-      if (!node->unbounded ())
-        {
-          this->gen_bounded_str_sequence (node);
-        }
+        break;
+    }
 
-      break;
-    case be_sequence::MNG_WSTRING:
-      if (!node->unbounded ())
-        {
-          this->gen_bounded_wstr_sequence (node);
-        }
+  os->gen_elif_AHETI ();
 
-      break;
-    default:
-      if (node->unbounded ())
-	      {
-	        // TAO provides extensions for octet sequences, first find out
-	        // if the base type is an octet (or an alias for octet).
-	        be_predefined_type *predef = 0;
-
-	        if (bt->base_node_type () == AST_Type::NT_pre_defined)
-	          {
-	            be_typedef* alias =
-		            be_typedef::narrow_from_decl (bt);
-
-	            if (alias == 0)
-		            {
-		              predef =
-		                be_predefined_type::narrow_from_decl (bt);
-		            }
-	            else
-		            {
-		              predef =
-                    be_predefined_type::narrow_from_decl (
-                        alias->primitive_base_type ()
-                      );
-		            }
-	          }
-
-	        if (predef != 0)
-	          {
-	            if (predef->pt() != AST_PredefinedType::PT_octet)
-                {
-		              this->gen_unbounded_sequence (node);
-                }
-	          }
-	        else
-            {
-	            this->gen_unbounded_sequence (node);
-            }
-	      }
-      else
+  switch (node->managed_type ())
+    {
+      case be_sequence::MNG_OBJREF:
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt << be_idt_nl
+            << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << "TAO_Object_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << "> \\" << be_uidt << be_uidt_nl
+            << ">" << be_uidt << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt << be_idt_nl
+            << "TAO_MngSeq_Out_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << node->name () << "_var, \\" << be_nl
+            << "TAO_Object_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << "> \\" << be_uidt << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_ABSTRACT:
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << "TAO_Abstract_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << "> \\" << be_uidt << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Out_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << node->name () << "_var, \\" << be_nl
+            << "TAO_Abstract_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << "> \\" << be_uidt << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_PSEUDO:
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << "TAO_Pseudo_Object_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var \\" << be_uidt_nl
+            << "> \\" << be_uidt << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Out_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << node->name () << "_var, \\" << be_nl
+            << "TAO_Pseudo_Object_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var \\" << be_uidt_nl
+            << "> \\" << be_uidt << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_VALUE:
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << "TAO_Valuetype_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << "> \\" << be_uidt << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Out_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << node->name () << "_var, \\" << be_nl
+            << "TAO_Valuetype_Manager< \\" << be_idt << be_idt_nl
+            << bt->name () << ", \\" << be_nl
+            << bt->name () << "_var, \\" << be_nl
+            << bt->fwd_helper_name () << "_life \\" << be_uidt_nl
+            << "> \\" << be_uidt << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_STRING:
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            <<"TAO_SeqElem_String_Manager \\" << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Out_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << node->name () << "_var, \\" << be_nl
+            << "TAO_SeqElem_String_Manager \\" << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        break;
+      case be_sequence::MNG_WSTRING:
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            <<"TAO_SeqElem_WString_Manager \\" << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        *os << be_nl << be_nl
+            << "# pragma instantiate \\" << be_idt_nl
+            << "TAO_MngSeq_Out_T< \\" << be_idt << be_idt_nl
+            << node->name () << ", \\" << be_nl
+            << node->name () << "_var, \\" << be_nl
+            << "TAO_SeqElem_WString_Manager \\" << be_uidt_nl
+            << ">" << be_uidt << be_uidt;
+
+        break;
+      default: // not a managed type
         {
-          this->gen_bounded_sequence (node);
+          AST_Type::SIZE_TYPE st = bt->size_type ();
+
+          *os << be_nl << be_nl
+              << "# pragma instantiate \\" << be_idt_nl
+              << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T< \\"
+                                        : "TAO_VarSeq_Var_T< \\")
+              << be_idt << be_idt_nl
+              << node->local_name () << ", \\" << be_nl
+              << bt->name () << " \\" << be_uidt_nl
+              << ">" << be_uidt << be_uidt;
+
+          *os << be_nl << be_nl
+              << "# pragma instantiate \\" << be_idt_nl
+              << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl
+              << node->local_name () << ", \\" << be_nl
+              << node->local_name () << "_var, \\" << be_nl
+              << bt->name () << " \\" << be_uidt_nl
+              << ">" << be_uidt << be_uidt;
         }
-      break;
-    } // end of switch
+
+        break;
+    }
+
+  os->gen_endif_AHETI ();
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
index cba35e725bc..b146c76a047 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
@@ -45,12 +45,14 @@ int be_visitor_structure_ch::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  // Generate the _var and _out typedefs.
+  node->gen_common_varout (os);
 
-  *os << "class " << node->local_name () << "_var;" << be_nl << be_nl;
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__;
 
-  *os << "struct " << be_global->stub_export_macro () << " "
+  *os << be_nl << be_nl
+      << "struct " << be_global->stub_export_macro () << " "
       << node->local_name () << be_nl
       << "{" << be_idt_nl;
 
@@ -76,38 +78,6 @@ int be_visitor_structure_ch::visit_structure (be_structure *node)
   *os << be_uidt_nl;
   *os << "};";
 
-  // Generate var definition.
-  if (node->gen_var_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure_ch::"
-                         "visit_structure - "
-                         "codegen for _var failed\n"),
-                        -1);
-    }
-
-  // A class is generated for an out defn only for a variable
-  // length struct.
-  if (node->size_type () == AST_Type::VARIABLE)
-    {
-      if (node->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_structure_ch::"
-                             "visit_structure - "
-                             "codegen for _out failed\n"),
-                            -1);
-        }
-    }
-  else
-    {
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-      *os << "typedef " << node->local_name () << " &"
-          << node->local_name () << "_out;";
-    }
-
   if (be_global->tc_support ())
     {
       be_visitor_context ctx (*this->ctx_);
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
index 2eab4c7f858..f3a7520ba70 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_structure, 
-           structure_ci, 
+ACE_RCSID (be_visitor_structure,
+           structure_ci,
            "$Id$")
 
 // ******************************************************
@@ -43,66 +43,16 @@ int be_visitor_structure_ci::visit_structure (be_structure *node)
       return 0;
     }
 
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure_ci::"
-                         "visit_structure - "
-                         "codegen for _var failed\n"), 
-                        -1);
-    }
-
-  if (node->size_type () == AST_Type::VARIABLE &&
-      node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure_ci::"
-                         "visit_structure - "
-                         "codegen for _out failed\n"), 
-                        -1);
-    }
-
-  // all we have to do is to visit the scope
+  // All we have to do is to visit the scope.
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure_ci::"
                          "visit_structure - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
-  // Since we don't generate CDR stream operators for types that
-  // explicitly contain a local interface (at some level), we 
-  // must override these Any template class methods to avoid
-  // calling the non-existent operators. The zero return value
-  // will eventually cause CORBA::MARSHAL to be raised if this
-  // type is inserted into an Any and then marshaled.
-  if (node->is_local () && be_global->any_support ())
-    {
-      TAO_OutStream *os = this->ctx_->stream ();
-
-      *os << be_nl << be_nl
-          << "template<>" << be_nl
-          << "ACE_INLINE" << be_nl
-          << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
-          << ">::marshal_value (TAO_OutputCDR &)" << be_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}";
-
-      *os << be_nl << be_nl
-          << "template<>" << be_nl
-          << "ACE_INLINE" << be_nl
-          << "CORBA::Boolean" << be_nl
-          << "TAO::Any_Dual_Impl_T<" << node->name ()
-          << ">::demarshal_value (TAO_InputCDR &)" << be_nl
-          << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
-          << "}";
-    }
-
   node->cli_inline_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
index a160d3c2900..7db67b176ef 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -88,6 +88,10 @@ be_visitor_structure_cs::visit_structure (be_structure *node)
                         -1);
     }
 
+  // Generate the conditional explicit template instantiations for our
+  // _var and/or _out clases.
+  node->gen_common_tmplinst (os);
+
   node->cli_stub_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp
index 3d9cd997639..85cb72ef70f 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #include "be_structure_fwd.h"
+#include "be_structure.h"
 
 #include "be_visitor_structure_fwd.h"
 #include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
index a60ed387127..8c87e56dcfb 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
@@ -44,17 +44,11 @@ be_visitor_structure_fwd_ch::visit_structure_fwd (be_structure_fwd *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->cli_hdr_gen () || node->imported ())
-    {
-      return 0;
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  be_structure *fd = 
+    be_structure::narrow_from_decl (node->full_definition ());
 
-  // Generate a forward declaration of the class.
-  *os << be_nl << be_nl
-      << "struct " << node->local_name () << ";";
+  // This will be a no-op if it has already been done for this node.
+  fd->gen_common_varout (os);
 
   node->cli_hdr_gen (I_TRUE);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
index 87eee4b15e5..80381a7b6d3 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
@@ -49,16 +49,14 @@ int be_visitor_union_ch::visit_union (be_union *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+  // Generate _var and _out class typedefs.
+  node->gen_common_varout (os);
 
   // Generate the ifdefined macro for the union type.
   os->gen_ifdef_macro (node->flat_name ());
 
   *os << be_nl << be_nl
-      << "class " << node->local_name () << "_var;" << be_nl << be_nl;
-
-  *os << "class " << be_global->stub_export_macro () << " "
+      << "class " << be_global->stub_export_macro () << " "
       << node->local_name () << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
@@ -200,45 +198,6 @@ int be_visitor_union_ch::visit_union (be_union *node)
 
   os->gen_endif ();
 
-  // Generate the ifdefined macro for the _var type.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-
-  // Generate var definition.
-  if (node->gen_var_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_ch::"
-                         "visit_union - "
-                         "codegen for _var\n"), -1);
-    }
-
-  os->gen_endif ();
-
-  // Generate the ifdefined macro for the array type.
-  os->gen_ifdef_macro (node->flat_name (), "_out");
-
-  // A class is generated for an out defn only for a variable
-  // length struct.
-  if (node->size_type () == AST_Type::VARIABLE)
-    {
-      if (node->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_ch::"
-                             "visit_union - "
-                             "codegen for _out\n"), -1);
-        }
-    }
-  else
-    {
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
-
-      *os << be_nl << be_nl << "typedef " << node->local_name () << " &"
-          << node->local_name () << "_out;";
-    }
-
-  os->gen_endif ();
   node->cli_hdr_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
index f349e99661d..6333a8f4945 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -91,36 +91,6 @@ int be_visitor_union_ci::visit_union (be_union *node)
                         -1);
     }
 
-  // Generate the ifdefined macro for the array type.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_ci::"
-                         "visit_union - "
-                         "codegen for _var failed\n"), 
-                        -1);
-    }
-
-  os->gen_endif ();
-
-  // Generate the ifdefined macro for the array type then generate the
-  // _out impl
-  os->gen_ifdef_macro (node->flat_name (), "_out");
-
-  if (node->size_type () == AST_Type::VARIABLE
-      && node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_ci::"
-                         "visit_union - "
-                         "codegen for _out failed\n"), 
-                        -1);
-    }
-
-  os->gen_endif ();
-
   node->cli_inline_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index b638b8807ac..34e4b8ecb44 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -292,6 +292,10 @@ int be_visitor_union_cs::visit_union (be_union *node)
         }
     }
 
+  // Generate conditional explicit template instantiations for our
+  // _var and/or _out classes.
+  node->gen_common_tmplinst (os);
+
   node->cli_stub_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
index fcb53b6924f..a21dc86379b 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
@@ -33,6 +33,7 @@
 #include "be_helper.h"
 #include "ast_union_label.h"
 #include "utl_identifier.h"
+#include "nr_extern.h"
 
 #include "be_visitor_union_branch.h"
 #include "be_visitor_array.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
index 23a69059f84..bdf756c7cea 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ci.cpp
@@ -312,8 +312,16 @@ be_visitor_union_branch_cdr_op_ci::visit_interface (be_interface *node)
         }
       else
         {
-          *os << "result =" << be_idt_nl
-              << "tao_" << node->flat_name () << "_marshal ("
+          *os << "result =" << be_idt_nl;
+
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao_marshal ("
               << be_idt << be_idt_nl
               << "_tao_union." << f->local_name () << " ()," << be_nl
               << "strm" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index 636633ba43a..393b6ed2a01 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -254,15 +254,26 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
 
       if (bt_is_defined)
         {
-          *os << "OBJECT_FIELD (" << bt->name () << "::";
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
+              << bt->name () << "::";
         }
       else
         {
-          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl;
+
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao";
         }
 
-      *os << "_duplicate (u.u_." << ub->local_name ()
-          << "_->ptr ()))" << be_uidt_nl
+      *os << "_duplicate (" << be_idt << be_idt_nl
+          << "u.u_." << ub->local_name () << "_->ptr ()" << be_uidt_nl
+          << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
   else
@@ -273,15 +284,27 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
 
       if (bt_is_defined)
         {
-          *os << "OBJECT_FIELD (" << bt->name () << "::";
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
+              << bt->name () << "::";
         }
       else
         {
-          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl;
+
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao";
         }
 
-      *os << "_duplicate (u.u_." << ub->local_name ()
-          << "_->ptr ()))," << be_nl
+      *os << "_duplicate (" << be_idt << be_idt_nl
+          << "u.u_." << ub->local_name ()
+          << "_->ptr ()" << be_uidt_nl 
+          << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl
           << "*this" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
@@ -344,15 +367,26 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
 
       if (bt_is_defined)
         {
-          *os << "OBJECT_FIELD (" << bt->name () << "::";
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
+              << bt->name () << "::";
         }
       else
         {
-          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl;
+
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao";
         }
 
-      *os << "_duplicate (u.u_." << ub->local_name ()
-          << "_->ptr ()))" << be_uidt_nl
+      *os << "_duplicate (" << be_idt << be_idt_nl
+          << "u.u_." << ub->local_name () << "_->ptr ()" << be_uidt_nl
+          << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
   else
@@ -363,15 +397,27 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
 
       if (bt_is_defined)
         {
-          *os << "OBJECT_FIELD (" << bt->name () << "::";
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
+              << bt->name () << "::";
         }
       else
         {
-          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl;
+
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao";
         }
 
-      *os << "_duplicate (u.u_." << ub->local_name ()
-          << "_->ptr ()))," << be_nl
+      *os << "_duplicate (" << be_idt << be_idt_nl
+          << "u.u_." << ub->local_name ()
+          << "_->ptr ()" << be_uidt_nl 
+          << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl
           << "*this" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index be063f62f9c..fc2b88ae41d 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -362,14 +362,24 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
 
       if (bt_is_defined)
         {
-          *os << "OBJECT_FIELD (" << bt->name () << "::";
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
+              << bt->name () << "::";
         }
       else
         {
-          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl;
+
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao";
         }
 
-  *os << "_duplicate (val))" << be_uidt_nl
+  *os << "_duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -457,14 +467,24 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
 
       if (bt_is_defined)
         {
-          *os << "OBJECT_FIELD (" << bt->name () << "::";
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl
+              << bt->name () << "::";
         }
       else
         {
-          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+          *os << "OBJECT_FIELD (" << be_idt << be_idt_nl;
+
+          AST_Decl *parent = ScopeAsDecl (node->defined_in ());
+
+          if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+            {
+              *os << parent->name () << "::";
+            }
+
+          *os << "tao_" << node->local_name () << "_life::tao";
         }
 
-  *os << "_duplicate (val))" << be_uidt_nl
+  *os << "_duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -625,25 +645,14 @@ be_visitor_union_branch_public_ci::visit_valuetype_fwd (be_valuetype_fwd *node)
       ub->gen_default_label_value (os, bu);
     }
 
-  idl_bool bt_is_defined = node->full_definition ()->is_defined ();
-
   *os << ";" << be_nl
+      << "CORBA::add_ref (val);" << be_nl
       << "typedef "
       << bt->nested_type_name (bu, "_var")
       << " OBJECT_FIELD;" << be_nl
       << "ACE_NEW (" << be_idt << be_idt_nl
-      << "this->u_." << ub->local_name () << "_," << be_nl;
-
-      if (bt_is_defined)
-        {
-          *os << "OBJECT_FIELD (" << bt->name () << "::";
-        }
-      else
-        {
-          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
-        }
-
-  *os << "_duplicate (val))" << be_uidt_nl
+      << "this->u_." << ub->local_name () << "_," << be_nl
+      << "OBJECT_FIELD (val)" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp
index 79ed60e34cc..e50944b28e9 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #include "be_union_fwd.h"
+#include "be_union.h"
 
 #include "be_visitor_union_fwd.h"
 #include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
index 455b4fdec48..474c49e7075 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
@@ -43,13 +43,10 @@ be_visitor_union_fwd_ch::visit_union_fwd (be_union_fwd *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  be_union *fd = be_union::narrow_from_decl (node->full_definition ());
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // Generate a forward declaration of the class.
-  *os << be_nl << be_nl
-      << "class " << node->local_name () << ";";
+  // This will be a no-op if it has already been done for this node.
+  fd->gen_common_varout (os);
 
   node->cli_hdr_gen (I_TRUE);
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index ae9bc162766..d9db49eca9d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -18,10 +18,11 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype, 
-           any_op_cs, 
+ACE_RCSID (be_visitor_valuetype,
+           any_op_cs,
            "$Id$")
 
+
 // ***************************************************************************
 // Valuetype visitor for generating Any operator declarations in the client
 // stubs file
@@ -41,7 +42,7 @@ be_visitor_valuetype_any_op_cs::~be_visitor_valuetype_any_op_cs (void)
 int
 be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 {
-  if (node->cli_stub_any_op_gen () 
+  if (node->cli_stub_any_op_gen ()
       || node->imported ()
       || node->is_local ())
     {
@@ -104,13 +105,13 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "template class TAO_Valuetype_Manager<"
       << node->full_name () << ", "
       << node->full_name () << "_var>;" << be_nl
-      << "template class TAO::Any_Impl_T<" << node->full_name () 
+      << "template class TAO::Any_Impl_T<" << node->full_name ()
       << ">;" << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
       << "#  pragma instantiate TAO_Valuetype_Manager<"
       << node->full_name () << ", "
       << node->full_name () << "_var>" << be_nl
-      << "#  pragma instantiate TAO::Any_Impl_T<" << node->full_name () 
+      << "#  pragma instantiate TAO::Any_Impl_T<" << node->full_name ()
       << ">" << be_uidt_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index bd7cbb13e3f..216fbd35b8d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -45,59 +45,16 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       return 0;
     }
 
+  // This will be a no-op if it has alread by done by a forward
+  // declaration.
+  node->gen_var_out_seq_decls ();
+
   TAO_OutStream *os = this->ctx_->stream ();
   int status = 0;
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // == STEP 1: Generate the class name and class names we inherit ==
-
-  // Forward declaration.
-  *os << "class " << node->local_name () << ";";
-
-  os->gen_ifdef_macro (node->flat_name (), "_ptr");
-
-  *os << be_nl << be_nl << "typedef " << node->local_name ()
-      << " *" << node->local_name () << "_ptr;";
-
-  os->gen_endif ();
-
-  // Generate the ifdefined macro for the _var type.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-
-  // Generate the _var declaration.
-  if (node->gen_var_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ch::"
-                         "visit_valuetype - "
-                         "codegen for _var failed\n"),
-                        -1);
-    }
-
-  os->gen_endif ();
-
-    // Generate the ifdef macro for the _out class.
-  os->gen_ifdef_macro (node->flat_name (), 
-                       "_out");
-
-  // Generate the _out declaration.
-  if (node->gen_out_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ch::"
-                         "visit_valuetype - "
-                         "codegen for _out failed\n"), 
-                        -1);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  // Generate the endif macro.
-  os->gen_endif ();
-
   // Now the valuetype definition itself.
   os->gen_ifdef_macro (node->flat_name ());
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index e4c1fbed165..451e98be5d6 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -93,51 +93,62 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  // Global functions to allow non-defined forward declared interfaces
+  const char *fhname = node->fwd_helper_name ();
+
+  if (ACE_OS::strcmp (fhname, "") == 0)
+    {
+      node->gen_fwd_helper_name ();
+      fhname = node->fwd_helper_name ();
+    }
+
+  // Helper functions to allow non-defined forward declared valuetypes
   // access to some methods in the full definition.
   *os << "void" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_add_ref (" << be_idt << be_idt_nl
-      << node->full_name () << " *p" << be_uidt_nl
+      << fhname << "_life::tao_add_ref (" 
+      << be_idt << be_idt_nl
+      << node->full_name () << " * p" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "CORBA::add_ref (p);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "void" << be_nl
-      << "tao_" << node->flat_name ()
-      << "_remove_ref (" << be_idt << be_idt_nl
-      << node->full_name () << " *p" << be_uidt_nl
+      << fhname << "_life::tao_remove_ref (" 
+      << be_idt << be_idt_nl
+       << node->full_name () << " * p" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "CORBA::remove_ref (p);" << be_uidt_nl
       << "}";
 
-  // Generate methods for _var class.
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_cs::"
-                         "visit_valuetype - "
-                         "codegen for _var failed\n"), 
-                        -1);
-    }
-
-  // Generate methods for _out class
-  if (node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_cs::"
-                         "visit_valuetype - "
-                         "codegen for _out failed\n"), 
-                        -1);
-    }
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  *os << be_nl
+      << "\n#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)" << be_idt_nl
+      << "template class" << be_idt_nl
+      << "TAO_Value_Var_T<" << be_idt << be_idt_nl
+      << node->name () << "," << be_nl
+      << fhname << "_life" << be_uidt_nl
+      << ">;" << be_uidt << be_uidt_nl
+      << "template class" << be_idt_nl
+      << "TAO_Value_Out_T<" << be_idt << be_idt_nl
+      << node->name () << "," << be_nl
+      << fhname << "_life" << be_uidt_nl
+      << ">;" << be_uidt << be_uidt << be_uidt_nl
+      << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
+      << "# pragma instantiate \\" << be_idt << be_idt_nl
+      << "TAO_Value_Var_T< \\" << be_idt << be_idt_nl
+      << node->name () << ", \\" << be_nl
+      << fhname << "_life \\" << be_uidt_nl
+      << ">" << be_uidt << be_uidt << be_uidt_nl
+      << "# pragma instantiate \\" << be_idt << be_idt_nl
+      << "TAO_Value_Out_T< \\" << be_idt << be_idt_nl
+      << node->name () << ", \\" << be_nl
+      << fhname << "_life \\" << be_uidt_nl
+      << ">" << be_uidt << be_uidt << be_uidt_nl
+      << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
   // The _downcast method    // %! use ACE_xxx_cast here ?
-  *os << node->name () << " *" << be_nl << node->name ()
+  *os << be_nl << be_nl
+      << node->name () << " *" << be_nl << node->name ()
       << "::_downcast (CORBA::ValueBase *v)" << be_nl
       << "{" << be_idt_nl
       << "if (v == 0)" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
index b1ff613ea30..d97f32902be 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
@@ -47,62 +47,12 @@ be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
   AST_Interface *fd = node->full_definition ();
   be_valuetype *bfd = be_valuetype::narrow_from_decl (fd);
 
-  if (!fd->is_defined ())
-    {
-      // To generate extern declarations after all modules are closed.
-      be_global->non_defined_interfaces.enqueue_tail (node);
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
-
-  // == STEP 1: Generate the class name and class names we inherit ==
+  // This will be a no-op if it has already been done for this node.
+  bfd->gen_var_out_seq_decls ();
 
-  // Forward declaration.
-  *os << "class " << node->local_name () << ";";
-
-  // Generate _ptr declaration
-  os->gen_ifdef_macro (node->flat_name (), "_ptr");
-
-  *os << be_nl << be_nl 
-      << "typedef " << node->local_name ()
-      << " *" << node->local_name () << "_ptr;";
-
-  os->gen_endif ();
-
-  // Generate the ifdefined macro for the _var type.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-
-  // Generate the _var declaration.
-  if (bfd->gen_var_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ch::"
-                         "visit_valuetype - "
-                         "codegen for _var failed\n"),
-                        -1);
-    }
-
-  os->gen_endif ();
-
-  // Generate the ifdef macro for the _out class.
-  os->gen_ifdef_macro (node->flat_name (), "_out");
-
-  // Generate the _out declaration
-  if (bfd->gen_out_defn () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ch::"
-                         "visit_valuetype - "
-                         "codegen for _out failed\n"), -1);
-    }
-
-  // generate the endif macro.
-  os->gen_endif ();
+  // Copy the fwd helper name back to the forward declared interface node.
+  node->fwd_helper_name (bfd->fwd_helper_name ());
 
   node->cli_hdr_gen (I_TRUE);
-
   return 0;
 }
diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h
index bddd9f35a66..6b36761bc1e 100644
--- a/TAO/TAO_IDL/be_include/be_component.h
+++ b/TAO/TAO_IDL/be_include/be_component.h
@@ -44,6 +44,9 @@ public:
 
   ~be_component (void);
 
+  virtual void redefine (AST_Interface *from);
+  // Catch BE-specific members before delegating to the base class.
+
   // Cleanup function.
   virtual void destroy (void);
 
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index 981facf22ae..37fe4b20ad7 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -152,8 +152,8 @@ public:
   int gen_ifdef_AHETI (void);
   // generate the ACE_HAS_EXPLICIT... ifdef
 
-  int gen_else_AHETI (void);
-  // generate the ACE_HAS_EXPLICIT... else
+  int gen_elif_AHETI (void);
+  // generate the ACE_HAS_EXPLICIT... elif
 
   int gen_endif_AHETI (void);
   // generate the ACE_HAS_EXPLICIT... endif
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index cb988f8aab8..a4a385f9575 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -99,7 +99,7 @@ public:
   const char *local_coll_name (int) const;
   // Retrieve the fully qualified collocated class name.
 
-    virtual const char *base_proxy_impl_name (void);
+  virtual const char *base_proxy_impl_name (void);
   // retrieve the name of the base proxy implementation.
 
   virtual const char *full_base_proxy_impl_name (void);
@@ -177,28 +177,10 @@ public:
   // Generated the global hooks used for non-defined forward
   // declared interfaces, and the contructor from stub object.
 
-  virtual int gen_var_defn (char *interface_name = 0);
-  // Generate the var definition. If <interface_name> is not 0, generate
-  // the var defn for that name. Otherwise, do it for the interface you
-  // are visiting (this).
-
-  virtual int gen_var_impl (char *interface_local_name = 0,
-                            char *interface_full_name  = 0);
-  // Generate the implementation for the _var class.
-  // If any one of the argument is 0, then use the name in <this>,
-  // otherwise use the name given. Just making the class more useful.
-
-  virtual int gen_out_defn (char *interface_name = 0);
-  // Generate the out class definition. If <interface_name> is not 0,
-  // generate the out defn for that name. Otherwise, do it for the
-  // interface you are visiting (this).
-
-  virtual int gen_out_impl (char *interface_local_name = 0,
-                            char *interface_full_name = 0);
-  // Generate the out class implementation.
-  // If any one of the argument is 0, then use the name giin this
-  // node, else use the arguments.
-  //
+  void gen_var_out_seq_decls (void);
+  // Generate the declarations used by the template _var, _out
+  // classes for interfaces, and by sequence template classes.
+
   // Each interface (to fix names "T") also defines two help classes,
   // the "collocated" class inherits from T, but delegates on the
   // skeleton for T (usually POA_T or POA_ModuleName::T), in other
@@ -235,6 +217,9 @@ public:
   void in_mult_inheritance (int mi);
   // Set a new value.
 
+  virtual void redefine (AST_Interface *from);
+  // Pass along BE-specific member values when redefining a fwd decl.
+
   virtual void destroy (void);
   // Cleanup function.
 
@@ -384,6 +369,10 @@ private:
   void gen_linear_search_instance (const char *flat_name);
   // Create an instance of the linear search optable.
 
+protected:
+  int var_out_seq_decls_gen_;
+  // Have these been done already?
+
 private:
   int skel_count_;
   // Number of static skeletons in the operation table.
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index 6d7ec629437..77d73afe16b 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -30,6 +30,7 @@ class AST_Expression;
 class AST_Type;
 class be_visitor;
 class be_typedef;
+class be_field;
 
 // A sequence in OMG IDL does not define a scoping construct just as a struct
 // or union or an interface do. However, in the C++ mapping, a sequence becomes
@@ -89,13 +90,29 @@ public:
   const char *instance_name (void);
   // Report the instance name for instantiation.
 
+  int gen_base_class_name (TAO_OutStream *os,
+                           AST_Decl *elem_scope);
+  // Common code for generating the name and parameters of our
+  // template sequence base class.
+
+  be_field *field_node (void) const;
+  void field_node (be_field *node);
+  // Accessors for the member.
+
 protected:
   virtual char *gen_name (void);
   // Helper to create_name.
 
 private:
+  const char *smart_fwd_helper_name (AST_Decl *elem_scope,
+                                     be_type *elem);
+
+private:
   MANAGED_TYPE mt_;
   // Our managed type.
+
+  be_field *field_node_;
+  // Used if we are an anonymous member, to help generate a unique name.
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
index 7d337d7e440..6a48bd892f7 100644
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ b/TAO/TAO_IDL/be_include/be_structure.h
@@ -42,19 +42,9 @@ public:
                 idl_bool abstract);
   // Constructor.
 
-  virtual int gen_var_defn (char *local_name = 0);
-  // Generate the _var class definition.
-
-  virtual int gen_var_impl (char *local_name = 0,
-                            char *full_name = 0);
-  // Generate the implementation for the _var class.
-
-  virtual int gen_out_defn (char *local_name = 0);
-  // Generate the _out class definition.
-
-  virtual int gen_out_impl (char *local_name = 0,
-                            char *full_name = 0);
-  // Generate the _out implementation.
+  virtual void redefine (AST_Structure *from);
+  // Copy BE-specific values when redefining struct or union
+  // from a forward declaration.
 
   virtual void destroy (void);
   // Cleanup method.
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index 760f53b9d0e..3eb97f4bdfc 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -25,6 +25,8 @@
 #include "be_decl.h"
 #include "ast_type.h"
 
+#include "ace/SString.h"
+
 class TAO_OutStream;
 
 class be_type : public virtual AST_Type,
@@ -41,29 +43,6 @@ public:
   virtual ~be_type (void);
   // Destructor.
 
-  virtual int gen_var_defn (char *interface_local_name = 0);
-  // Generate the _var class definition.
-  // generate the var definition. If <interface_name> is not 0, generate
-  // the var defn for that name. Otherwise, do it for the interface you
-  // are visiting (this).
-
-  virtual int gen_var_impl (char *interface_local_name = 0,
-                            char *interface_full_name = 0);
-  // Generate the implementation for the _var class.
-  // If any one of the argument is 0, then use the name in <this>,
-  // otherwise use the name given. Just making the class more useful.
-
-  virtual int gen_out_defn (char *interface_name = 0);
-  // Generate the out class definition. If <interface_name> is not 0,
-  // generate the out defn for that name. Otherwise, do it for the
-  // interface you are visiting (this).
-
-  virtual int gen_out_impl (char *interface_local_name = 0,
-                            char *interface_full_name = 0);
-  // Generate the out class implementation.
-  // If any one of the argument is 0, then use the name giin this
-  // node, else use the arguments.
-
   UTL_ScopedName *tc_name (void);
   // Return the typecode name. When both, the prefix and the suffix
   // are non null, it computes and returns a tc name. Else, it also
@@ -75,6 +54,22 @@ public:
   // Type name of a node used when generating declarations for smart
   // proxies.
 
+  void gen_fwd_helper_name (void);
+
+  const char *fwd_helper_name (void) const;
+  void fwd_helper_name (const char *name);
+  // Accessor to the member.
+
+  void gen_common_varout (TAO_OutStream *os);
+  // Generate _var and _out typedefs for structs and unions.
+
+  void gen_common_tmplinst (TAO_OutStream *os);
+  // Generate explicit template instantiations for the above.
+
+  idl_bool seen_in_sequence (void) const;
+  void seen_in_sequence (idl_bool val);
+  // Accessors for the member.
+
   virtual AST_Decl::NodeType base_node_type (void) const;
   // Typedefs are tricky to handle, in many points their mapping
   // depend on base type they are aliasing.  Since typedefs can be
@@ -97,6 +92,15 @@ protected:
 
   UTL_ScopedName *tc_name_;
   // Typecode name.
+
+  ACE_CString fwd_helper_name_;
+  // Used by interfaces, valuetypes and arrays to name helper structs.
+
+  idl_bool common_varout_gen_;
+  // Have we generated our _var and _out class typedefs yet?
+
+  idl_bool seen_in_sequence_;
+  // Has this type been used as a sequence element?
 };
 
 #endif // end of if !defined
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
index 2901fa1bf2f..94153173192 100644
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ b/TAO/TAO_IDL/be_include/be_union.h
@@ -43,19 +43,8 @@ public:
             idl_bool abstract);
   // Constructor.
 
-  virtual int gen_var_defn (char *local_name = 0);
-  // Generate the _var class definition.
-
-  virtual int gen_var_impl (char *local_name = 0,
-                            char *full_name = 0);
-  // Generate the implementation for the _var class.
-
-  virtual int gen_out_defn (char *local_name = 0);
-  // Generate the _out class definition.
-
-  virtual int gen_out_impl (char *local_name = 0,
-                            char *full_name = 0);
-  // Generate the _out implementation.
+  virtual void redefine (AST_Structure *from);
+  // Catch BE-specific member values before delegating to the base class.
 
   virtual idl_bool has_duplicate_case_labels (void);
   // Do we have at least one member with multiple case labels?
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index ee6b1ec3f61..35117f3694d 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -60,20 +60,6 @@ public:
   idl_bool opt_accessor (void);
   // Should generate optimized form?
 
-  virtual int gen_var_defn (char *local_name = 0);
-  // Generate the _var class definition.
-
-  virtual int gen_var_impl (char *local_name = 0,
-                            char *full_name = 0);
-  // Generate the implementation for the _var class.
-
-  virtual int gen_out_defn (char *local_name = 0);
-  // Generate the _out class definition.
-
-  virtual int gen_out_impl (char *local_name = 0,
-                            char *full_name = 0);
-  // Generate the _out implementation.
-
   virtual int gen_helper_header (char *local_name = 0,
                                  char *full_name = 0);
   // Generate the helper functions definition.
@@ -86,6 +72,10 @@ public:
                                 char *full_name = 0);
   // Generate the helper functions implementation.
 
+  void gen_var_out_seq_decls (void);
+  // Generate the declarations used by the template _var, _out
+  // classes for valuetypes, and by sequence template classes.
+
   const char *full_obv_skel_name (void);
   // Retrieve the fully scoped skel class name.
 
@@ -154,11 +144,17 @@ public:
   // Helper method to generate *_skel operations for the concrete
   // interface that we support (if any) and those of its base classes.
 
+  const char *fwd_helper_name (void) const;
+  // Accessor to the member.
+
 private:
   char *full_obv_skel_name_;
 
   idl_bool supports_abstract_;
   // Do we support at least one abstract interface?
+
+  int var_out_seq_decls_gen_;
+  // Have these been done already?
 };
 
 #endif  // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
index 7eb4e4f578d..0d54e4efe0a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
@@ -43,15 +43,6 @@ public:
 
   virtual int visit_array (be_array *node);
   // visit the array node
-
-  virtual int gen_var_defn (be_array *node);
-  // generate the var class definition
-
-  virtual int gen_out_defn (be_array *node);
-  // generate the out class definition
-
-  virtual int gen_forany_defn (be_array *node);
-  // generate the forany class definition
 };
 
 #endif /* _BE_VISITOR_ARRAY_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
index 25601e95c74..b9f9e7c589d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
@@ -43,15 +43,6 @@ public:
 
   virtual int visit_array (be_array *node);
   // visit the array node
-
-  virtual int gen_var_impl (be_array *node);
-  // generate the var class definition
-
-  virtual int gen_out_impl (be_array *node);
-  // generate the out class definition
-
-  virtual int gen_forany_impl (be_array *node);
-  // generate the forany class definition
 };
 
 #endif /* _BE_VISITOR_ARRAY_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
index c3ce19027a0..993e7c894ad 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
@@ -42,37 +42,11 @@ public:
   // destructor
 
   virtual int visit_sequence (be_sequence *node);
-  // visit sequence node
+  // visit sequence node.
 
-  virtual int gen_unbounded_sequence (be_sequence *node);
-  // generate a instance of the unbounded sequence
-
-  virtual int gen_bounded_sequence (be_sequence *node);
-  // generate a instance of the bounded sequence
-
-  virtual int gen_unbounded_obj_sequence (be_sequence *node);
-  // generate a instance of the unbounded object sequence
-
-  virtual int gen_bounded_obj_sequence (be_sequence *node);
-  // generate a instance of the bounded object sequence
-
-  virtual int gen_bounded_str_sequence (be_sequence *node);
-  // generate a instance of the bounded string sequence
-
-  virtual int gen_bounded_wstr_sequence (be_sequence *node);
-  // generate a instance of the bounded wstring sequence
-
-  virtual int instantiate_sequence (be_sequence *node);
-  // determine which sequence to instantiate
-
-  virtual int gen_base_sequence_class (be_sequence *node);
-  // generate the base sequence class
-
-  virtual int gen_var_defn (be_sequence *node);
-  // generate the var defn
-
-  virtual int gen_out_defn (be_sequence *node);
-  // generate the out defn
+  void gen_varout_typedefs (be_sequence *node, 
+                            be_type *elem);
+  // Generate the typedefs for our _var and _out template classes.
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
index ee725cc054e..21afbcf61e0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h
@@ -44,33 +44,6 @@ public:
 
   virtual int visit_sequence (be_sequence *node);
   // visit sequence node
-
-  virtual int gen_unbounded_sequence (be_sequence *node);
-  // generate a instance of the unbounded sequence
-
-  virtual int gen_bounded_sequence (be_sequence *node);
-  // generate a instance of the bounded sequence
-
-  virtual int gen_unbounded_obj_sequence (be_sequence *node);
-  // generate a instance of the unbounded object sequence
-
-  virtual int gen_bounded_obj_sequence (be_sequence *node);
-  // generate a instance of the bounded object sequence
-
-  virtual int gen_bounded_str_sequence (be_sequence *node);
-  // generate a instance of the bounded string sequence
-
-  virtual int gen_bounded_wstr_sequence (be_sequence *node);
-  // generate a instance of the bounded wstring sequence
-
-  virtual int instantiate_sequence (be_sequence *node);
-  // determine which sequence to instantiate
-
-  virtual int gen_var_impl (be_sequence *node);
-  // generate the var impl
-
-  virtual int gen_out_impl (be_sequence *node);
-  // generate the out impl
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_SEQUENCE_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
index c4f7cb54e0c..f6e8c2b8e24 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
@@ -44,29 +44,15 @@ public:
   virtual int visit_sequence (be_sequence *node);
   // visit sequence node
 
-  virtual int gen_unbounded_sequence (be_sequence *node);
-  // generate a instance of the unbounded sequence
-
-  virtual int gen_bounded_sequence (be_sequence *node);
-  // generate a instance of the bounded sequence
-
-  virtual int gen_unbounded_obj_sequence (be_sequence *node);
-  // generate a instance of the unbounded object sequence
-
-  virtual int gen_bounded_obj_sequence (be_sequence *node);
-  // generate a instance of the bounded object sequence
-
-  virtual int gen_bounded_str_sequence (be_sequence *node);
-  // generate a instance of the bounded string sequence
-
-  virtual int gen_bounded_wstr_sequence (be_sequence *node);
-  // generate a instance of the bounded wstring sequence
-
-  virtual int instantiate_sequence (be_sequence *node);
-  // determine which sequence to instantiate
-
-  virtual int gen_base_sequence_class (be_sequence *node);
-  // generate the base sequence class
+  int gen_varout_tmplinst (be_sequence *node,
+                           be_type *bt);
+  // Generate explicit template instantiations for our _var
+  // and _out classes.
+
+  void gen_managed_type_tmplinst (be_sequence *node,
+                                  be_type *bt);
+  // Generate explicit instantiation for our element type, if
+  // it is a managed type and if Any operator generation is suppressed.
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_ */
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index c136d88690e..69b5cc2a121 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -496,7 +496,7 @@ fe_populate_global_scope (AST_Module *m)
   UTL_ScopedName ValueBase_name (&ValueBase_id, 0);
   pdt =
     idl_global->gen ()->create_predefined_type (
-                            AST_PredefinedType::PT_pseudo,
+                            AST_PredefinedType::PT_value,
                             &ValueBase_name
                           );
   m->fe_add_predefined_type (pdt);
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
index 72b604b69f2..f4ae1f75d20 100644
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ b/TAO/TAO_IDL/include/ast_predefined_type.h
@@ -92,6 +92,7 @@ public:
       , PT_octet        // Predefined type "octet"
       , PT_any          // Predefined type "CORBA::Any"
       , PT_object       // Predefined type "CORBA::Object"
+      , PT_value        // Predefined type "CORBA::ValueBase"
       , PT_void         // Predefined type "void"
       , PT_pseudo       // Predefined type for pseudo objects
     };
diff --git a/TAO/tao/AbstractBase.cpp b/TAO/tao/AbstractBase.cpp
index 60b70882170..0fadc52bbe9 100644
--- a/TAO/tao/AbstractBase.cpp
+++ b/TAO/tao/AbstractBase.cpp
@@ -349,3 +349,15 @@ CORBA::AbstractBase::_tao_to_value (void)
 {
   return 0;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Var_T<CORBA::AbstractBase>;
+  template class TAO_Pseudo_Out_T<CORBA::AbstractBase, CORBA::AbstractBase_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::AbstractBase>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::AbstractBase, CORBA::AbstractBase_var>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/AbstractBase.h b/TAO/tao/AbstractBase.h
index 38dc37bdc24..d7551abafe7 100644
--- a/TAO/tao/AbstractBase.h
+++ b/TAO/tao/AbstractBase.h
@@ -21,6 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Pseudo_VarOut_T.h"
 #include "ace/CORBA_macros.h"
 
 class TAO_Stub;
@@ -28,6 +29,10 @@ class TAO_Abstract_ServantBase;
 
 namespace CORBA
 {
+  class AbstractBase;
+  typedef TAO_Pseudo_Var_T<AbstractBase> AbstractBase_var;
+  typedef TAO_Pseudo_Out_T<AbstractBase, AbstractBase_var> AbstractBase_out;
+
   /**
    * @class AbstractBase
    *
@@ -45,9 +50,9 @@ namespace CORBA
      * This constructor is only meant to be called by the
      * corresponding CDR stream extraction operator.
      */
-    AbstractBase (TAO_Stub *p,
+    AbstractBase (TAO_Stub * p,
                   CORBA::Boolean collocated,
-                  TAO_Abstract_ServantBase *servant);
+                  TAO_Abstract_ServantBase * servant);
 
     typedef CORBA::AbstractBase_ptr _ptr_type;
     typedef CORBA::AbstractBase_var _var_type;
@@ -57,8 +62,8 @@ namespace CORBA
     static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj
                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
     static CORBA::AbstractBase_ptr _unchecked_narrow (
-      CORBA::AbstractBase_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::AbstractBase_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj);
@@ -70,22 +75,22 @@ namespace CORBA
     CORBA::Object_ptr _to_object (void);
     CORBA::ValueBase *_to_value (void);
 
-    virtual CORBA::Boolean _is_a (const char *type_id
+    virtual CORBA::Boolean _is_a (const char * type_id
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-    virtual const char* _interface_repository_id (void) const;
-    virtual const char* _tao_obv_repository_id (void) const;
-    virtual void *_tao_obv_narrow (ptr_arith_t type_id);
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm);
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm);
+    virtual void * _tao_QueryInterface (ptr_arith_t type);
+    virtual const char * _interface_repository_id (void) const;
+    virtual const char * _tao_obv_repository_id (void) const;
+    virtual void * _tao_obv_narrow (ptr_arith_t type_id);
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR & strm);
+    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR & strm);
 
     virtual void _add_ref (void);
     virtual void _remove_ref (void);
 
     CORBA::Boolean _is_objref (void) const;
-    TAO_Stub *_stubobj (void) const;
+    TAO_Stub * _stubobj (void) const;
     CORBA::Boolean _is_collocated (void) const;
-    TAO_Abstract_ServantBase *_servant (void) const;
+    TAO_Abstract_ServantBase * _servant (void) const;
     CORBA::Boolean _is_local (void) const;
 
   protected:
@@ -103,78 +108,15 @@ namespace CORBA
 
     AbstractBase & operator= (const AbstractBase &);
 
-    virtual CORBA::ValueBase *_tao_to_value (void);
+    virtual CORBA::ValueBase * _tao_to_value (void);
 
   private:
 
-    TAO_Stub *concrete_stubobj_;
+    TAO_Stub * concrete_stubobj_;
     CORBA::Boolean is_collocated_;
-    TAO_Abstract_ServantBase *servant_;
+    TAO_Abstract_ServantBase * servant_;
     CORBA::Boolean is_local_;
   };
-
-  /**
-   * @class AbstractBase_var
-   *
-   * @brief _var class for AbstractBase
-   *
-   * _var class for AbstractBase
-   */
-  class TAO_Export AbstractBase_var
-  {
-  public:
-    AbstractBase_var (void);
-    AbstractBase_var (CORBA::AbstractBase_ptr);
-    AbstractBase_var (const AbstractBase_var &);
-    ~AbstractBase_var (void);
-
-    AbstractBase_var &operator= (CORBA::AbstractBase_ptr);
-    AbstractBase_var &operator= (const AbstractBase_var &);
-    CORBA::AbstractBase_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const CORBA::AbstractBase_ptr &() const;
-    operator CORBA::AbstractBase_ptr &();
-    CORBA::AbstractBase_ptr in (void) const;
-    CORBA::AbstractBase_ptr &inout (void);
-    CORBA::AbstractBase_ptr &out (void);
-    CORBA::AbstractBase_ptr _retn (void);
-    CORBA::AbstractBase_ptr ptr (void) const;
-
-    static CORBA::AbstractBase_ptr tao_duplicate (CORBA::AbstractBase_ptr);
-    static void tao_release (CORBA::AbstractBase_ptr);
-    static CORBA::AbstractBase_ptr tao_nil (void);
-    static CORBA::AbstractBase_ptr tao_narrow (CORBA::AbstractBase *
-                                               ACE_ENV_ARG_DECL_NOT_USED);
-    static CORBA::AbstractBase * tao_upcast (void *);
-
-  private:
-    CORBA::AbstractBase_ptr ptr_;
-  };
-
-  /**
-   * @class AbstractBase_out
-   *
-   * @brief _out class for AbstractBase
-   *
-   * _out class for AbstractBase
-   */
-  class TAO_Export AbstractBase_out
-  {
-  public:
-    AbstractBase_out (CORBA::AbstractBase_ptr &);
-    AbstractBase_out (AbstractBase_var &);
-    AbstractBase_out (const AbstractBase_out &);
-    AbstractBase_out &operator= (const AbstractBase_out &);
-    AbstractBase_out &operator= (const AbstractBase_var &);
-    AbstractBase_out &operator= (CORBA::AbstractBase_ptr);
-    operator CORBA::AbstractBase_ptr &();
-    CORBA::AbstractBase_ptr &ptr (void);
-    CORBA::AbstractBase_ptr operator-> (void);
-
-  private:
-    CORBA::AbstractBase_ptr &ptr_;
-  };
 }
 
 TAO_Export CORBA::Boolean
diff --git a/TAO/tao/AbstractBase.inl b/TAO/tao/AbstractBase.inl
index 801f2be69d3..4e09511ab49 100644
--- a/TAO/tao/AbstractBase.inl
+++ b/TAO/tao/AbstractBase.inl
@@ -114,203 +114,3 @@ CORBA::is_nil (CORBA::AbstractBase_ptr obj)
 {
   return (obj == 0);
 }
-
-// *************************************************************
-// Inline operations for class CORBA::AbstractBase_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::AbstractBase_var::AbstractBase_var (void)
-  : ptr_ (CORBA::AbstractBase::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::AbstractBase_var::AbstractBase_var (CORBA::AbstractBase_ptr p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA::AbstractBase_var::~AbstractBase_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AbstractBase_var::AbstractBase_var (const CORBA::AbstractBase_var &p)
-  : ptr_ (CORBA::AbstractBase::_duplicate (p.ptr ()))
-{
-}
-
-ACE_INLINE CORBA::AbstractBase_var &
-CORBA::AbstractBase_var::operator= (CORBA::AbstractBase_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::AbstractBase_var &
-CORBA::AbstractBase_var::operator= (const CORBA::AbstractBase_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = CORBA::AbstractBase::_duplicate (p.ptr ());
-    }
-
-  return *this;
-}
-
-ACE_INLINE
-CORBA::AbstractBase_var::operator const CORBA::AbstractBase_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AbstractBase_var::operator CORBA::AbstractBase_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr &
-CORBA::AbstractBase_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr &
-CORBA::AbstractBase_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::AbstractBase::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase_var::_retn (void)
-{
-  // Yield ownership of valuebase.
-  CORBA::AbstractBase_ptr val = this->ptr_;
-  this->ptr_ = CORBA::AbstractBase::_nil ();
-  return val;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase_var::tao_duplicate (CORBA::AbstractBase_ptr p)
-{
-  return CORBA::AbstractBase::_duplicate (p);
-}
-
-ACE_INLINE void
-CORBA::AbstractBase_var::tao_release (CORBA::AbstractBase_ptr p)
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase_var::tao_nil (void)
-{
-  return CORBA::AbstractBase::_nil ();
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase_var::tao_narrow (
-    CORBA::AbstractBase *p
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return CORBA::AbstractBase::_duplicate (p);
-}
-
-ACE_INLINE CORBA::AbstractBase *
-CORBA::AbstractBase_var::tao_upcast (void *src)
-{
-  CORBA::AbstractBase **tmp =
-    ACE_static_cast (CORBA::AbstractBase **, src);
-  return *tmp;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::AbstractBase_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::AbstractBase_out::AbstractBase_out (CORBA::AbstractBase_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::AbstractBase::_nil ();
-}
-
-ACE_INLINE
-CORBA::AbstractBase_out::AbstractBase_out (CORBA::AbstractBase_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::AbstractBase::_nil ();
-}
-
-ACE_INLINE
-CORBA::AbstractBase_out::AbstractBase_out (const CORBA::AbstractBase_out &p)
-  : ptr_ (p.ptr_)
-{
-}
-
-ACE_INLINE CORBA::AbstractBase_out &
-CORBA::AbstractBase_out::operator= (const CORBA::AbstractBase_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::AbstractBase_out &
-CORBA::AbstractBase_out::operator= (const CORBA::AbstractBase_var &p)
-{
-  this->ptr_ = CORBA::AbstractBase::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::AbstractBase_out &
-CORBA::AbstractBase_out::operator= (CORBA::AbstractBase_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::AbstractBase_out::operator CORBA::AbstractBase_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr &
-CORBA::AbstractBase_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index 460bddd65cb..e63e9efcc1b 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -1,10 +1,5 @@
 // $Id$
-
 #include "tao/Adapter.h"
-#include "tao/Object.h"
-#include "tao/Object_KeyC.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
 #include "ace/Dynamic_Service.h"
 #include "debug.h"
 
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index 1f362635613..93d7829f630 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -14,15 +14,14 @@
 #define TAO_ADAPTER_H
 #include "ace/pre.h"
 
-#include "tao/corbafwd.h"
-#include "tao/Exception.h"
-#include "tao/Object_KeyC.h"
-#include "ace/Service_Object.h"
+#include "tao/Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Object.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp
new file mode 100644
index 00000000000..b9058fedc07
--- /dev/null
+++ b/TAO/tao/Array_VarOut_T.cpp
@@ -0,0 +1,94 @@
+// $Id$
+
+#ifndef TAO_ARRAY_VAROUT_T_C
+#define TAO_ARRAY_VAROUT_T_C
+
+#include "tao/Array_VarOut_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Array_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (tao, 
+           Array_VarOut_T, 
+           "$Id$")
+
+template<typename T_slice, typename T_life>
+TAO_FixedArray_Var_T<T_slice,T_life> &
+TAO_FixedArray_Var_T<T_slice,T_life>::operator= (T_slice * p)
+{
+  // Is what we own the same that is being assigned to us?
+  if (this->ptr_ != p)
+    {
+      // Delete our stuff and assume ownership of p.
+      T_life::tao_free (this->ptr_);
+      this->ptr_ = p;
+    }
+  
+  return *this;
+}
+
+template<typename T_slice, typename T_life>
+TAO_FixedArray_Var_T<T_slice,T_life> &
+TAO_FixedArray_Var_T<T_slice,T_life>::operator= (
+    const TAO_FixedArray_Var_T<T_slice,T_life> & p
+  )
+{
+  if (this != &p)
+    {
+      T_life::tao_free (this->ptr_);
+      
+      // Deep copy.
+      this->ptr_ = T_life::tao_dup (p.in ());
+    }
+  
+  return *this;
+}
+
+// *************************************************************
+
+template<typename T_slice, typename T_life>
+TAO_VarArray_Var_T<T_slice,T_life> &
+TAO_VarArray_Var_T<T_slice,T_life>::operator= (T_slice * p)
+{
+  // Is what we own the same that is being assigned to us?
+  if (this->ptr_ != p)
+    {
+      // Delete our stuff and assume ownership of p.
+      T_life::tao_free (this->ptr_);
+      this->ptr_ = p;
+    }
+  
+  return *this;
+}
+
+template<typename T_slice, typename T_life>
+TAO_VarArray_Var_T<T_slice,T_life> &
+TAO_VarArray_Var_T<T_slice,T_life>::operator= (
+    const TAO_VarArray_Var_T<T_slice,T_life> & p
+  )
+{
+  if (this != &p)
+    {
+      T_life::tao_free (this->ptr_);
+      
+      // Deep copy.
+      this->ptr_ = T_life::tao_dup (p.in ());
+    }
+  
+  return *this;
+}
+
+// *************************************************************
+
+template<typename T_slice, typename T_life>
+void
+TAO_Array_Forany_T<T_slice,T_life>::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  T_slice * tmp = ACE_static_cast (T_slice *, _tao_void_pointer);
+  T_life::tao_free (tmp);
+}
+
+#endif /* TAO_ARRAY_VAROUT_T_C */
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
new file mode 100644
index 00000000000..8cc81092e72
--- /dev/null
+++ b/TAO/tao/Array_VarOut_T.h
@@ -0,0 +1,183 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Array_VarOut_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_ARRAY_VAROUT_T_H
+#define TAO_ARRAY_VAROUT_T_H
+
+#include "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Array_Var_Base_T
+ *
+ * @brief Parametrized implementation of _var base class for arrays.
+ *
+ */
+template<typename T_slice, typename T_life>
+class TAO_Array_Var_Base_T
+{
+public:
+  TAO_Array_Var_Base_T (void);
+  TAO_Array_Var_Base_T (T_slice *);
+  TAO_Array_Var_Base_T (const TAO_Array_Var_Base_T<T_slice,T_life> &);
+  ~TAO_Array_Var_Base_T (void);
+  
+  T_slice & operator[] (CORBA::ULong index);
+  const T_slice & operator[] (CORBA::ULong index) const;
+  operator T_slice * const & () const; 
+  
+  // in, inout, out, _retn 
+  const T_slice * in (void) const;
+  T_slice * inout (void);
+  T_slice *& out (void);
+  T_slice * _retn (void);
+  T_slice * ptr (void) const;
+
+protected:
+  T_slice * ptr_;
+};
+
+/**
+ * @class TAO_FixedArray_Var_T
+ *
+ * @brief Parametrized implementation of _var class for arrays with
+ * elements of fixed size.
+ *
+ */
+template<typename T_slice, typename T_life>
+class TAO_FixedArray_Var_T: public TAO_Array_Var_Base_T<T_slice,T_life>
+{
+public:
+  TAO_FixedArray_Var_T (void);
+  TAO_FixedArray_Var_T (T_slice *);
+  TAO_FixedArray_Var_T (const TAO_FixedArray_Var_T<T_slice,T_life> &);
+  
+  TAO_FixedArray_Var_T<T_slice,T_life> &operator= (T_slice *);
+  TAO_FixedArray_Var_T<T_slice,T_life> &operator= (
+      const TAO_FixedArray_Var_T<T_slice,T_life> &
+    );
+};
+
+/**
+ * @class TAO_FixedArray_Var_T
+ *
+ * @brief Parametrized implementation of _var class for arrays with
+ * elements of variable size.
+ *
+ */
+template<typename T_slice, typename T_life>
+class TAO_VarArray_Var_T : public TAO_Array_Var_Base_T<T_slice,T_life>
+{
+public:
+  TAO_VarArray_Var_T (void);
+  TAO_VarArray_Var_T (T_slice *);
+  TAO_VarArray_Var_T (const TAO_VarArray_Var_T<T_slice,T_life> &);
+  
+  TAO_VarArray_Var_T<T_slice,T_life> &operator= (T_slice *);
+  TAO_VarArray_Var_T<T_slice,T_life> &operator= (
+      const TAO_VarArray_Var_T<T_slice,T_life> &
+    );
+  
+  operator T_slice *& ();
+};
+
+/**
+ * @class TAO_Array_Out_T
+ *
+ * @brief Parametrized implementation of _out class for arrays.
+ *
+ */
+template<typename T_var, typename T_slice, typename T_life>
+class TAO_Array_Out_T
+{
+public:
+  TAO_Array_Out_T (T_slice *&);
+  TAO_Array_Out_T (T_var &);
+  TAO_Array_Out_T (const TAO_Array_Out_T<T_var,T_slice,T_life> &);
+  
+  TAO_Array_Out_T<T_var,T_slice,T_life> &operator= (
+      const TAO_Array_Out_T<T_var,T_slice,T_life> &
+    );
+  TAO_Array_Out_T<T_var,T_slice,T_life> &operator= (T_slice *);
+  
+  operator T_slice *& ();
+  T_slice *& ptr (void);
+  
+  T_slice & operator[] (CORBA::ULong index);
+  const T_slice & operator[] (CORBA::ULong index) const;
+private:
+  typedef TAO_Array_Out_T<T_var,T_slice,T_life> THIS_OUT_TYPE;
+  T_slice *& ptr_;
+  // Assignment from T_var not allowed.
+  void operator= (const T_var &);
+};
+
+/**
+ * @class TAO_Array_Forany_T
+ *
+ * @brief Parametrized implementation of _forany class for arrays.
+ *
+ */
+template<typename T_slice, typename T_life>
+class TAO_Array_Forany_T
+{
+public:
+  TAO_Array_Forany_T (void);
+  TAO_Array_Forany_T (T_slice *,
+                      CORBA::Boolean nocopy = 0);
+  TAO_Array_Forany_T (const TAO_Array_Forany_T<T_slice,T_life> &);
+  ~TAO_Array_Forany_T (void);
+  
+  static void _tao_any_destructor (void *);
+  
+  TAO_Array_Forany_T & operator= (T_slice *);
+  TAO_Array_Forany_T & operator= (const TAO_Array_Forany_T<T_slice,T_life> &);
+  
+  T_slice & operator[] (CORBA::ULong index);
+  const T_slice & operator[] (CORBA::ULong index) const;
+  
+  operator T_slice * const & () const;
+  operator T_slice *& ();
+  
+  // in, inout, out, _retn 
+  const T_slice * in (void) const;
+  T_slice * inout (void);
+  T_slice * &out (void);
+  T_slice * _retn (void);
+  T_slice * ptr (void) const;
+  CORBA::Boolean nocopy (void) const;
+
+  static T_slice * tao_alloc (void);
+private:
+  T_slice * ptr_;
+  CORBA::Boolean nocopy_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "tao/Array_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Array_VarOut_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Array_VarOut_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_ARRAY_VAROUT_T_H */
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
new file mode 100644
index 00000000000..8822fbe0543
--- /dev/null
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -0,0 +1,375 @@
+//$Id$
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Var_Base_T<T_slice,T_life>::TAO_Array_Var_Base_T (void)
+  : ptr_ (0)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Var_Base_T<T_slice,T_life>::TAO_Array_Var_Base_T (T_slice * p)
+  : ptr_ (p)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Var_Base_T<T_slice,T_life>::TAO_Array_Var_Base_T (
+    const TAO_Array_Var_Base_T & p
+  )
+{
+  this->ptr_ = T_life::tao_dup (p.in ());
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Var_Base_T<T_slice,T_life>::~TAO_Array_Var_Base_T (void)
+{
+  T_life::tao_free (this->ptr_);
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Var_Base_T<T_slice,T_life>::operator T_slice * const & () const
+{
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+const T_slice &
+TAO_Array_Var_Base_T<T_slice,T_life>::operator[] (CORBA::ULong index) const
+{
+#if defined (ACE_HAS_BROKEN_IMPLICIT_CONST_CAST)
+  return ACE_const_cast (
+      const T_slice &,
+      this->ptr_[index]
+    );
+#else
+  const T_slice & tmp = this->ptr_[index];
+  return tmp;
+#endif /* ACE_HAS_BROKEN_IMPLICIT_CONST_CAST */
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice &
+TAO_Array_Var_Base_T<T_slice,T_life>::operator[] (CORBA::ULong index)
+{
+  return this->ptr_[index];
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+const T_slice *
+TAO_Array_Var_Base_T<T_slice,T_life>::in (void) const
+{
+  // @@@ (JP) This looks scary I know but it helps MSVC understand
+  // things better when the array is multi-dimensional.
+  return ACE_const_cast (const T_slice *,
+                         this->ptr_);
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *
+TAO_Array_Var_Base_T<T_slice,T_life>::inout (void)
+{
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *&
+TAO_Array_Var_Base_T<T_slice,T_life>::out (void)
+{
+  T_life::tao_free (this->ptr_);
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *
+TAO_Array_Var_Base_T<T_slice,T_life>::_retn (void)
+{
+  T_slice * tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *
+TAO_Array_Var_Base_T<T_slice,T_life>::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// *************************************************************
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_FixedArray_Var_T<T_slice,T_life>::TAO_FixedArray_Var_T (void)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_FixedArray_Var_T<T_slice,T_life>::TAO_FixedArray_Var_T (T_slice * p)
+  : TAO_Array_Var_Base_T<T_slice,T_life> (p)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_FixedArray_Var_T<T_slice,T_life>::TAO_FixedArray_Var_T (
+    const TAO_FixedArray_Var_T & p
+  )
+  : TAO_Array_Var_Base_T<T_slice,T_life> (p)
+{}
+
+// *************************************************************
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_VarArray_Var_T<T_slice,T_life>::TAO_VarArray_Var_T (void)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_VarArray_Var_T<T_slice,T_life>::TAO_VarArray_Var_T (T_slice * p)
+  : TAO_Array_Var_Base_T<T_slice,T_life> (p)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_VarArray_Var_T<T_slice,T_life>::TAO_VarArray_Var_T (
+    const TAO_VarArray_Var_T & p
+  )
+  : TAO_Array_Var_Base_T<T_slice,T_life> (p)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_VarArray_Var_T<T_slice,T_life>::operator T_slice *& ()
+{
+  return this->ptr_;
+}
+
+// *************************************************************
+
+template<typename T_var, typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Out_T<T_var,T_slice,T_life>::TAO_Array_Out_T (T_slice *& p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+template<typename T_var, typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Out_T<T_var,T_slice,T_life>::TAO_Array_Out_T (T_var & p)
+  : ptr_ (p.out ())
+{
+  T_life::tao_free (this->ptr_);
+  this->ptr_ = 0;
+}
+
+template<typename T_var, typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Out_T<T_var,T_slice,T_life>::TAO_Array_Out_T (
+    const TAO_Array_Out_T<T_var,T_slice,T_life> & p
+  )
+  : ptr_ (ACE_const_cast (THIS_OUT_TYPE &, p).ptr_)
+{}
+
+template<typename T_var, typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Out_T<T_var,T_slice,T_life> &
+TAO_Array_Out_T<T_var,T_slice,T_life>::operator= (
+    const TAO_Array_Out_T<T_var,T_slice,T_life> & p
+  )
+{
+  this->ptr_ = ACE_const_cast (THIS_OUT_TYPE &, p).ptr_;
+  return *this;
+}
+
+template<typename T_var, typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Out_T<T_var,T_slice,T_life> &
+TAO_Array_Out_T<T_var,T_slice,T_life>::operator= (T_slice *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template<typename T_var, typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Out_T<T_var,T_slice,T_life>::operator T_slice *& ()
+{
+  return this->ptr_;
+}
+
+template<typename T_var, typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *&
+TAO_Array_Out_T<T_var,T_slice,T_life>::ptr (void)
+{
+  return this->ptr_;
+}
+
+template<typename T_var, typename T_slice, typename T_life>
+ACE_INLINE
+T_slice &
+TAO_Array_Out_T<T_var,T_slice,T_life>::operator[] (CORBA::ULong index)
+{
+  return this->ptr_[index];
+}
+
+// *************************************************************
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Forany_T<T_slice,T_life>::TAO_Array_Forany_T (void)
+  : ptr_ (0),
+    nocopy_ (0)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Forany_T<T_slice,T_life>::TAO_Array_Forany_T (
+    T_slice * p,
+    CORBA::Boolean nocopy
+  )
+  : ptr_ (p),
+    nocopy_ (nocopy)
+{}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Forany_T<T_slice,T_life>::TAO_Array_Forany_T (
+    const TAO_Array_Forany_T<T_slice,T_life> & p
+  )
+{
+  this->ptr_ = p.ptr_;
+  this->nocopy_ = p.nocopy_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Forany_T<T_slice,T_life>::~TAO_Array_Forany_T (void)
+{
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Forany_T<T_slice,T_life> &
+TAO_Array_Forany_T<T_slice,T_life>::operator= (T_slice * p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Forany_T<T_slice,T_life> &
+TAO_Array_Forany_T<T_slice,T_life>::operator= (
+    const TAO_Array_Forany_T<T_slice,T_life> & p
+  )
+{
+  this->ptr_ = p.ptr_;
+  this->nocopy_ = p.nocopy_;
+  return *this;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Forany_T<T_slice,T_life>::operator T_slice * const & () const
+{
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+TAO_Array_Forany_T<T_slice,T_life>::operator T_slice *& ()
+{
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+const T_slice &
+TAO_Array_Forany_T<T_slice,T_life>::operator[] (CORBA::ULong index) const
+{
+  return ACE_const_cast (
+      const T_slice &,
+      this->ptr_[index]
+    );
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice &
+TAO_Array_Forany_T<T_slice,T_life>::operator[] (CORBA::ULong index)
+{
+  return this->ptr_[index];
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+const T_slice *
+TAO_Array_Forany_T<T_slice,T_life>::in (void) const
+{
+  // @@@ (JP) This looks scary I know but it helps MSVC understand
+  // things better when the array is multi-dimensional.
+  return ACE_const_cast (const T_slice *,
+                         this->ptr_);
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *
+TAO_Array_Forany_T<T_slice,T_life>::inout (void)
+{
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *&
+TAO_Array_Forany_T<T_slice,T_life>::out (void)
+{
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *
+TAO_Array_Forany_T<T_slice,T_life>::_retn (void)
+{
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *
+TAO_Array_Forany_T<T_slice,T_life>::ptr (void) const
+{
+  return this->ptr_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+CORBA::Boolean
+TAO_Array_Forany_T<T_slice,T_life>::nocopy (void) const
+{
+  return this->nocopy_;
+}
+
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *
+TAO_Array_Forany_T<T_slice,T_life>::tao_alloc (void)
+{
+  return T_life::tao_alloc ();
+}
+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index 72a6e214dfa..443f8b2bbfe 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -27,7 +27,7 @@
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
@@ -90,7 +90,7 @@ TAO_NAMESPACE_END
 int BiDirPolicy::BidirectionalPolicy::_tao_class_id = 0;
 
 BiDirPolicy::BidirectionalPolicy_ptr
-tao_BiDirPolicy_BidirectionalPolicy_duplicate (
+BiDirPolicy::tao_BidirectionalPolicy_life::tao_duplicate (
     BiDirPolicy::BidirectionalPolicy_ptr p
   )
 {
@@ -98,7 +98,7 @@ tao_BiDirPolicy_BidirectionalPolicy_duplicate (
 }
 
 void
-tao_BiDirPolicy_BidirectionalPolicy_release (
+BiDirPolicy::tao_BidirectionalPolicy_life::tao_release (
     BiDirPolicy::BidirectionalPolicy_ptr p
   )
 {
@@ -106,231 +106,67 @@ tao_BiDirPolicy_BidirectionalPolicy_release (
 }
 
 BiDirPolicy::BidirectionalPolicy_ptr
-tao_BiDirPolicy_BidirectionalPolicy_nil (
+BiDirPolicy::tao_BidirectionalPolicy_life::tao_nil (
     void
   )
 {
   return BiDirPolicy::BidirectionalPolicy::_nil ();
 }
 
-BiDirPolicy::BidirectionalPolicy_ptr
-tao_BiDirPolicy_BidirectionalPolicy_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_BiDirPolicy_BidirectionalPolicy_upcast (
-    void *src
-  )
-{
-  BiDirPolicy::BidirectionalPolicy **tmp =
-    ACE_static_cast (BiDirPolicy::BidirectionalPolicy **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_BiDirPolicy_BidirectionalPolicy_marshal (
+BiDirPolicy::tao_BidirectionalPolicy_life::tao_marshal (
     BiDirPolicy::BidirectionalPolicy_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// BiDirPolicy::BidirectionalPolicy_var
-// *************************************************************
-
-BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (void)
-  : ptr_ (BidirectionalPolicy::_nil ())
-{}
-
-::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (const ::BiDirPolicy::BidirectionalPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (BidirectionalPolicy::_duplicate (p.ptr ()))
-{}
-
-BiDirPolicy::BidirectionalPolicy_var::~BidirectionalPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-BiDirPolicy::BidirectionalPolicy_var &
-BiDirPolicy::BidirectionalPolicy_var::operator= (BidirectionalPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-BiDirPolicy::BidirectionalPolicy_var &
-BiDirPolicy::BidirectionalPolicy_var::operator= (const ::BiDirPolicy::BidirectionalPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-BiDirPolicy::BidirectionalPolicy_var::operator const ::BiDirPolicy::BidirectionalPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-BiDirPolicy::BidirectionalPolicy_var::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr &
-BiDirPolicy::BidirectionalPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr &
-BiDirPolicy::BidirectionalPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
-  return this->ptr_;
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::BiDirPolicy::BidirectionalPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
-  return val;
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::tao_duplicate (BidirectionalPolicy_ptr p)
-{
-  return ::BiDirPolicy::BidirectionalPolicy::_duplicate (p);
-}
-
-void
-BiDirPolicy::BidirectionalPolicy_var::tao_release (BidirectionalPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::tao_nil (void)
-{
-  return ::BiDirPolicy::BidirectionalPolicy::_nil ();
+  return p->marshal (cdr);
 }
 
-::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::tao_narrow (
+BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::tao_BidirectionalPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-BiDirPolicy::BidirectionalPolicy_var::tao_upcast (void *src)
+BiDirPolicy::tao_BidirectionalPolicy_cast::tao_upcast (
+    void *src
+  )
 {
-  BidirectionalPolicy **tmp =
-    ACE_static_cast (BidirectionalPolicy **, src);
+  BiDirPolicy::BidirectionalPolicy **tmp =
+    ACE_static_cast (BiDirPolicy::BidirectionalPolicy **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// BiDirPolicy::BidirectionalPolicy_out
-// *************************************************************
-
-BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
-}
-
-BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
-}
-
-BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (const ::BiDirPolicy::BidirectionalPolicy_out &p)
-  : ptr_ (ACE_const_cast (BidirectionalPolicy_out &, p).ptr_)
-{}
-
-::BiDirPolicy::BidirectionalPolicy_out &
-BiDirPolicy::BidirectionalPolicy_out::operator= (const ::BiDirPolicy::BidirectionalPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (BidirectionalPolicy_out&, p).ptr_;
-  return *this;
-}
-
-BiDirPolicy::BidirectionalPolicy_out &
-BiDirPolicy::BidirectionalPolicy_out::operator= (const ::BiDirPolicy::BidirectionalPolicy_var &p)
-{
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-BiDirPolicy::BidirectionalPolicy_out &
-BiDirPolicy::BidirectionalPolicy_out::operator= (BidirectionalPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-BiDirPolicy::BidirectionalPolicy_out::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr &
-BiDirPolicy::BidirectionalPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        BiDirPolicy::BidirectionalPolicy,
+        BiDirPolicy::tao_BidirectionalPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        BiDirPolicy::BidirectionalPolicy,
+        BiDirPolicy::tao_BidirectionalPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        BiDirPolicy::BidirectionalPolicy, \
+        BiDirPolicy::tao_BidirectionalPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        BiDirPolicy::BidirectionalPolicy, \
+        BiDirPolicy::tao_BidirectionalPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 BiDirPolicy::BidirectionalPolicy::BidirectionalPolicy (void)
 {}
@@ -431,3 +267,53 @@ const char* BiDirPolicy::BidirectionalPolicy::_interface_repository_id (void) co
   return "IDL:omg.org/BiDirPolicy/BidirectionalPolicy:1.0";
 }
 
+CORBA::Boolean
+BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_BiDirPolicy_BidirectionalPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x42694469), 
+  ACE_NTOHL (0x72506f6c), 
+  ACE_NTOHL (0x6963792f), 
+  ACE_NTOHL (0x42696469), 
+  ACE_NTOHL (0x72656374), 
+  ACE_NTOHL (0x696f6e61), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/BiDirPolicy/BidirectionalPolicy:1.0
+    20,
+  ACE_NTOHL (0x42696469), 
+  ACE_NTOHL (0x72656374), 
+  ACE_NTOHL (0x696f6e61), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x69637900),  // name = BidirectionalPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_BiDirPolicy_BidirectionalPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_BiDirPolicy_BidirectionalPolicy),
+    (char *) &_oc_BiDirPolicy_BidirectionalPolicy,
+    0,
+    sizeof (BiDirPolicy::BidirectionalPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (BiDirPolicy)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_BidirectionalPolicy,
+    &_tc_TAO_tc_BiDirPolicy_BidirectionalPolicy
+  )
+TAO_NAMESPACE_END
+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index a7dfa71ee9c..18d412c58f7 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -68,7 +68,7 @@ TAO_NAMESPACE  BiDirPolicy
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::UShort BidirectionalPolicyValue;
   typedef CORBA::UShort_out BidirectionalPolicyValue_out;
@@ -81,103 +81,66 @@ TAO_NAMESPACE  BiDirPolicy
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::UShort NORMAL = 0U;
+  const BiDirPolicy::BidirectionalPolicyValue NORMAL = 0U;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::UShort BOTH = 1U;
+  const BiDirPolicy::BidirectionalPolicyValue BOTH = 1U;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong BIDIRECTIONAL_POLICY_TYPE = 37U;
+  const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___PTR_CH_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___PTR_CH_
+#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__ODDS_N_ENDS_CH_)
+#define _BIDIRPOLICY_BIDIRECTIONALPOLICY__ODDS_N_ENDS_CH_
   
   class BidirectionalPolicy;
   typedef BidirectionalPolicy *BidirectionalPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CH_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_BiDirGIOP_Export BidirectionalPolicy_var : public TAO_Base_var
+  struct tao_BidirectionalPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        BidirectionalPolicy,
+        tao_BidirectionalPolicy_life
+      >
+    BidirectionalPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        BidirectionalPolicy,
+        tao_BidirectionalPolicy_life
+      >
+    BidirectionalPolicy_out;
+  
+  struct TAO_BiDirGIOP_Export tao_BidirectionalPolicy_life
   {
-  public:
-    BidirectionalPolicy_var (void); // default constructor
-    BidirectionalPolicy_var (BidirectionalPolicy_ptr p) : ptr_ (p) {} 
-    BidirectionalPolicy_var (const BidirectionalPolicy_var &); // copy constructor
-    ~BidirectionalPolicy_var (void); // destructor
-    
-    BidirectionalPolicy_var &operator= (BidirectionalPolicy_ptr);
-    BidirectionalPolicy_var &operator= (const BidirectionalPolicy_var &);
-    BidirectionalPolicy_ptr operator-> (void) const;
-    
-    operator const BidirectionalPolicy_ptr &() const;
-    operator BidirectionalPolicy_ptr &();
-    // in, inout, out, _retn 
-    BidirectionalPolicy_ptr in (void) const;
-    BidirectionalPolicy_ptr &inout (void);
-    BidirectionalPolicy_ptr &out (void);
-    BidirectionalPolicy_ptr _retn (void);
-    BidirectionalPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static BidirectionalPolicy_ptr tao_duplicate (BidirectionalPolicy_ptr);
     static void tao_release (BidirectionalPolicy_ptr);
     static BidirectionalPolicy_ptr tao_nil (void);
-    static BidirectionalPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        BidirectionalPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    BidirectionalPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    BidirectionalPolicy_var (const TAO_Base_var &rhs);
-    BidirectionalPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CH_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_BiDirGIOP_Export BidirectionalPolicy_out
+  struct TAO_BiDirGIOP_Export tao_BidirectionalPolicy_cast
   {
-  public:
-    BidirectionalPolicy_out (BidirectionalPolicy_ptr &);
-    BidirectionalPolicy_out (BidirectionalPolicy_var &);
-    BidirectionalPolicy_out (const BidirectionalPolicy_out &);
-    BidirectionalPolicy_out &operator= (const BidirectionalPolicy_out &);
-    BidirectionalPolicy_out &operator= (const BidirectionalPolicy_var &);
-    BidirectionalPolicy_out &operator= (BidirectionalPolicy_ptr);
-    operator BidirectionalPolicy_ptr &();
-    BidirectionalPolicy_ptr &ptr (void);
-    BidirectionalPolicy_ptr operator-> (void);
-  
-  private:
-    BidirectionalPolicy_ptr &ptr_;
+    static BidirectionalPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_
@@ -221,7 +184,7 @@ TAO_NAMESPACE  BiDirPolicy
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -231,7 +194,7 @@ TAO_NAMESPACE  BiDirPolicy
   protected:
     BidirectionalPolicy (void);
     virtual ~BidirectionalPolicy (void);
-    
+  
   private:
     BidirectionalPolicy (const BidirectionalPolicy &);
     void operator= (const BidirectionalPolicy &);
@@ -239,6 +202,10 @@ TAO_NAMESPACE  BiDirPolicy
 
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BidirectionalPolicy;
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
@@ -257,7 +224,7 @@ TAO_NAMESPACE_CLOSE // module BiDirPolicy
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "BiDirPolicyC.i"
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
index dd83689b345..2e97c7281c6 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
@@ -26,12 +26,5 @@
 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_)
 #define _BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index c353e9d5f13..dd6c13bc7f7 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -23,7 +23,7 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
-#include "tao/CONV_FRAMEC.h"
+#include "CONV_FRAMEC.h"
 #include "tao/Any_T.h"
 
 #if defined (__BORLANDC__)
@@ -161,7 +161,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -170,84 +170,16 @@ void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
-
-void
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ULong* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old =
-        ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ULong *tmp =
-    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (void)
 {}
 
 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CONV_FRAME::CodeSetId
+      >
+    (max)
 {}
 
 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (
@@ -256,30 +188,20 @@ CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (
     CORBA::ULong *buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CONV_FRAME::CodeSetId
+      >
+    (max, length, buffer, release)
 {}
 
 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CONV_FRAME::CodeSetId
+      >
+    (seq)
 {}
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void) // dtor
+CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void)
 {}
 
 void CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_any_destructor (void *_tao_void_pointer)
@@ -288,7 +210,36 @@ void CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_any_destructor (void
   delete tmp;
 }
 
-#endif /* end #if !defined */
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      CodeSetComponent
+    >;
+
+template class
+  TAO_Out_T<
+      CodeSetComponent,
+      CodeSetComponent_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      CodeSetComponent \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      CodeSetComponent, \
+      CodeSetComponent_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -411,7 +362,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -420,6 +371,37 @@ void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_poin
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      CodeSetComponentInfo
+    >;
+
+template class
+  TAO_Out_T<
+      CodeSetComponentInfo,
+      CodeSetComponentInfo_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      CodeSetComponentInfo \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      CodeSetComponentInfo, \
+      CodeSetComponentInfo_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
@@ -494,7 +476,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CONV_FRAME::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -502,6 +484,25 @@ void CONV_FRAME::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      CodeSetContext
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      CodeSetContext \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -698,7 +699,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_
 #define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 345c281055d..c15536557f6 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -28,6 +28,7 @@
 #include "ace/pre.h"
 #include "tao/CDR.h"
 #include "tao/Sequence.h"
+#include "tao/VarOut_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -64,7 +65,7 @@ TAO_NAMESPACE  CONV_FRAME
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::ULong CodeSetId;
   typedef CORBA::ULong_out CodeSetId_out;
@@ -75,9 +76,25 @@ TAO_NAMESPACE  CONV_FRAME
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class CodeSetComponent_var;
+  struct CodeSetComponent;
+  
+  typedef
+    TAO_Var_Var_T<
+        CodeSetComponent
+      >
+    CodeSetComponent_var;
+  
+  typedef
+    TAO_Out_T<
+        CodeSetComponent,
+        CodeSetComponent_var
+      >
+    CodeSetComponent_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export CodeSetComponent
   {
@@ -87,101 +104,31 @@ TAO_NAMESPACE  CONV_FRAME
     CONV_FRAME::CodeSetId native_code_set;
     
     
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-    
-    class TAO_Export _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void);
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
-          const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
-        );
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &operator= (
-          const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void);
-      
-      // = Accessors.
-      CORBA::ULong &operator[] (CORBA::ULong i);
-      const CORBA::ULong &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static CORBA::ULong *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA::ULong *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::ULong *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release
-        );
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
     
-    class _tao_seq_CodeSetId;
-    
-    // *************************************************************
-    // CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId
-    // *************************************************************
-    
-    class TAO_Export _tao_seq_CodeSetId : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    class TAO_Export _tao_seq_CodeSetId
+      : public
+          TAO_Unbounded_Sequence<
+              CONV_FRAME::CodeSetId
+            >
     {
     public:
       _tao_seq_CodeSetId (void);
       _tao_seq_CodeSetId (CORBA::ULong max);
       _tao_seq_CodeSetId (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
+          CORBA::ULong max,
+          CORBA::ULong length,
           CORBA::ULong *buffer, 
           CORBA::Boolean release = 0
         );
       _tao_seq_CodeSetId (const _tao_seq_CodeSetId &);
       ~_tao_seq_CodeSetId (void);
       
-      static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void *);
       
       
     };
-
-#endif /* end #if !defined */
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
@@ -191,69 +138,30 @@ TAO_NAMESPACE  CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export CodeSetComponent_var
-  {
-  public:
-    CodeSetComponent_var (void);
-    CodeSetComponent_var (CodeSetComponent *);
-    CodeSetComponent_var (const CodeSetComponent_var &);
-    ~CodeSetComponent_var (void);
-    
-    CodeSetComponent_var &operator= (CodeSetComponent *);
-    CodeSetComponent_var &operator= (const CodeSetComponent_var &);
-    CodeSetComponent *operator-> (void);
-    const CodeSetComponent *operator-> (void) const;
-    
-    operator const CodeSetComponent &() const;
-    operator CodeSetComponent &();
-    operator CodeSetComponent &() const;
-    
-    // Variable-size types only.
-    operator CodeSetComponent *&();
-    
-    // in, inout, out, _retn 
-    const CodeSetComponent &in (void) const;
-    CodeSetComponent &inout (void);
-    CodeSetComponent *&out (void);
-    CodeSetComponent *_retn (void);
-    CodeSetComponent *ptr (void) const;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  private:
-    CodeSetComponent *ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class TAO_Export CodeSetComponent_out
-  {
-  public:
-    CodeSetComponent_out (CodeSetComponent *&);
-    CodeSetComponent_out (CodeSetComponent_var &);
-    CodeSetComponent_out (const CodeSetComponent_out &);
-    CodeSetComponent_out &operator= (const CodeSetComponent_out &);
-    CodeSetComponent_out &operator= (CodeSetComponent *);
-    operator CodeSetComponent *&();
-    CodeSetComponent *&ptr (void);
-    CodeSetComponent *operator-> (void);
-    
-  private:
-    CodeSetComponent *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const CodeSetComponent_var &);
-  };
+  struct CodeSetComponentInfo;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  typedef
+    TAO_Var_Var_T<
+        CodeSetComponentInfo
+      >
+    CodeSetComponentInfo_var;
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
+  typedef
+    TAO_Out_T<
+        CodeSetComponentInfo,
+        CodeSetComponentInfo_var
+      >
+    CodeSetComponentInfo_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class CodeSetComponentInfo_var;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export CodeSetComponentInfo
   {
@@ -265,69 +173,27 @@ TAO_NAMESPACE  CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export CodeSetComponentInfo_var
-  {
-  public:
-    CodeSetComponentInfo_var (void);
-    CodeSetComponentInfo_var (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var (const CodeSetComponentInfo_var &);
-    ~CodeSetComponentInfo_var (void);
-    
-    CodeSetComponentInfo_var &operator= (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var &operator= (const CodeSetComponentInfo_var &);
-    CodeSetComponentInfo *operator-> (void);
-    const CodeSetComponentInfo *operator-> (void) const;
-    
-    operator const CodeSetComponentInfo &() const;
-    operator CodeSetComponentInfo &();
-    operator CodeSetComponentInfo &() const;
-    
-    // Variable-size types only.
-    operator CodeSetComponentInfo *&();
-    
-    // in, inout, out, _retn 
-    const CodeSetComponentInfo &in (void) const;
-    CodeSetComponentInfo &inout (void);
-    CodeSetComponentInfo *&out (void);
-    CodeSetComponentInfo *_retn (void);
-    CodeSetComponentInfo *ptr (void) const;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  private:
-    CodeSetComponentInfo *ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class TAO_Export CodeSetComponentInfo_out
-  {
-  public:
-    CodeSetComponentInfo_out (CodeSetComponentInfo *&);
-    CodeSetComponentInfo_out (CodeSetComponentInfo_var &);
-    CodeSetComponentInfo_out (const CodeSetComponentInfo_out &);
-    CodeSetComponentInfo_out &operator= (const CodeSetComponentInfo_out &);
-    CodeSetComponentInfo_out &operator= (CodeSetComponentInfo *);
-    operator CodeSetComponentInfo *&();
-    CodeSetComponentInfo *&ptr (void);
-    CodeSetComponentInfo *operator-> (void);
-    
-  private:
-    CodeSetComponentInfo *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const CodeSetComponentInfo_var &);
-  };
+  struct CodeSetContext;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  typedef
+    TAO_Fixed_Var_T<
+        CodeSetContext
+      >
+    CodeSetContext_var;
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
+  typedef
+    CodeSetContext &
+    CodeSetContext_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class CodeSetContext_var;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export CodeSetContext
   {
@@ -339,48 +205,6 @@ TAO_NAMESPACE  CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export CodeSetContext_var
-  {
-  public:
-    CodeSetContext_var (void);
-    CodeSetContext_var (CodeSetContext *);
-    CodeSetContext_var (const CodeSetContext_var &);
-    // Fixed-size types only.
-    CodeSetContext_var (const CodeSetContext &);
-    ~CodeSetContext_var (void);
-    
-    CodeSetContext_var &operator= (CodeSetContext *);
-    CodeSetContext_var &operator= (const CodeSetContext_var &);
-    
-    // Fixed-size types only.
-    CodeSetContext_var &operator= (const CodeSetContext &);
-    
-    CodeSetContext *operator-> (void);
-    const CodeSetContext *operator-> (void) const;
-    
-    operator const CodeSetContext &() const;
-    operator CodeSetContext &();
-    operator CodeSetContext &() const;
-    
-    // in, inout, out, _retn 
-    const CodeSetContext &in (void) const;
-    CodeSetContext &inout (void);
-    CodeSetContext &out (void);
-    CodeSetContext _retn (void);
-    CodeSetContext *ptr (void) const;
-  
-  private:
-    CodeSetContext *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
-  
-  typedef CodeSetContext &CodeSetContext_out;
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext;
@@ -461,7 +285,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "CONV_FRAMEC.i"
diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
index bb3d8ef82c6..1414e6641dc 100644
--- a/TAO/tao/CONV_FRAMEC.i
+++ b/TAO/tao/CONV_FRAMEC.i
@@ -21,804 +21,6 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (CodeSetComponent *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (const ::CONV_FRAME::CodeSetComponent_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetComponent (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::~CodeSetComponent_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (CodeSetComponent *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (const ::CONV_FRAME::CodeSetComponent_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CodeSetComponent *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              CodeSetComponent (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              CodeSetComponent *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator const ::CONV_FRAME::CodeSetComponent &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator ::CONV_FRAME::CodeSetComponent *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetComponent &
-CONV_FRAME::CodeSetComponent_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent &
-CONV_FRAME::CodeSetComponent_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *&
-CONV_FRAME::CodeSetComponent_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::_retn (void)
-{
-  ::CONV_FRAME::CodeSetComponent *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (::CONV_FRAME::CodeSetComponent *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CodeSetComponent_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (const ::CONV_FRAME::CodeSetComponent_out &p)
-  : ptr_ (ACE_const_cast (CodeSetComponent_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (const ::CONV_FRAME::CodeSetComponent_out &p)
-{
-  this->ptr_ = ACE_const_cast (CodeSetComponent_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (CodeSetComponent *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CONV_FRAME::CodeSetComponent_out::operator ::CONV_FRAME::CodeSetComponent *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *&
-CONV_FRAME::CodeSetComponent_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
-
-ACE_INLINE
-CORBA::ULong *
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (CORBA::ULong size)
-{
-  CORBA::ULong *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (CORBA::ULong *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void)
-{
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (
-    const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ULong *tmp1 =
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->maximum_);
-      CORBA::ULong * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator= (
-    const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ULong *tmp =
-            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ULong *tmp1 =
-    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  CORBA::ULong * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ULong &
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong* tmp =
-    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ULong &
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong * const tmp =
-    ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ULong *
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ULong *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ULong *
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp =
-        ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponentInfo_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (CodeSetComponentInfo *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (const ::CONV_FRAME::CodeSetComponentInfo_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetComponentInfo (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::~CodeSetComponentInfo_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (CodeSetComponentInfo *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (const ::CONV_FRAME::CodeSetComponentInfo_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CodeSetComponentInfo *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              CodeSetComponentInfo (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              CodeSetComponentInfo *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator const ::CONV_FRAME::CodeSetComponentInfo &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator ::CONV_FRAME::CodeSetComponentInfo *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetComponentInfo &
-CONV_FRAME::CodeSetComponentInfo_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo &
-CONV_FRAME::CodeSetComponentInfo_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *&
-CONV_FRAME::CodeSetComponentInfo_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::_retn (void)
-{
-  ::CONV_FRAME::CodeSetComponentInfo *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponentInfo_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (::CONV_FRAME::CodeSetComponentInfo *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CodeSetComponentInfo_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (const ::CONV_FRAME::CodeSetComponentInfo_out &p)
-  : ptr_ (ACE_const_cast (CodeSetComponentInfo_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (const ::CONV_FRAME::CodeSetComponentInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (CodeSetComponentInfo_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (CodeSetComponentInfo *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CONV_FRAME::CodeSetComponentInfo_out::operator ::CONV_FRAME::CodeSetComponentInfo *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *&
-CONV_FRAME::CodeSetComponentInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetContext_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (CodeSetContext *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const ::CONV_FRAME::CodeSetContext_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetContext (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const ::CONV_FRAME::CodeSetContext &p)
-{
-  ACE_NEW (this->ptr_, ::CONV_FRAME::CodeSetContext (p));
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::~CodeSetContext_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (CodeSetContext *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (const ::CONV_FRAME::CodeSetContext_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CodeSetContext *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              CodeSetContext (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              CodeSetContext *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (const ::CONV_FRAME::CodeSetContext &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::CONV_FRAME::CodeSetContext (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator const ::CONV_FRAME::CodeSetContext &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator ::CONV_FRAME::CodeSetContext &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator ::CONV_FRAME::CodeSetContext &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetContext
-CONV_FRAME::CodeSetContext_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_
@@ -837,7 +39,7 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -878,7 +80,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -919,7 +121,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index c0ddece9d60..da493b83950 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 #include "ClientRequestInfo.h"
 #include "ClientRequestInfo_i.h"
 
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 452382618b5..4b4f1bf3c2c 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -40,7 +40,7 @@
 int CORBA::Current::_tao_class_id = 0;
 
 CORBA::Current_ptr
-tao_CORBA_Current_duplicate (
+CORBA::tao_Current_life::tao_duplicate (
     CORBA::Current_ptr p
   )
 {
@@ -48,7 +48,7 @@ tao_CORBA_Current_duplicate (
 }
 
 void
-tao_CORBA_Current_release (
+CORBA::tao_Current_life::tao_release (
     CORBA::Current_ptr p
   )
 {
@@ -56,15 +56,24 @@ tao_CORBA_Current_release (
 }
 
 CORBA::Current_ptr
-tao_CORBA_Current_nil (
+CORBA::tao_Current_life::tao_nil (
     void
   )
 {
   return CORBA::Current::_nil ();
 }
 
+CORBA::Boolean
+CORBA::tao_Current_life::tao_marshal (
+    CORBA::Current_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 CORBA::Current_ptr
-tao_CORBA_Current_narrow (
+CORBA::tao_Current_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -73,7 +82,7 @@ tao_CORBA_Current_narrow (
 }
 
 CORBA::Object *
-tao_CORBA_Current_upcast (
+CORBA::tao_Current_cast::tao_upcast (
     void *src
   )
 {
@@ -82,205 +91,32 @@ tao_CORBA_Current_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_CORBA_Current_marshal (
-    CORBA::Current_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::Current_var
-// *************************************************************
-
-CORBA::Current_var::Current_var (void)
-  : ptr_ (Current::_nil ())
-{}
-
-::CORBA::Current_ptr
-CORBA::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::Current_var::Current_var (const ::CORBA::Current_var &p)
-  : TAO_Base_var (),
-    ptr_ (Current::_duplicate (p.ptr ()))
-{}
-
-CORBA::Current_var::~Current_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::Current_var &
-CORBA::Current_var::operator= (Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Current_var &
-CORBA::Current_var::operator= (const ::CORBA::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::Current_var::operator const ::CORBA::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::Current_var::operator ::CORBA::Current_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr &
-CORBA::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr &
-CORBA::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Current::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::Current_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::Current::_nil ();
-  return val;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::tao_duplicate (Current_ptr p)
-{
-  return ::CORBA::Current::_duplicate (p);
-}
-
-void
-CORBA::Current_var::tao_release (Current_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::tao_nil (void)
-{
-  return ::CORBA::Current::_nil ();
-}
-
-::CORBA::Current_ptr
-CORBA::Current_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::CORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-CORBA::Current_var::tao_upcast (void *src)
-{
-  Current **tmp =
-    ACE_static_cast (Current **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::Current,
+        CORBA::tao_Current_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::Current,
+        CORBA::tao_Current_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::Current, \
+        CORBA::tao_Current_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::Current, \
+        CORBA::tao_Current_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::Current_out
-// *************************************************************
-
-CORBA::Current_out::Current_out (Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::Current::_nil ();
-}
-
-CORBA::Current_out::Current_out (Current_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Current::_nil ();
-}
-
-CORBA::Current_out::Current_out (const ::CORBA::Current_out &p)
-  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
-{}
-
-::CORBA::Current_out &
-CORBA::Current_out::operator= (const ::CORBA::Current_out &p)
-{
-  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::Current_out &
-CORBA::Current_out::operator= (const ::CORBA::Current_var &p)
-{
-  this->ptr_ = ::CORBA::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::Current_out &
-CORBA::Current_out::operator= (Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Current_out::operator ::CORBA::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr &
-CORBA::Current_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Current_ptr
-CORBA::Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::Current::Current (void)
 {}
@@ -288,7 +124,7 @@ CORBA::Current::Current (void)
 CORBA::Current::~Current (void)
 {}
 
-void 
+void
 CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
@@ -304,7 +140,7 @@ CORBA::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Current_ptr 
+CORBA::Current_ptr
 CORBA::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -314,7 +150,7 @@ CORBA::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           Current_ptr,
@@ -334,14 +170,14 @@ CORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *CORBA::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, Current)::_tao_class_id)
@@ -360,12 +196,12 @@ void *CORBA::Current::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -374,6 +210,12 @@ const char* CORBA::Current::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Current:1.0";
 }
 
+CORBA::Boolean
+CORBA::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -381,16 +223,16 @@ static const CORBA::Long _oc_CORBA_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4375), 
-  ACE_NTOHL (0x7272656e), 
-  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4375),
+  ACE_NTOHL (0x7272656e),
+  ACE_NTOHL (0x743a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
     8,
-  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x43757272),
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -464,4 +306,3 @@ operator>>= (
 # pragma instantiate TAO_Object_Manager<CORBA::Current, CORBA::Current_var>
 # pragma instantiate TAO::Any_Impl_T<CORBA::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 4bbb43a8f4a..07067055078 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -31,10 +31,8 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "tao/Any_T.h"
-#include "tao/corbafwd.h"
-#include "tao/varbase.h"
+
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -59,86 +57,43 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-namespace CORBA
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
 {
-#if !defined (_CORBA_CURRENT___PTR_CH_)
-#define _CORBA_CURRENT___PTR_CH_
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566
 
   class Current;
   typedef Current *Current_ptr;
+  struct tao_Current_life;
+  typedef TAO_Objref_Var_T<Current, tao_Current_life> Current_var;
+  typedef TAO_Objref_Out_T<Current, tao_Current_life> Current_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CURRENT___VAR_CH_)
-#define _CORBA_CURRENT___VAR_CH_
-
-  class TAO_Export Current_var : public TAO_Base_var
+  struct TAO_Export tao_Current_life
   {
-  public:
-    Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {}
-    Current_var (const Current_var &); // copy constructor
-    ~Current_var (void); // destructor
-
-    Current_var &operator= (Current_ptr);
-    Current_var &operator= (const Current_var &);
-    Current_ptr operator-> (void) const;
-
-    operator const Current_ptr &() const;
-    operator Current_ptr &();
-    // in, inout, out, _retn
-    Current_ptr in (void) const;
-    Current_ptr &inout (void);
-    Current_ptr &out (void);
-    Current_ptr _retn (void);
-    Current_ptr ptr (void) const;
-
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Current_ptr tao_duplicate (Current_ptr);
     static void tao_release (Current_ptr);
     static Current_ptr tao_nil (void);
-    static Current_ptr tao_narrow (
-                                         CORBA::Object *
-                                         ACE_ENV_ARG_DECL_NOT_USED
-                                         );
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-    Current_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Current_var (const TAO_Base_var &rhs);
-    Current_var &operator= (const TAO_Base_var &rhs);
+    static CORBA::Boolean tao_marshal (
+        Current_ptr,
+        TAO_OutputCDR &
+      );
   };
 
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CURRENT___OUT_CH_)
-#define _CORBA_CURRENT___OUT_CH_
-
-  class TAO_Export Current_out
+  struct TAO_Export tao_Current_cast
   {
-  public:
-    Current_out (Current_ptr &);
-    Current_out (Current_var &);
-    Current_out (const Current_out &);
-    Current_out &operator= (const Current_out &);
-    Current_out &operator= (const Current_var &);
-    Current_out &operator= (Current_ptr);
-    operator Current_ptr &();
-    Current_ptr &ptr (void);
-    Current_ptr operator-> (void);
-
-  private:
-    Current_ptr &ptr_;
+    static Current_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
-
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
@@ -170,10 +125,10 @@ namespace CORBA
       }
 
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
     virtual const char* _interface_repository_id (void) const;
@@ -188,9 +143,18 @@ namespace CORBA
     void operator= (const Current &);
   };
 
-
 #endif /* end #if !defined */
-}  // End namespace CORBA 
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
+}
+TAO_NAMESPACE_CLOSE // module CORBA
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
@@ -210,7 +174,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &)
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "CurrentC.i"
@@ -226,4 +190,3 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &)
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
index ddd83ee088e..1e2d655daae 100644
--- a/TAO/tao/CurrentC.i
+++ b/TAO/tao/CurrentC.i
@@ -26,13 +26,6 @@
 #if !defined (_CORBA_CURRENT___CI_)
 #define _CORBA_CURRENT___CI_
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::Current::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -59,6 +52,4 @@ TAO::Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
 {
   return 0;
 }
-
 #endif /* end #if !defined */
-
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index df1909d2c02..9b76c20d02f 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -51,7 +51,7 @@
 int CORBA::DomainManager::_tao_class_id = 0;
 
 CORBA::DomainManager_ptr
-tao_CORBA_DomainManager_duplicate (
+CORBA::tao_DomainManager_life::tao_duplicate (
     CORBA::DomainManager_ptr p
   )
 {
@@ -59,7 +59,7 @@ tao_CORBA_DomainManager_duplicate (
 }
 
 void
-tao_CORBA_DomainManager_release (
+CORBA::tao_DomainManager_life::tao_release (
     CORBA::DomainManager_ptr p
   )
 {
@@ -67,228 +67,64 @@ tao_CORBA_DomainManager_release (
 }
 
 CORBA::DomainManager_ptr
-tao_CORBA_DomainManager_nil (
+CORBA::tao_DomainManager_life::tao_nil (
     void
   )
 {
   return CORBA::DomainManager::_nil ();
 }
 
-CORBA::DomainManager_ptr
-tao_CORBA_DomainManager_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_DomainManager_upcast (
-    void *src
-  )
-{
-  CORBA::DomainManager **tmp =
-    ACE_static_cast (CORBA::DomainManager **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_DomainManager_marshal (
+CORBA::tao_DomainManager_life::tao_marshal (
     CORBA::DomainManager_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::DomainManager_var
-// *************************************************************
-
-CORBA::DomainManager_var::DomainManager_var (void)
-  : ptr_ (DomainManager::_nil ())
-{}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::DomainManager_var::DomainManager_var (const ::CORBA::DomainManager_var &p)
-  : TAO_Base_var (),
-    ptr_ (DomainManager::_duplicate (p.ptr ()))
-{}
-
-CORBA::DomainManager_var::~DomainManager_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::DomainManager_var &
-CORBA::DomainManager_var::operator= (DomainManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::DomainManager_var &
-CORBA::DomainManager_var::operator= (const ::CORBA::DomainManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::DomainManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::DomainManager_var::operator const ::CORBA::DomainManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::DomainManager_var::operator ::CORBA::DomainManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr &
-CORBA::DomainManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr &
-CORBA::DomainManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::DomainManager::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::DomainManager_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::DomainManager::_nil ();
-  return val;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::tao_duplicate (DomainManager_ptr p)
-{
-  return ::CORBA::DomainManager::_duplicate (p);
-}
-
-void
-CORBA::DomainManager_var::tao_release (DomainManager_ptr p)
-{
-  CORBA::release (p);
+  return p->marshal (cdr);
 }
 
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::tao_nil (void)
-{
-  return ::CORBA::DomainManager::_nil ();
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_var::tao_narrow (
+CORBA::DomainManager_ptr
+CORBA::tao_DomainManager_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::DomainManager_var::tao_upcast (void *src)
+CORBA::tao_DomainManager_cast::tao_upcast (
+    void *src
+  )
 {
-  DomainManager **tmp =
-    ACE_static_cast (DomainManager **, src);
+  CORBA::DomainManager **tmp =
+    ACE_static_cast (CORBA::DomainManager **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::DomainManager_out
-// *************************************************************
-
-CORBA::DomainManager_out::DomainManager_out (DomainManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::DomainManager::_nil ();
-}
-
-CORBA::DomainManager_out::DomainManager_out (DomainManager_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::DomainManager::_nil ();
-}
-
-CORBA::DomainManager_out::DomainManager_out (const ::CORBA::DomainManager_out &p)
-  : ptr_ (ACE_const_cast (DomainManager_out &, p).ptr_)
-{}
-
-::CORBA::DomainManager_out &
-CORBA::DomainManager_out::operator= (const ::CORBA::DomainManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (DomainManager_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::DomainManager_out &
-CORBA::DomainManager_out::operator= (const ::CORBA::DomainManager_var &p)
-{
-  this->ptr_ = ::CORBA::DomainManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::DomainManager_out &
-CORBA::DomainManager_out::operator= (DomainManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::DomainManager_out::operator ::CORBA::DomainManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr &
-CORBA::DomainManager_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::DomainManager_ptr
-CORBA::DomainManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::DomainManager,
+        CORBA::tao_DomainManager_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::DomainManager,
+        CORBA::tao_DomainManager_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::DomainManager, \
+        CORBA::tao_DomainManager_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::DomainManager, \
+        CORBA::tao_DomainManager_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -309,31 +145,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Policy_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
     void operator= (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
     const CORBA::PolicyType & policy_type_;
-    
+
     ::CORBA::Policy_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::PolicyType & policy_type
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       policy_type_ (policy_type)
@@ -347,15 +183,15 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= policy_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -367,11 +203,11 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -380,17 +216,17 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SIN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -400,7 +236,7 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Po
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_DomainManager_Proxy_Impl::_TAO_DomainManager_Proxy_Impl (void)
@@ -425,12 +261,12 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
 {
   CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_domain_policy",
@@ -438,22 +274,22 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri (
           &_tao_call,
@@ -462,14 +298,14 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -477,91 +313,95 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << policy_type)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << policy_type)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Policy_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Policy_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -571,63 +411,61 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -678,8 +516,8 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::DomainManager::DomainManager (int collocated)
 {
@@ -700,7 +538,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation (int collocated)
 CORBA::DomainManager::~DomainManager (void)
 {}
 
-void 
+void
 CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   DomainManager *tmp = ACE_static_cast (DomainManager *, _tao_void_pointer);
@@ -717,7 +555,7 @@ CORBA::DomainManager::_narrow (
     {
       return DomainManager::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -726,17 +564,17 @@ CORBA::DomainManager::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (DomainManager::_nil ());
-      
+
       if (is_a == 0)
         {
           return DomainManager::_nil ();
         }
     }
-  
+
   return DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::DomainManager_ptr 
+CORBA::DomainManager_ptr
 CORBA::DomainManager::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -746,18 +584,18 @@ CORBA::DomainManager::_unchecked_narrow (
     {
       return DomainManager::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       DomainManager_ptr default_proxy = DomainManager::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -775,7 +613,7 @@ CORBA::DomainManager::_unchecked_narrow (
               DomainManager::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -788,10 +626,10 @@ CORBA::DomainManager::_unchecked_narrow (
               DomainManager::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           DomainManager_ptr,
@@ -811,7 +649,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -836,7 +674,7 @@ CORBA::DomainManager::_is_a (
     }
   else
     {
-      return this->Object::_is_a (
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -846,7 +684,7 @@ CORBA::DomainManager::_is_a (
 void *CORBA::DomainManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, DomainManager)::_tao_class_id)
@@ -865,12 +703,12 @@ void *CORBA::DomainManager::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -879,6 +717,12 @@ const char* CORBA::DomainManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DomainManager:1.0";
 }
 
+CORBA::Boolean
+CORBA::DomainManager::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -890,10 +734,10 @@ const char* CORBA::DomainManager::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_DomainManager_Proxy_Impl &proxy = 
+  _TAO_DomainManager_Proxy_Impl &proxy =
     this->the_TAO_DomainManager_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.get_domain_policy (
       this,
       policy_type
@@ -908,19 +752,19 @@ static const CORBA::Long _oc_CORBA_DomainManager[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f446f), 
-  ACE_NTOHL (0x6d61696e), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f446f),
+  ACE_NTOHL (0x6d61696e),
+  ACE_NTOHL (0x4d616e61),
+  ACE_NTOHL (0x6765723a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
     14,
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e4d61), 
-  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e4d61),
+  ACE_NTOHL (0x6e616765),
   ACE_NTOHL (0x72000000),  // name = DomainManager
   };
 
@@ -947,7 +791,7 @@ TAO_NAMESPACE_END
 int CORBA::ConstructionPolicy::_tao_class_id = 0;
 
 CORBA::ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_duplicate (
+CORBA::tao_ConstructionPolicy_life::tao_duplicate (
     CORBA::ConstructionPolicy_ptr p
   )
 {
@@ -955,7 +799,7 @@ tao_CORBA_ConstructionPolicy_duplicate (
 }
 
 void
-tao_CORBA_ConstructionPolicy_release (
+CORBA::tao_ConstructionPolicy_life::tao_release (
     CORBA::ConstructionPolicy_ptr p
   )
 {
@@ -963,228 +807,64 @@ tao_CORBA_ConstructionPolicy_release (
 }
 
 CORBA::ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_nil (
+CORBA::tao_ConstructionPolicy_life::tao_nil (
     void
   )
 {
   return CORBA::ConstructionPolicy::_nil ();
 }
 
-CORBA::ConstructionPolicy_ptr
-tao_CORBA_ConstructionPolicy_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ConstructionPolicy_upcast (
-    void *src
-  )
-{
-  CORBA::ConstructionPolicy **tmp =
-    ACE_static_cast (CORBA::ConstructionPolicy **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ConstructionPolicy_marshal (
+CORBA::tao_ConstructionPolicy_life::tao_marshal (
     CORBA::ConstructionPolicy_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ConstructionPolicy_var
-// *************************************************************
-
-CORBA::ConstructionPolicy_var::ConstructionPolicy_var (void)
-  : ptr_ (ConstructionPolicy::_nil ())
-{}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ConstructionPolicy_var::ConstructionPolicy_var (const ::CORBA::ConstructionPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ConstructionPolicy::_duplicate (p.ptr ()))
-{}
-
-CORBA::ConstructionPolicy_var::~ConstructionPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ConstructionPolicy_var &
-CORBA::ConstructionPolicy_var::operator= (ConstructionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ConstructionPolicy_var &
-CORBA::ConstructionPolicy_var::operator= (const ::CORBA::ConstructionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ConstructionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ConstructionPolicy_var::operator const ::CORBA::ConstructionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ConstructionPolicy_var::operator ::CORBA::ConstructionPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr &
-CORBA::ConstructionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr &
-CORBA::ConstructionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ConstructionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
-  return val;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::tao_duplicate (ConstructionPolicy_ptr p)
-{
-  return ::CORBA::ConstructionPolicy::_duplicate (p);
-}
-
-void
-CORBA::ConstructionPolicy_var::tao_release (ConstructionPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::tao_nil (void)
-{
-  return ::CORBA::ConstructionPolicy::_nil ();
+  return p->marshal (cdr);
 }
 
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_var::tao_narrow (
+CORBA::ConstructionPolicy_ptr
+CORBA::tao_ConstructionPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ConstructionPolicy_var::tao_upcast (void *src)
+CORBA::tao_ConstructionPolicy_cast::tao_upcast (
+    void *src
+  )
 {
-  ConstructionPolicy **tmp =
-    ACE_static_cast (ConstructionPolicy **, src);
+  CORBA::ConstructionPolicy **tmp =
+    ACE_static_cast (CORBA::ConstructionPolicy **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ConstructionPolicy_out
-// *************************************************************
-
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
-}
-
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (ConstructionPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ConstructionPolicy::_nil ();
-}
-
-CORBA::ConstructionPolicy_out::ConstructionPolicy_out (const ::CORBA::ConstructionPolicy_out &p)
-  : ptr_ (ACE_const_cast (ConstructionPolicy_out &, p).ptr_)
-{}
-
-::CORBA::ConstructionPolicy_out &
-CORBA::ConstructionPolicy_out::operator= (const ::CORBA::ConstructionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ConstructionPolicy_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ConstructionPolicy_out &
-CORBA::ConstructionPolicy_out::operator= (const ::CORBA::ConstructionPolicy_var &p)
-{
-  this->ptr_ = ::CORBA::ConstructionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ConstructionPolicy_out &
-CORBA::ConstructionPolicy_out::operator= (ConstructionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ConstructionPolicy_out::operator ::CORBA::ConstructionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr &
-CORBA::ConstructionPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ConstructionPolicy,
+        CORBA::tao_ConstructionPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ConstructionPolicy,
+        CORBA::tao_ConstructionPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ConstructionPolicy, \
+        CORBA::tao_ConstructionPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ConstructionPolicy, \
+        CORBA::tao_ConstructionPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -1206,10 +886,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1219,16 +899,16 @@ public:
     CORBA::InterfaceDef_ptr object_type_;
     const CORBA::Boolean & constr_policy_;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::InterfaceDef_ptr object_type,
       const CORBA::Boolean & constr_policy
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       object_type_ (object_type),
@@ -1243,9 +923,9 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
 
@@ -1261,11 +941,11 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
 
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1277,11 +957,11 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1290,7 +970,7 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1302,7 +982,7 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ConstructionPolicy_Proxy_Impl::_TAO_ConstructionPolicy_Proxy_Impl (void)
@@ -1327,12 +1007,12 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "make_domain_manager",
@@ -1340,18 +1020,18 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       2,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
@@ -1360,7 +1040,7 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri (
           &_tao_call,
@@ -1370,14 +1050,14 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1385,71 +1065,77 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (adapter->interfacedef_cdr_insert (_tao_out, object_type)) &&
-              (_tao_out << CORBA::Any::from_boolean (constr_policy))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK;
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (adapter->interfacedef_cdr_insert (_tao_out, object_type)) &&
+                  (_tao_out << CORBA::Any::from_boolean (constr_policy))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1459,61 +1145,59 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -1564,8 +1248,8 @@ CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ConstructionPolicy::ConstructionPolicy (int collocated)
 {
@@ -1581,14 +1265,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collo
   else
     this->the_TAO_ConstructionPolicy_Proxy_Broker_ =
       ::CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_ConstructionPolicy_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Policy_setup_collocation (collocated);
 }
 
 CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 {}
 
-void 
+void
 CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstructionPolicy *tmp = ACE_static_cast (ConstructionPolicy *, _tao_void_pointer);
@@ -1605,7 +1289,7 @@ CORBA::ConstructionPolicy::_narrow (
     {
       return ConstructionPolicy::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -1614,17 +1298,17 @@ CORBA::ConstructionPolicy::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ConstructionPolicy::_nil ());
-      
+
       if (is_a == 0)
         {
           return ConstructionPolicy::_nil ();
         }
     }
-  
+
   return ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ConstructionPolicy_ptr 
+CORBA::ConstructionPolicy_ptr
 CORBA::ConstructionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1634,18 +1318,18 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
     {
       return ConstructionPolicy::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ConstructionPolicy_ptr default_proxy = ConstructionPolicy::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -1663,7 +1347,7 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
               ConstructionPolicy::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -1676,10 +1360,10 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
               ConstructionPolicy::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ConstructionPolicy_ptr,
@@ -1699,7 +1383,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1728,7 +1412,7 @@ CORBA::ConstructionPolicy::_is_a (
     }
   else
     {
-      return this->Object::_is_a (
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1738,7 +1422,7 @@ CORBA::ConstructionPolicy::_is_a (
 void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_tao_class_id)
@@ -1771,12 +1455,12 @@ void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1785,6 +1469,12 @@ const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
 }
 
+CORBA::Boolean
+CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -1797,10 +1487,10 @@ void CORBA::ConstructionPolicy::make_domain_manager (
     CORBA::SystemException
   ))
 {
-  _TAO_ConstructionPolicy_Proxy_Impl &proxy = 
+  _TAO_ConstructionPolicy_Proxy_Impl &proxy =
     this->the_TAO_ConstructionPolicy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.make_domain_manager (
       this,
       object_type,
@@ -1816,22 +1506,22 @@ static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e737472), 
-  ACE_NTOHL (0x75637469), 
-  ACE_NTOHL (0x6f6e506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e737472),
+  ACE_NTOHL (0x75637469),
+  ACE_NTOHL (0x6f6e506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0
     19,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x74727563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x436f6e73),
+  ACE_NTOHL (0x74727563),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
   };
 
@@ -1853,128 +1543,19 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::DomainManager **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::DomainManager **old = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA::DomainManager::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::DomainManager::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::DomainManager **tmp = ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::DomainManager::_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::DomainManager **tmp = ACE_static_cast (CORBA::DomainManager**, target);
-  *tmp = CORBA::DomainManager::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *src) const
-{
-  CORBA::DomainManager **tmp = ACE_static_cast (CORBA::DomainManager**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
-#define _CORBA_DOMAINMANAGERLIST_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::DomainManagerList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::DomainManagerList::DomainManagerList (void)
 {}
 
 CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::DomainManager,
+        CORBA::DomainManager_var,
+        CORBA::tao_DomainManager_life,
+        CORBA::tao_DomainManager_cast
+      >
+    (max)
 {}
 
 CORBA::DomainManagerList::DomainManagerList (
@@ -1983,30 +1564,26 @@ CORBA::DomainManagerList::DomainManagerList (
     CORBA::DomainManager_ptr *buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::DomainManager,
+        CORBA::DomainManager_var,
+        CORBA::tao_DomainManager_life,
+        CORBA::tao_DomainManager_cast
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::DomainManager,CORBA::DomainManager_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::DomainManager,
+        CORBA::DomainManager_var,
+        CORBA::tao_DomainManager_life,
+        CORBA::tao_DomainManager_cast
+      >
+    (seq)
 {}
 
-CORBA::DomainManagerList::~DomainManagerList (void) // dtor
+CORBA::DomainManagerList::~DomainManagerList (void)
 {}
 
 void CORBA::DomainManagerList::_tao_any_destructor (void *_tao_void_pointer)
@@ -2015,126 +1592,182 @@ void CORBA::DomainManagerList::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::DomainManagerList,
+      TAO_Object_Manager<
+          CORBA::DomainManager,
+          CORBA::DomainManager_var,
+          CORBA::tao_DomainManager_life
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::DomainManagerList,
+      CORBA::DomainManagerList_var,
+      TAO_Object_Manager<
+          CORBA::DomainManager,
+          CORBA::DomainManager_var,
+          CORBA::tao_DomainManager_life
+        >
+    >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_CORBA_DomainManagerList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f446f), 
-  ACE_NTOHL (0x6d61696e), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765724c), 
-  ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
-    18,
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e4d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x74000000),  // name = DomainManagerList
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    64, // encapsulation length
+# pragma instantiate \
+    TAO_MngSeq_Var_T< \
+        CORBA::DomainManagerList, \
+        TAO_Object_Manager< \
+            CORBA::DomainManager, \
+            CORBA::DomainManager_var, \
+            CORBA::tao_DomainManager_life \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::DomainManagerList, \
+        CORBA::DomainManagerList_var, \
+        TAO_Object_Manager< \
+            CORBA::DomainManager, \
+            CORBA::DomainManager_var, \
+            CORBA::tao_DomainManager_life \
+          > \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+  static const CORBA::Long _oc_CORBA_DomainManagerList[] =
+  {
+        TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f446f),
+    ACE_NTOHL (0x6d61696e),
+    ACE_NTOHL (0x4d616e61),
+    ACE_NTOHL (0x6765724c),
+    ACE_NTOHL (0x6973743a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
+        18,
+    ACE_NTOHL (0x446f6d61),
+    ACE_NTOHL (0x696e4d61),
+    ACE_NTOHL (0x6e616765),
+    ACE_NTOHL (0x724c6973),
+    ACE_NTOHL (0x74000000),  // name = DomainManagerList
+        CORBA::tk_sequence, // typecode kind
+    80, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f446f), 
-      ACE_NTOHL (0x6d61696e), 
-      ACE_NTOHL (0x4d616e61), 
-      ACE_NTOHL (0x6765723a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-            14,
-      ACE_NTOHL (0x446f6d61), 
-      ACE_NTOHL (0x696e4d61), 
-      ACE_NTOHL (0x6e616765), 
-      ACE_NTOHL (0x72000000),  // name = DomainManager
-      
-    0U,
+      CORBA::tk_objref, // typecode kind
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        36,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f446f),
+        ACE_NTOHL (0x6d61696e),
+        ACE_NTOHL (0x4d616e61),
+        ACE_NTOHL (0x6765723a),
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
+                14,
+        ACE_NTOHL (0x446f6d61),
+        ACE_NTOHL (0x696e4d61),
+        ACE_NTOHL (0x6e616765),
+        ACE_NTOHL (0x72000000),  // name = DomainManager
+
+      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_DomainManagerList),
-    (char *) &_oc_CORBA_DomainManagerList,
-    0,
-    sizeof (CORBA::DomainManagerList)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_DomainManagerList,
-    &_tc_TAO_tc_CORBA_DomainManagerList
-  )
-TAO_NAMESPACE_END
+  static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
+      CORBA::tk_alias,
+      sizeof (_oc_CORBA_DomainManagerList),
+      (char *) &_oc_CORBA_DomainManagerList,
+      0,
+      sizeof (CORBA::DomainManagerList)
+    );
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (CORBA)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_DomainManagerList,
+      &_tc_TAO_tc_CORBA_DomainManagerList
+    )
+  TAO_NAMESPACE_END
 
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr _tao_elem
-  )
-{
-  CORBA::DomainManager_ptr _tao_objptr =
-    CORBA::DomainManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::DomainManager>::insert (
-      _tao_any,
-      CORBA::DomainManager::_tao_any_destructor,
-      CORBA::_tc_DomainManager,
-      *_tao_elem
-    );
-}
+  // Copying insertion.
+  void
+  operator<<= (
+      CORBA::Any &_tao_any,
+      CORBA::DomainManager_ptr _tao_elem
+    )
+  {
+    CORBA::DomainManager_ptr _tao_objptr =
+      CORBA::DomainManager::_duplicate (_tao_elem);
+    _tao_any <<= &_tao_objptr;
+  }
 
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::DomainManager>::extract (
+  // Non-copying insertion.
+  void
+  operator<<= (
+      CORBA::Any &_tao_any,
+      CORBA::DomainManager_ptr *_tao_elem
+    )
+  {
+    TAO::Any_Impl_T<CORBA::DomainManager>::insert (
         _tao_any,
         CORBA::DomainManager::_tao_any_destructor,
         CORBA::_tc_DomainManager,
-        _tao_elem
+        *_tao_elem
       );
-}
+  }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>;
-  template class TAO::Any_Impl_T<CORBA::DomainManager>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
-# pragma instantiate TAO::Any_Impl_T<CORBA::DomainManager>
+  CORBA::Boolean
+  operator>>= (
+      const CORBA::Any &_tao_any,
+      CORBA::DomainManager_ptr &_tao_elem
+    )
+  {
+    return
+      TAO::Any_Impl_T<CORBA::DomainManager>::extract (
+          _tao_any,
+          CORBA::DomainManager::_tao_any_destructor,
+          CORBA::_tc_DomainManager,
+          _tao_elem
+        );
+  }
+
+  template<>
+  CORBA::Boolean
+  TAO::Any_Impl_T<CORBA::DomainManager>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return 1;
+  }
+
+  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+      defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>;
+    template class TAO::Any_Impl_T<CORBA::DomainManager>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  # pragma instantiate TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
+  # pragma instantiate TAO::Any_Impl_T<CORBA::DomainManager>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -2191,7 +1824,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ConstructionPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2257,7 +1890,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -2276,12 +1909,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::DomainManager::_unchecked_narrow (
@@ -2300,7 +1933,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -2319,12 +1952,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ConstructionPolicy::_unchecked_narrow (
@@ -2343,7 +1976,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -2351,21 +1984,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
             _tao_sequence[i].in ()->marshal (strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -2375,7 +2008,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -2385,27 +2018,26 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
-
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 5d1139f9fde..c5627164d82 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -26,7 +26,8 @@
 #define _TAO_IDL_ORIG_DOMAINC_H_
 
 #include "ace/pre.h"
-#include "tao/corba.h"
+
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -62,101 +63,47 @@
 
 TAO_NAMESPACE  CORBA
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566
 
-#if !defined (_CORBA_DOMAINMANAGER___PTR_CH_)
-#define _CORBA_DOMAINMANAGER___PTR_CH_
-  
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
+  struct tao_DomainManager_life;
+  typedef TAO_Objref_Var_T<DomainManager, tao_DomainManager_life> DomainManager_var;
+  typedef TAO_Objref_Out_T<DomainManager, tao_DomainManager_life> DomainManager_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_DOMAINMANAGER___VAR_CH_)
-#define _CORBA_DOMAINMANAGER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export DomainManager_var : public TAO_Base_var
+  struct TAO_Export tao_DomainManager_life
   {
-  public:
-    DomainManager_var (void); // default constructor
-    DomainManager_var (DomainManager_ptr p) : ptr_ (p) {} 
-    DomainManager_var (const DomainManager_var &); // copy constructor
-    ~DomainManager_var (void); // destructor
-    
-    DomainManager_var &operator= (DomainManager_ptr);
-    DomainManager_var &operator= (const DomainManager_var &);
-    DomainManager_ptr operator-> (void) const;
-    
-    operator const DomainManager_ptr &() const;
-    operator DomainManager_ptr &();
-    // in, inout, out, _retn 
-    DomainManager_ptr in (void) const;
-    DomainManager_ptr &inout (void);
-    DomainManager_ptr &out (void);
-    DomainManager_ptr _retn (void);
-    DomainManager_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DomainManager_ptr tao_duplicate (DomainManager_ptr);
     static void tao_release (DomainManager_ptr);
     static DomainManager_ptr tao_nil (void);
-    static DomainManager_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DomainManager_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DomainManager_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DomainManager_var (const TAO_Base_var &rhs);
-    DomainManager_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_DOMAINMANAGER___OUT_CH_)
-#define _CORBA_DOMAINMANAGER___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export DomainManager_out
+  struct TAO_Export tao_DomainManager_cast
   {
-  public:
-    DomainManager_out (DomainManager_ptr &);
-    DomainManager_out (DomainManager_var &);
-    DomainManager_out (const DomainManager_out &);
-    DomainManager_out &operator= (const DomainManager_out &);
-    DomainManager_out &operator= (const DomainManager_var &);
-    DomainManager_out &operator= (DomainManager_ptr);
-    operator DomainManager_ptr &();
-    DomainManager_ptr &ptr (void);
-    DomainManager_ptr operator-> (void);
-  
-  private:
-    DomainManager_ptr &ptr_;
+    static DomainManager_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
-  
+
   class _TAO_DomainManager_Proxy_Impl;
   class _TAO_DomainManager_Remote_Proxy_Impl;
   class _TAO_DomainManager_Proxy_Broker;
   class _TAO_DomainManager_Remote_Proxy_Broker;
-  
+
   class TAO_Export DomainManager
     : public virtual CORBA::Object
   {
@@ -164,30 +111,30 @@ TAO_NAMESPACE  CORBA
     typedef DomainManager_ptr _ptr_type;
     typedef DomainManager_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DomainManager_ptr _duplicate (DomainManager_ptr obj);
-    
+
     static DomainManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DomainManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DomainManager_ptr _nil (void)
       {
         return (DomainManager_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -195,66 +142,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_DomainManager_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_;
-  
+
   protected:
     DomainManager (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_DomainManager_setup_collocation (int collocated);
-    
+
     DomainManager (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~DomainManager (void);
-    
+
     friend class _TAO_DomainManager_Remote_Proxy_Impl;
     friend class _TAO_DomainManager_ThruPOA_Proxy_Impl;
     friend class _TAO_DomainManager_Direct_Proxy_Impl;
-  
+
   private:
     DomainManager (const DomainManager &);
     void operator= (const DomainManager &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_Export _TAO_DomainManager_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_DomainManager_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PolicyType policy_type
@@ -263,35 +210,35 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_DomainManager_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_Export _TAO_DomainManager_Remote_Proxy_Impl
     : public virtual _TAO_DomainManager_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_DomainManager_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_DomainManager_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::Policy_ptr get_domain_policy (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PolicyType policy_type
@@ -301,23 +248,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_Export _TAO_DomainManager_Proxy_Broker
   {
   public:
@@ -326,157 +273,103 @@ TAO_NAMESPACE  CORBA
         DomainManager *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_DomainManager_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_Export _TAO_DomainManager_Remote_Proxy_Broker
     : public virtual _TAO_DomainManager_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_DomainManager_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_DomainManager_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_DomainManager_Proxy_Impl &select_proxy (
         DomainManager *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_DomainManager_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_DomainManager_Remote_Proxy_Broker *the_TAO_DomainManager_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManager;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong SecConstruction = 11U;
-  
+
+  const CORBA::PolicyType SecConstruction = 11U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566
 
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___PTR_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___PTR_CH_
-  
   class ConstructionPolicy;
   typedef ConstructionPolicy *ConstructionPolicy_ptr;
+  struct tao_ConstructionPolicy_life;
+  typedef TAO_Objref_Var_T<ConstructionPolicy, tao_ConstructionPolicy_life> ConstructionPolicy_var;
+  typedef TAO_Objref_Out_T<ConstructionPolicy, tao_ConstructionPolicy_life> ConstructionPolicy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export ConstructionPolicy_var : public TAO_Base_var
+  struct TAO_Export tao_ConstructionPolicy_life
   {
-  public:
-    ConstructionPolicy_var (void); // default constructor
-    ConstructionPolicy_var (ConstructionPolicy_ptr p) : ptr_ (p) {} 
-    ConstructionPolicy_var (const ConstructionPolicy_var &); // copy constructor
-    ~ConstructionPolicy_var (void); // destructor
-    
-    ConstructionPolicy_var &operator= (ConstructionPolicy_ptr);
-    ConstructionPolicy_var &operator= (const ConstructionPolicy_var &);
-    ConstructionPolicy_ptr operator-> (void) const;
-    
-    operator const ConstructionPolicy_ptr &() const;
-    operator ConstructionPolicy_ptr &();
-    // in, inout, out, _retn 
-    ConstructionPolicy_ptr in (void) const;
-    ConstructionPolicy_ptr &inout (void);
-    ConstructionPolicy_ptr &out (void);
-    ConstructionPolicy_ptr _retn (void);
-    ConstructionPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ConstructionPolicy_ptr tao_duplicate (ConstructionPolicy_ptr);
     static void tao_release (ConstructionPolicy_ptr);
     static ConstructionPolicy_ptr tao_nil (void);
-    static ConstructionPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ConstructionPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ConstructionPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ConstructionPolicy_var (const TAO_Base_var &rhs);
-    ConstructionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CH_)
-#define _CORBA_CONSTRUCTIONPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export ConstructionPolicy_out
+  struct TAO_Export tao_ConstructionPolicy_cast
   {
-  public:
-    ConstructionPolicy_out (ConstructionPolicy_ptr &);
-    ConstructionPolicy_out (ConstructionPolicy_var &);
-    ConstructionPolicy_out (const ConstructionPolicy_out &);
-    ConstructionPolicy_out &operator= (const ConstructionPolicy_out &);
-    ConstructionPolicy_out &operator= (const ConstructionPolicy_var &);
-    ConstructionPolicy_out &operator= (ConstructionPolicy_ptr);
-    operator ConstructionPolicy_ptr &();
-    ConstructionPolicy_ptr &ptr (void);
-    ConstructionPolicy_ptr operator-> (void);
-  
-  private:
-    ConstructionPolicy_ptr &ptr_;
+    static ConstructionPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY_CH_
-  
+
   class _TAO_ConstructionPolicy_Proxy_Impl;
   class _TAO_ConstructionPolicy_Remote_Proxy_Impl;
   class _TAO_ConstructionPolicy_Proxy_Broker;
   class _TAO_ConstructionPolicy_Remote_Proxy_Broker;
-  
+
   class TAO_Export ConstructionPolicy
     : public virtual CORBA::Policy
   {
@@ -484,30 +377,30 @@ TAO_NAMESPACE  CORBA
     typedef ConstructionPolicy_ptr _ptr_type;
     typedef ConstructionPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ConstructionPolicy_ptr _duplicate (ConstructionPolicy_ptr obj);
-    
+
     static ConstructionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstructionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstructionPolicy_ptr _nil (void)
       {
         return (ConstructionPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void make_domain_manager (
         CORBA::InterfaceDef_ptr object_type,
         CORBA::Boolean constr_policy
@@ -516,66 +409,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ConstructionPolicy_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_;
-  
+
   protected:
     ConstructionPolicy (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ConstructionPolicy_setup_collocation (int collocated);
-    
+
     ConstructionPolicy (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ConstructionPolicy (void);
-    
+
     friend class _TAO_ConstructionPolicy_Remote_Proxy_Impl;
     friend class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl;
     friend class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
-  
+
   private:
     ConstructionPolicy (const ConstructionPolicy &);
     void operator= (const ConstructionPolicy &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_Export _TAO_ConstructionPolicy_Proxy_Impl
     : public virtual CORBA::_TAO_Policy_Proxy_Impl
   {
   public:
     virtual ~_TAO_ConstructionPolicy_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void make_domain_manager (
         CORBA::Object *_collocated_tao_target_,
         CORBA::InterfaceDef_ptr object_type,
@@ -585,23 +478,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_ConstructionPolicy_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_Export _TAO_ConstructionPolicy_Remote_Proxy_Impl
     : public virtual _TAO_ConstructionPolicy_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -609,12 +502,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ConstructionPolicy_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void make_domain_manager (
         CORBA::Object *_collocated_tao_target_,
         CORBA::InterfaceDef_ptr object_type,
@@ -625,23 +518,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_Export _TAO_ConstructionPolicy_Proxy_Broker
   {
   public:
@@ -650,234 +543,115 @@ TAO_NAMESPACE  CORBA
         ConstructionPolicy *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ConstructionPolicy_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_Export _TAO_ConstructionPolicy_Remote_Proxy_Broker
     : public virtual _TAO_ConstructionPolicy_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ConstructionPolicy_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ConstructionPolicy_Proxy_Impl &select_proxy (
         ConstructionPolicy *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ConstructionPolicy_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ConstructionPolicy_Remote_Proxy_Broker *the_TAO_ConstructionPolicy_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstructionPolicy;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        DomainManager* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
-        const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static DomainManager **allocbuf (CORBA::ULong nelems);
-    static void freebuf (DomainManager **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    DomainManager* *get_buffer (CORBA::Boolean orphan = 0);
-    const DomainManager* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    virtual CORBA::Object* _upcast (void *src) const;
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstructionPolicy;
 
-#if !defined (_CORBA_DOMAINMANAGERLIST_CH_)
-#define _CORBA_DOMAINMANAGERLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class DomainManagerList;
-  class DomainManagerList_var;
-  
-  // *************************************************************
-  // CORBA::DomainManagerList
-  // *************************************************************
-  
-  class TAO_Export DomainManagerList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<DomainManager,DomainManager_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        DomainManagerList,
+        TAO_Object_Manager<
+            CORBA::DomainManager,
+            CORBA::DomainManager_var,
+            CORBA::tao_DomainManager_life
+          >
+      >
+    DomainManagerList_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        DomainManagerList,
+        DomainManagerList_var,
+        TAO_Object_Manager<
+            CORBA::DomainManager,
+            CORBA::DomainManager_var,
+            CORBA::tao_DomainManager_life
+          >
+      >
+    DomainManagerList_out;
+
+  class TAO_Export DomainManagerList
+    : public
+        TAO_Unbounded_Object_Sequence<
+            CORBA::DomainManager,
+            CORBA::DomainManager_var,
+            CORBA::tao_DomainManager_life,
+            CORBA::tao_DomainManager_cast
+          >
   {
   public:
     DomainManagerList (void);
     DomainManagerList (CORBA::ULong max);
     DomainManagerList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        DomainManager_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        DomainManager_ptr *buffer,
         CORBA::Boolean release = 0
       );
     DomainManagerList (const DomainManagerList &);
     ~DomainManagerList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef DomainManagerList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_DOMAINMANAGERLIST___VAR_CH_)
-#define _CORBA_DOMAINMANAGERLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::DomainManagerList_var
-  // *************************************************************
-  
-  class TAO_Export DomainManagerList_var
-  {
-  public:
-    DomainManagerList_var (void);
-    DomainManagerList_var (DomainManagerList *);
-    DomainManagerList_var (const DomainManagerList_var &);
-    ~DomainManagerList_var (void);
-    
-    DomainManagerList_var &operator= (DomainManagerList *);
-    DomainManagerList_var &operator= (const DomainManagerList_var &);
-    DomainManagerList *operator-> (void);
-    const DomainManagerList *operator-> (void) const;
-    
-    operator const DomainManagerList &() const;
-    operator DomainManagerList &();
-    operator DomainManagerList &() const;
-    
-    // Variable-size base types only.
-    operator DomainManagerList *&();
-    
-    TAO_Object_Manager<DomainManager, DomainManager_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const DomainManagerList &in (void) const;
-    DomainManagerList &inout (void);
-    DomainManagerList *&out (void);
-    DomainManagerList *_retn (void);
-    DomainManagerList *ptr (void) const;
-  
-  private:
-    DomainManagerList *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_DOMAINMANAGERLIST___OUT_CH_)
-#define _CORBA_DOMAINMANAGERLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export DomainManagerList_out
-  {
-  public:
-    DomainManagerList_out (DomainManagerList *&);
-    DomainManagerList_out (DomainManagerList_var &);
-    DomainManagerList_out (const DomainManagerList_out &);
-    DomainManagerList_out &operator= (const DomainManagerList_out &);
-    DomainManagerList_out &operator= (DomainManagerList *);
-    operator DomainManagerList *&();
-    DomainManagerList *&ptr (void);
-    DomainManagerList *operator-> (void);
-    TAO_Object_Manager<DomainManager, DomainManager_var> operator[] (CORBA::ULong index);
-  
-  private:
-    DomainManagerList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const DomainManagerList_var &);
+    typedef DomainManagerList_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DomainManagerList;
 
 // TAO_IDL - Generated from
@@ -965,7 +739,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "DomainC.i"
@@ -981,4 +755,3 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index 56e0cbea360..af668cdf363 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -32,29 +32,11 @@ CORBA::DomainManager::DomainManager (
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
-  : Object (objref, _tao_collocated, servant)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
   this->CORBA_DomainManager_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::DomainManager::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::DomainManager>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -69,18 +51,11 @@ CORBA::ConstructionPolicy::ConstructionPolicy (
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
-  : Object (objref, _tao_collocated, servant)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
   this->CORBA_ConstructionPolicy_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -94,438 +69,9 @@ TAO::Any_Impl_T<CORBA::ConstructionPolicy>::to_object (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_
-
-ACE_INLINE
-CORBA::DomainManager **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::DomainManager **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::DomainManager*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::DomainManager::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (CORBA::DomainManager **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::DomainManager* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList(
-    const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::DomainManager **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
-      CORBA::DomainManager ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::DomainManager::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::DomainManager **tmp =
-        ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = CORBA::DomainManager::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::DomainManager **tmp1 =
-    ACE_reinterpret_cast (CORBA::DomainManager **, this->buffer_);
-  
-  CORBA::DomainManager ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::DomainManager::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::DomainManager ** const tmp =
-    ACE_reinterpret_cast (CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::DomainManager* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::DomainManager **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::DomainManager**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::DomainManager**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::DomainManager* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::DomainManager ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_DOMAINMANAGERLIST_CI_)
-#define _CORBA_DOMAINMANAGERLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManagerList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (DomainManagerList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::DomainManagerList_var (const ::CORBA::DomainManagerList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::DomainManagerList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::~DomainManagerList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var &
-CORBA::DomainManagerList_var::operator= (DomainManagerList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList_var &
-CORBA::DomainManagerList_var::operator= (const ::CORBA::DomainManagerList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          DomainManagerList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              DomainManagerList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              DomainManagerList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::DomainManagerList *
-CORBA::DomainManagerList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *
-CORBA::DomainManagerList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::operator const ::CORBA::DomainManagerList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::DomainManagerList_var::operator ::CORBA::DomainManagerList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
-CORBA::DomainManagerList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::DomainManagerList &
-CORBA::DomainManagerList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList &
-CORBA::DomainManagerList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *&
-CORBA::DomainManagerList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *
-CORBA::DomainManagerList_var::_retn (void)
-{
-  ::CORBA::DomainManagerList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *
-CORBA::DomainManagerList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManagerList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (DomainManagerList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_out::DomainManagerList_out (const ::CORBA::DomainManagerList_out &p)
-  : ptr_ (ACE_const_cast (DomainManagerList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::DomainManagerList_out &
-CORBA::DomainManagerList_out::operator= (const ::CORBA::DomainManagerList_out &p)
-{
-  this->ptr_ = ACE_const_cast (DomainManagerList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList_out &
-CORBA::DomainManagerList_out::operator= (DomainManagerList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::DomainManagerList_out::operator ::CORBA::DomainManagerList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *&
-CORBA::DomainManagerList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::DomainManagerList *
-CORBA::DomainManagerList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var>
-CORBA::DomainManagerList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
@@ -569,4 +115,3 @@ CORBA::Boolean TAO_Export operator>> (
   );
 
 #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_I_ */
-
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index de40113b635..1f1a0844d53 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -762,7 +762,7 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
 }
 
 void
-TAO_DynCommon::insert_val (CORBA::ValueBase_ptr
+TAO_DynCommon::insert_val (CORBA::ValueBase *
                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1459,7 +1459,7 @@ TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
                                           ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ValueBase_ptr
+CORBA::ValueBase *
 TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index b740089e731..75fc04717e3 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -256,7 +256,7 @@ public:
       ));
 
   virtual void insert_val (
-      CORBA::ValueBase_ptr value
+      CORBA::ValueBase * value
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
@@ -436,7 +436,7 @@ public:
         DynamicAny::DynAny::InvalidValue
       ));
 
-  virtual CORBA::ValueBase_ptr get_val (
+  virtual CORBA::ValueBase * get_val (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
index 09dc9b8e59c..44efe91babb 100644
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ b/TAO/tao/DynamicAny/DynamicAny.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code from this file is:
  *
  * tao_idl \
- *  -o orig -Gp -Gd -Ge 1 \
+ *  -o orig -Gp -Gd -Ge 1 -Sa -St \
  *          -Wb,export_macro=TAO_DynamicAny_Export \
  *          -Wb,export_include=dynamicany_export.h \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 6c6e5ab6ec2..e420aa142b4 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -50,7 +49,7 @@
 int DynamicAny::DynAny::_tao_class_id = 0;
 
 DynamicAny::DynAny_ptr
-tao_DynamicAny_DynAny_duplicate (
+DynamicAny::tao_DynAny_life::tao_duplicate (
     DynamicAny::DynAny_ptr p
   )
 {
@@ -58,7 +57,7 @@ tao_DynamicAny_DynAny_duplicate (
 }
 
 void
-tao_DynamicAny_DynAny_release (
+DynamicAny::tao_DynAny_life::tao_release (
     DynamicAny::DynAny_ptr p
   )
 {
@@ -66,15 +65,24 @@ tao_DynamicAny_DynAny_release (
 }
 
 DynamicAny::DynAny_ptr
-tao_DynamicAny_DynAny_nil (
+DynamicAny::tao_DynAny_life::tao_nil (
     void
   )
 {
   return DynamicAny::DynAny::_nil ();
 }
 
+CORBA::Boolean
+DynamicAny::tao_DynAny_life::tao_marshal (
+    DynamicAny::DynAny_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 DynamicAny::DynAny_ptr
-tao_DynamicAny_DynAny_narrow (
+DynamicAny::tao_DynAny_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -83,7 +91,7 @@ tao_DynamicAny_DynAny_narrow (
 }
 
 CORBA::Object *
-tao_DynamicAny_DynAny_upcast (
+DynamicAny::tao_DynAny_cast::tao_upcast (
     void *src
   )
 {
@@ -92,205 +100,32 @@ tao_DynamicAny_DynAny_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_DynamicAny_DynAny_marshal (
-    DynamicAny::DynAny_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynAny_var
-// *************************************************************
-
-DynamicAny::DynAny_var::DynAny_var (void)
-  : ptr_ (DynAny::_nil ())
-{}
-
-::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynAny_var::DynAny_var (const ::DynamicAny::DynAny_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynAny::_duplicate (p.ptr ()))
-{}
-
-DynamicAny::DynAny_var::~DynAny_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-DynamicAny::DynAny_var &
-DynamicAny::DynAny_var::operator= (DynAny_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynAny_var &
-DynamicAny::DynAny_var::operator= (const ::DynamicAny::DynAny_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynAny::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-DynamicAny::DynAny_var::operator const ::DynamicAny::DynAny_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAny_ptr &
-DynamicAny::DynAny_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAny_ptr &
-DynamicAny::DynAny_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynAny::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynAny_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynAny::_nil ();
-  return val;
-}
-
-::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::tao_duplicate (DynAny_ptr p)
-{
-  return ::DynamicAny::DynAny::_duplicate (p);
-}
-
-void
-DynamicAny::DynAny_var::tao_release (DynAny_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::tao_nil (void)
-{
-  return ::DynamicAny::DynAny::_nil ();
-}
-
-::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynAny::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-DynamicAny::DynAny_var::tao_upcast (void *src)
-{
-  DynAny **tmp =
-    ACE_static_cast (DynAny **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        DynamicAny::DynAny,
+        DynamicAny::tao_DynAny_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        DynamicAny::DynAny,
+        DynamicAny::tao_DynAny_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        DynamicAny::DynAny, \
+        DynamicAny::tao_DynAny_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        DynamicAny::DynAny, \
+        DynamicAny::tao_DynAny_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynAny_out
-// *************************************************************
-
-DynamicAny::DynAny_out::DynAny_out (DynAny_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynAny::_nil ();
-}
-
-DynamicAny::DynAny_out::DynAny_out (DynAny_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynAny::_nil ();
-}
-
-DynamicAny::DynAny_out::DynAny_out (const ::DynamicAny::DynAny_out &p)
-  : ptr_ (ACE_const_cast (DynAny_out &, p).ptr_)
-{}
-
-::DynamicAny::DynAny_out &
-DynamicAny::DynAny_out::operator= (const ::DynamicAny::DynAny_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynAny_out&, p).ptr_;
-  return *this;
-}
-
-DynamicAny::DynAny_out &
-DynamicAny::DynAny_out::operator= (const ::DynamicAny::DynAny_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynAny::_duplicate (p.ptr ());
-  return *this;
-}
-
-DynamicAny::DynAny_out &
-DynamicAny::DynAny_out::operator= (DynAny_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynAny_out::operator ::DynamicAny::DynAny_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAny_ptr &
-DynamicAny::DynAny_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 DynamicAny::DynAny::DynAny (void)
 {}
@@ -307,7 +142,7 @@ DynamicAny::DynAny::_narrow (
   return DynAny::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynAny_ptr 
+DynamicAny::DynAny_ptr
 DynamicAny::DynAny::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -317,7 +152,7 @@ DynamicAny::DynAny::_unchecked_narrow (
     {
       return DynAny::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           DynAny_ptr,
@@ -337,14 +172,14 @@ DynamicAny::DynAny::_duplicate (DynAny_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *DynamicAny::DynAny::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
@@ -363,12 +198,12 @@ void *DynamicAny::DynAny::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -377,7 +212,13 @@ const char* DynamicAny::DynAny::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynAny:1.0";
 }
 
-// TAO_IDL - Generated from 
+CORBA::Boolean
+DynamicAny::DynAny::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 DynamicAny::DynAny::InvalidValue::InvalidValue (void)
@@ -462,7 +303,7 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode (
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
@@ -553,7 +394,7 @@ void DynamicAny::DynAny::TypeMismatch::_tao_decode (
 int DynamicAny::DynFixed::_tao_class_id = 0;
 
 DynamicAny::DynFixed_ptr
-tao_DynamicAny_DynFixed_duplicate (
+DynamicAny::tao_DynFixed_life::tao_duplicate (
     DynamicAny::DynFixed_ptr p
   )
 {
@@ -561,7 +402,7 @@ tao_DynamicAny_DynFixed_duplicate (
 }
 
 void
-tao_DynamicAny_DynFixed_release (
+DynamicAny::tao_DynFixed_life::tao_release (
     DynamicAny::DynFixed_ptr p
   )
 {
@@ -569,15 +410,24 @@ tao_DynamicAny_DynFixed_release (
 }
 
 DynamicAny::DynFixed_ptr
-tao_DynamicAny_DynFixed_nil (
+DynamicAny::tao_DynFixed_life::tao_nil (
     void
   )
 {
   return DynamicAny::DynFixed::_nil ();
 }
 
+CORBA::Boolean
+DynamicAny::tao_DynFixed_life::tao_marshal (
+    DynamicAny::DynFixed_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 DynamicAny::DynFixed_ptr
-tao_DynamicAny_DynFixed_narrow (
+DynamicAny::tao_DynFixed_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -586,7 +436,7 @@ tao_DynamicAny_DynFixed_narrow (
 }
 
 CORBA::Object *
-tao_DynamicAny_DynFixed_upcast (
+DynamicAny::tao_DynFixed_cast::tao_upcast (
     void *src
   )
 {
@@ -595,205 +445,32 @@ tao_DynamicAny_DynFixed_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_DynamicAny_DynFixed_marshal (
-    DynamicAny::DynFixed_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynFixed_var
-// *************************************************************
-
-DynamicAny::DynFixed_var::DynFixed_var (void)
-  : ptr_ (DynFixed::_nil ())
-{}
-
-::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynFixed_var::DynFixed_var (const ::DynamicAny::DynFixed_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynFixed::_duplicate (p.ptr ()))
-{}
-
-DynamicAny::DynFixed_var::~DynFixed_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-DynamicAny::DynFixed_var &
-DynamicAny::DynFixed_var::operator= (DynFixed_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynFixed_var &
-DynamicAny::DynFixed_var::operator= (const ::DynamicAny::DynFixed_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynFixed::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-DynamicAny::DynFixed_var::operator const ::DynamicAny::DynFixed_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynFixed_ptr &
-DynamicAny::DynFixed_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynFixed_ptr &
-DynamicAny::DynFixed_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynFixed_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
-  return val;
-}
-
-::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::tao_duplicate (DynFixed_ptr p)
-{
-  return ::DynamicAny::DynFixed::_duplicate (p);
-}
-
-void
-DynamicAny::DynFixed_var::tao_release (DynFixed_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::tao_nil (void)
-{
-  return ::DynamicAny::DynFixed::_nil ();
-}
-
-::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynFixed::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-DynamicAny::DynFixed_var::tao_upcast (void *src)
-{
-  DynFixed **tmp =
-    ACE_static_cast (DynFixed **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        DynamicAny::DynFixed,
+        DynamicAny::tao_DynFixed_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        DynamicAny::DynFixed,
+        DynamicAny::tao_DynFixed_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        DynamicAny::DynFixed, \
+        DynamicAny::tao_DynFixed_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        DynamicAny::DynFixed, \
+        DynamicAny::tao_DynFixed_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynFixed_out
-// *************************************************************
-
-DynamicAny::DynFixed_out::DynFixed_out (DynFixed_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
-}
-
-DynamicAny::DynFixed_out::DynFixed_out (DynFixed_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
-}
-
-DynamicAny::DynFixed_out::DynFixed_out (const ::DynamicAny::DynFixed_out &p)
-  : ptr_ (ACE_const_cast (DynFixed_out &, p).ptr_)
-{}
-
-::DynamicAny::DynFixed_out &
-DynamicAny::DynFixed_out::operator= (const ::DynamicAny::DynFixed_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynFixed_out&, p).ptr_;
-  return *this;
-}
-
-DynamicAny::DynFixed_out &
-DynamicAny::DynFixed_out::operator= (const ::DynamicAny::DynFixed_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynFixed::_duplicate (p.ptr ());
-  return *this;
-}
-
-DynamicAny::DynFixed_out &
-DynamicAny::DynFixed_out::operator= (DynFixed_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynFixed_out::operator ::DynamicAny::DynFixed_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynFixed_ptr &
-DynamicAny::DynFixed_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 DynamicAny::DynFixed::DynFixed (void)
 {}
@@ -810,7 +487,7 @@ DynamicAny::DynFixed::_narrow (
   return DynFixed::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynFixed_ptr 
+DynamicAny::DynFixed_ptr
 DynamicAny::DynFixed::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -820,7 +497,7 @@ DynamicAny::DynFixed::_unchecked_narrow (
     {
       return DynFixed::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           DynFixed_ptr,
@@ -840,14 +517,14 @@ DynamicAny::DynFixed::_duplicate (DynFixed_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::DynamicAny, DynFixed)::_tao_class_id)
@@ -880,12 +557,12 @@ void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -894,13 +571,19 @@ const char* DynamicAny::DynFixed::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynFixed:1.0";
 }
 
+CORBA::Boolean
+DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int DynamicAny::DynEnum::_tao_class_id = 0;
 
 DynamicAny::DynEnum_ptr
-tao_DynamicAny_DynEnum_duplicate (
+DynamicAny::tao_DynEnum_life::tao_duplicate (
     DynamicAny::DynEnum_ptr p
   )
 {
@@ -908,7 +591,7 @@ tao_DynamicAny_DynEnum_duplicate (
 }
 
 void
-tao_DynamicAny_DynEnum_release (
+DynamicAny::tao_DynEnum_life::tao_release (
     DynamicAny::DynEnum_ptr p
   )
 {
@@ -916,15 +599,24 @@ tao_DynamicAny_DynEnum_release (
 }
 
 DynamicAny::DynEnum_ptr
-tao_DynamicAny_DynEnum_nil (
+DynamicAny::tao_DynEnum_life::tao_nil (
     void
   )
 {
   return DynamicAny::DynEnum::_nil ();
 }
 
+CORBA::Boolean
+DynamicAny::tao_DynEnum_life::tao_marshal (
+    DynamicAny::DynEnum_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 DynamicAny::DynEnum_ptr
-tao_DynamicAny_DynEnum_narrow (
+DynamicAny::tao_DynEnum_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -933,7 +625,7 @@ tao_DynamicAny_DynEnum_narrow (
 }
 
 CORBA::Object *
-tao_DynamicAny_DynEnum_upcast (
+DynamicAny::tao_DynEnum_cast::tao_upcast (
     void *src
   )
 {
@@ -942,205 +634,32 @@ tao_DynamicAny_DynEnum_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_DynamicAny_DynEnum_marshal (
-    DynamicAny::DynEnum_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynEnum_var
-// *************************************************************
-
-DynamicAny::DynEnum_var::DynEnum_var (void)
-  : ptr_ (DynEnum::_nil ())
-{}
-
-::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynEnum_var::DynEnum_var (const ::DynamicAny::DynEnum_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynEnum::_duplicate (p.ptr ()))
-{}
-
-DynamicAny::DynEnum_var::~DynEnum_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-DynamicAny::DynEnum_var &
-DynamicAny::DynEnum_var::operator= (DynEnum_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynEnum_var &
-DynamicAny::DynEnum_var::operator= (const ::DynamicAny::DynEnum_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynEnum::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-DynamicAny::DynEnum_var::operator const ::DynamicAny::DynEnum_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynEnum_ptr &
-DynamicAny::DynEnum_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynEnum_ptr &
-DynamicAny::DynEnum_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynEnum_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
-  return val;
-}
-
-::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::tao_duplicate (DynEnum_ptr p)
-{
-  return ::DynamicAny::DynEnum::_duplicate (p);
-}
-
-void
-DynamicAny::DynEnum_var::tao_release (DynEnum_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::tao_nil (void)
-{
-  return ::DynamicAny::DynEnum::_nil ();
-}
-
-::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynEnum::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-DynamicAny::DynEnum_var::tao_upcast (void *src)
-{
-  DynEnum **tmp =
-    ACE_static_cast (DynEnum **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        DynamicAny::DynEnum,
+        DynamicAny::tao_DynEnum_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        DynamicAny::DynEnum,
+        DynamicAny::tao_DynEnum_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        DynamicAny::DynEnum, \
+        DynamicAny::tao_DynEnum_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        DynamicAny::DynEnum, \
+        DynamicAny::tao_DynEnum_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynEnum_out
-// *************************************************************
-
-DynamicAny::DynEnum_out::DynEnum_out (DynEnum_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
-}
-
-DynamicAny::DynEnum_out::DynEnum_out (DynEnum_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
-}
-
-DynamicAny::DynEnum_out::DynEnum_out (const ::DynamicAny::DynEnum_out &p)
-  : ptr_ (ACE_const_cast (DynEnum_out &, p).ptr_)
-{}
-
-::DynamicAny::DynEnum_out &
-DynamicAny::DynEnum_out::operator= (const ::DynamicAny::DynEnum_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynEnum_out&, p).ptr_;
-  return *this;
-}
-
-DynamicAny::DynEnum_out &
-DynamicAny::DynEnum_out::operator= (const ::DynamicAny::DynEnum_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynEnum::_duplicate (p.ptr ());
-  return *this;
-}
-
-DynamicAny::DynEnum_out &
-DynamicAny::DynEnum_out::operator= (DynEnum_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynEnum_out::operator ::DynamicAny::DynEnum_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynEnum_ptr &
-DynamicAny::DynEnum_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 DynamicAny::DynEnum::DynEnum (void)
 {}
@@ -1157,7 +676,7 @@ DynamicAny::DynEnum::_narrow (
   return DynEnum::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynEnum_ptr 
+DynamicAny::DynEnum_ptr
 DynamicAny::DynEnum::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1167,7 +686,7 @@ DynamicAny::DynEnum::_unchecked_narrow (
     {
       return DynEnum::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           DynEnum_ptr,
@@ -1187,14 +706,14 @@ DynamicAny::DynEnum::_duplicate (DynEnum_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::DynamicAny, DynEnum)::_tao_class_id)
@@ -1227,12 +746,12 @@ void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1241,249 +760,221 @@ const char* DynamicAny::DynEnum::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynEnum:1.0";
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+CORBA::Boolean
+DynamicAny::DynEnum::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_allocate_buffer (CORBA::ULong length)
-{
-  DynamicAny::NameValuePair* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      DynamicAny::NameValuePair *old =
-        ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Var_Var_T<
+      NameValuePair
+    >;
 
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  DynamicAny::NameValuePair *tmp =
-    ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
-  _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
+template class
+  TAO_Out_T<
+      NameValuePair,
+      NameValuePair_var
+    >;
 
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      NameValuePair \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      NameValuePair, \
+      NameValuePair_var \
+    >
 
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// DynamicAny::NameValuePairSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 DynamicAny::NameValuePairSeq::NameValuePairSeq (void)
 {}
 
 DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        DynamicAny::NameValuePair
+      >
+    (max)
 {}
 
 DynamicAny::NameValuePairSeq::NameValuePairSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    DynamicAny::NameValuePair *buffer,
+    DynamicAny::NameValuePair* buffer,
     CORBA::Boolean release
   )
-  : 
+  : TAO_Unbounded_Sequence<
+        DynamicAny::NameValuePair
+      >
+    (max, length, buffer, release)
+{}
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
+DynamicAny::NameValuePairSeq::NameValuePairSeq (const NameValuePairSeq &seq)
+  : TAO_Unbounded_Sequence<
+        DynamicAny::NameValuePair
+      >
+    (seq)
+{}
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+DynamicAny::NameValuePairSeq::~NameValuePairSeq (void)
 {}
 
-DynamicAny::NameValuePairSeq::NameValuePairSeq (const NameValuePairSeq &seq)
-  : 
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-DynamicAny::NameValuePairSeq::~NameValuePairSeq (void) // dtor
-{}
+template class
+  TAO_VarSeq_Var_T<
+      NameValuePairSeq,
+      DynamicAny::NameValuePair
+    >;
 
+template class
+  TAO_Seq_Out_T<
+      NameValuePairSeq,
+      NameValuePairSeq_var,
+      DynamicAny::NameValuePair
+    >;
 
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      NameValuePairSeq, \
+      DynamicAny::NameValuePair \
+    >
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      NameValuePairSeq, \
+      NameValuePairSeq_var, \
+      DynamicAny::NameValuePair \
+    >
 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_allocate_buffer (CORBA::ULong length)
-{
-  DynamicAny::NameDynAnyPair* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      DynamicAny::NameDynAnyPair *old =
-        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  DynamicAny::NameDynAnyPair *tmp =
-    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
-  _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
+template class
+  TAO_Var_Var_T<
+      NameDynAnyPair
+    >;
 
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void)
-{
-  this->_deallocate_buffer ();
-}
+template class
+  TAO_Out_T<
+      NameDynAnyPair,
+      NameDynAnyPair_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      NameDynAnyPair \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      NameDynAnyPair, \
+      NameDynAnyPair_var \
+    >
 
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// DynamicAny::NameDynAnyPairSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void)
 {}
 
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        DynamicAny::NameDynAnyPair
+      >
+    (max)
 {}
 
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    DynamicAny::NameDynAnyPair *buffer,
+    DynamicAny::NameDynAnyPair* buffer,
     CORBA::Boolean release
   )
-  : 
+  : TAO_Unbounded_Sequence<
+        DynamicAny::NameDynAnyPair
+      >
+    (max, length, buffer, release)
+{}
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
+DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (const NameDynAnyPairSeq &seq)
+  : TAO_Unbounded_Sequence<
+        DynamicAny::NameDynAnyPair
+      >
+    (seq)
+{}
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void)
 {}
 
-DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (const NameDynAnyPairSeq &seq)
-  : 
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) // dtor
-{}
+template class
+  TAO_VarSeq_Var_T<
+      NameDynAnyPairSeq,
+      DynamicAny::NameDynAnyPair
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      NameDynAnyPairSeq,
+      NameDynAnyPairSeq_var,
+      DynamicAny::NameDynAnyPair
+    >;
 
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      NameDynAnyPairSeq, \
+      DynamicAny::NameDynAnyPair \
+    >
 
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      NameDynAnyPairSeq, \
+      NameDynAnyPairSeq_var, \
+      DynamicAny::NameDynAnyPair \
+    >
 
-#endif /* end #if !defined */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
@@ -1491,7 +982,7 @@ DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) // dtor
 int DynamicAny::DynStruct::_tao_class_id = 0;
 
 DynamicAny::DynStruct_ptr
-tao_DynamicAny_DynStruct_duplicate (
+DynamicAny::tao_DynStruct_life::tao_duplicate (
     DynamicAny::DynStruct_ptr p
   )
 {
@@ -1499,7 +990,7 @@ tao_DynamicAny_DynStruct_duplicate (
 }
 
 void
-tao_DynamicAny_DynStruct_release (
+DynamicAny::tao_DynStruct_life::tao_release (
     DynamicAny::DynStruct_ptr p
   )
 {
@@ -1507,15 +998,24 @@ tao_DynamicAny_DynStruct_release (
 }
 
 DynamicAny::DynStruct_ptr
-tao_DynamicAny_DynStruct_nil (
+DynamicAny::tao_DynStruct_life::tao_nil (
     void
   )
 {
   return DynamicAny::DynStruct::_nil ();
 }
 
+CORBA::Boolean
+DynamicAny::tao_DynStruct_life::tao_marshal (
+    DynamicAny::DynStruct_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 DynamicAny::DynStruct_ptr
-tao_DynamicAny_DynStruct_narrow (
+DynamicAny::tao_DynStruct_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1524,7 +1024,7 @@ tao_DynamicAny_DynStruct_narrow (
 }
 
 CORBA::Object *
-tao_DynamicAny_DynStruct_upcast (
+DynamicAny::tao_DynStruct_cast::tao_upcast (
     void *src
   )
 {
@@ -1533,205 +1033,32 @@ tao_DynamicAny_DynStruct_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_DynamicAny_DynStruct_marshal (
-    DynamicAny::DynStruct_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynStruct_var
-// *************************************************************
-
-DynamicAny::DynStruct_var::DynStruct_var (void)
-  : ptr_ (DynStruct::_nil ())
-{}
-
-::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynStruct_var::DynStruct_var (const ::DynamicAny::DynStruct_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynStruct::_duplicate (p.ptr ()))
-{}
-
-DynamicAny::DynStruct_var::~DynStruct_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-DynamicAny::DynStruct_var &
-DynamicAny::DynStruct_var::operator= (DynStruct_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynStruct_var &
-DynamicAny::DynStruct_var::operator= (const ::DynamicAny::DynStruct_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynStruct::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-DynamicAny::DynStruct_var::operator const ::DynamicAny::DynStruct_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynStruct_ptr &
-DynamicAny::DynStruct_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynStruct_ptr &
-DynamicAny::DynStruct_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynStruct_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
-  return val;
-}
-
-::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::tao_duplicate (DynStruct_ptr p)
-{
-  return ::DynamicAny::DynStruct::_duplicate (p);
-}
-
-void
-DynamicAny::DynStruct_var::tao_release (DynStruct_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::tao_nil (void)
-{
-  return ::DynamicAny::DynStruct::_nil ();
-}
-
-::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynStruct::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-DynamicAny::DynStruct_var::tao_upcast (void *src)
-{
-  DynStruct **tmp =
-    ACE_static_cast (DynStruct **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        DynamicAny::DynStruct,
+        DynamicAny::tao_DynStruct_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        DynamicAny::DynStruct,
+        DynamicAny::tao_DynStruct_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        DynamicAny::DynStruct, \
+        DynamicAny::tao_DynStruct_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        DynamicAny::DynStruct, \
+        DynamicAny::tao_DynStruct_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynStruct_out
-// *************************************************************
-
-DynamicAny::DynStruct_out::DynStruct_out (DynStruct_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
-}
-
-DynamicAny::DynStruct_out::DynStruct_out (DynStruct_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
-}
-
-DynamicAny::DynStruct_out::DynStruct_out (const ::DynamicAny::DynStruct_out &p)
-  : ptr_ (ACE_const_cast (DynStruct_out &, p).ptr_)
-{}
-
-::DynamicAny::DynStruct_out &
-DynamicAny::DynStruct_out::operator= (const ::DynamicAny::DynStruct_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynStruct_out&, p).ptr_;
-  return *this;
-}
-
-DynamicAny::DynStruct_out &
-DynamicAny::DynStruct_out::operator= (const ::DynamicAny::DynStruct_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynStruct::_duplicate (p.ptr ());
-  return *this;
-}
-
-DynamicAny::DynStruct_out &
-DynamicAny::DynStruct_out::operator= (DynStruct_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynStruct_out::operator ::DynamicAny::DynStruct_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynStruct_ptr &
-DynamicAny::DynStruct_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 DynamicAny::DynStruct::DynStruct (void)
 {}
@@ -1748,7 +1075,7 @@ DynamicAny::DynStruct::_narrow (
   return DynStruct::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynStruct_ptr 
+DynamicAny::DynStruct_ptr
 DynamicAny::DynStruct::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1758,7 +1085,7 @@ DynamicAny::DynStruct::_unchecked_narrow (
     {
       return DynStruct::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           DynStruct_ptr,
@@ -1778,14 +1105,14 @@ DynamicAny::DynStruct::_duplicate (DynStruct_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::DynamicAny, DynStruct)::_tao_class_id)
@@ -1818,12 +1145,12 @@ void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1832,13 +1159,19 @@ const char* DynamicAny::DynStruct::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynStruct:1.0";
 }
 
+CORBA::Boolean
+DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int DynamicAny::DynUnion::_tao_class_id = 0;
 
 DynamicAny::DynUnion_ptr
-tao_DynamicAny_DynUnion_duplicate (
+DynamicAny::tao_DynUnion_life::tao_duplicate (
     DynamicAny::DynUnion_ptr p
   )
 {
@@ -1846,7 +1179,7 @@ tao_DynamicAny_DynUnion_duplicate (
 }
 
 void
-tao_DynamicAny_DynUnion_release (
+DynamicAny::tao_DynUnion_life::tao_release (
     DynamicAny::DynUnion_ptr p
   )
 {
@@ -1854,15 +1187,24 @@ tao_DynamicAny_DynUnion_release (
 }
 
 DynamicAny::DynUnion_ptr
-tao_DynamicAny_DynUnion_nil (
+DynamicAny::tao_DynUnion_life::tao_nil (
     void
   )
 {
   return DynamicAny::DynUnion::_nil ();
 }
 
+CORBA::Boolean
+DynamicAny::tao_DynUnion_life::tao_marshal (
+    DynamicAny::DynUnion_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 DynamicAny::DynUnion_ptr
-tao_DynamicAny_DynUnion_narrow (
+DynamicAny::tao_DynUnion_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1871,7 +1213,7 @@ tao_DynamicAny_DynUnion_narrow (
 }
 
 CORBA::Object *
-tao_DynamicAny_DynUnion_upcast (
+DynamicAny::tao_DynUnion_cast::tao_upcast (
     void *src
   )
 {
@@ -1880,205 +1222,32 @@ tao_DynamicAny_DynUnion_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_DynamicAny_DynUnion_marshal (
-    DynamicAny::DynUnion_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynUnion_var
-// *************************************************************
-
-DynamicAny::DynUnion_var::DynUnion_var (void)
-  : ptr_ (DynUnion::_nil ())
-{}
-
-::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynUnion_var::DynUnion_var (const ::DynamicAny::DynUnion_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynUnion::_duplicate (p.ptr ()))
-{}
-
-DynamicAny::DynUnion_var::~DynUnion_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-DynamicAny::DynUnion_var &
-DynamicAny::DynUnion_var::operator= (DynUnion_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynUnion_var &
-DynamicAny::DynUnion_var::operator= (const ::DynamicAny::DynUnion_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynUnion::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-DynamicAny::DynUnion_var::operator const ::DynamicAny::DynUnion_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynUnion_ptr &
-DynamicAny::DynUnion_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynUnion_ptr &
-DynamicAny::DynUnion_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynUnion_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
-  return val;
-}
-
-::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::tao_duplicate (DynUnion_ptr p)
-{
-  return ::DynamicAny::DynUnion::_duplicate (p);
-}
-
-void
-DynamicAny::DynUnion_var::tao_release (DynUnion_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::tao_nil (void)
-{
-  return ::DynamicAny::DynUnion::_nil ();
-}
-
-::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynUnion::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-DynamicAny::DynUnion_var::tao_upcast (void *src)
-{
-  DynUnion **tmp =
-    ACE_static_cast (DynUnion **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        DynamicAny::DynUnion,
+        DynamicAny::tao_DynUnion_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        DynamicAny::DynUnion,
+        DynamicAny::tao_DynUnion_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        DynamicAny::DynUnion, \
+        DynamicAny::tao_DynUnion_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        DynamicAny::DynUnion, \
+        DynamicAny::tao_DynUnion_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynUnion_out
-// *************************************************************
-
-DynamicAny::DynUnion_out::DynUnion_out (DynUnion_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
-}
-
-DynamicAny::DynUnion_out::DynUnion_out (DynUnion_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
-}
-
-DynamicAny::DynUnion_out::DynUnion_out (const ::DynamicAny::DynUnion_out &p)
-  : ptr_ (ACE_const_cast (DynUnion_out &, p).ptr_)
-{}
-
-::DynamicAny::DynUnion_out &
-DynamicAny::DynUnion_out::operator= (const ::DynamicAny::DynUnion_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynUnion_out&, p).ptr_;
-  return *this;
-}
-
-DynamicAny::DynUnion_out &
-DynamicAny::DynUnion_out::operator= (const ::DynamicAny::DynUnion_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynUnion::_duplicate (p.ptr ());
-  return *this;
-}
-
-DynamicAny::DynUnion_out &
-DynamicAny::DynUnion_out::operator= (DynUnion_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynUnion_out::operator ::DynamicAny::DynUnion_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynUnion_ptr &
-DynamicAny::DynUnion_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 DynamicAny::DynUnion::DynUnion (void)
 {}
@@ -2095,7 +1264,7 @@ DynamicAny::DynUnion::_narrow (
   return DynUnion::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-DynamicAny::DynUnion_ptr 
+DynamicAny::DynUnion_ptr
 DynamicAny::DynUnion::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2105,7 +1274,7 @@ DynamicAny::DynUnion::_unchecked_narrow (
     {
       return DynUnion::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           DynUnion_ptr,
@@ -2125,14 +1294,14 @@ DynamicAny::DynUnion::_duplicate (DynUnion_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::DynamicAny, DynUnion)::_tao_class_id)
@@ -2165,12 +1334,12 @@ void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2179,1684 +1348,956 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const
   return "IDL:omg.org/DynamicAny/DynUnion:1.0";
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CS_
-
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Any* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::Any *old =
-        ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::Any *tmp =
-    ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-  _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void)
+CORBA::Boolean
+DynamicAny::DynUnion::marshal (TAO_OutputCDR &)
 {
-  this->_deallocate_buffer ();
+  return 0;
 }
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMICANY_ANYSEQ_CS_)
-#define _DYNAMICANY_ANYSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// DynamicAny::AnySeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 DynamicAny::AnySeq::AnySeq (void)
 {}
 
 DynamicAny::AnySeq::AnySeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_AnySeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Any>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::Any
+      >
+    (max)
 {}
 
 DynamicAny::AnySeq::AnySeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::Any *buffer,
+    CORBA::Any* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_AnySeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Any>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::Any
+      >
+    (max, length, buffer, release)
 {}
 
 DynamicAny::AnySeq::AnySeq (const AnySeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_DynamicAny_AnySeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Any>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::Any
+      >
+    (seq)
 {}
 
-DynamicAny::AnySeq::~AnySeq (void) // dtor
+DynamicAny::AnySeq::~AnySeq (void)
 {}
 
 
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_allocate_buffer (CORBA::ULong length)
-{
-  DynamicAny::DynAny **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = DynamicAny::DynAny::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = DynamicAny::DynAny::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::~_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void)
-{
-  this->_deallocate_buffer ();
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-void
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = DynamicAny::DynAny::_nil ();
-    }
-}
+template class
+  TAO_VarSeq_Var_T<
+      AnySeq,
+      CORBA::Any
+    >;
 
-void 
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, target);
-  *tmp = DynamicAny::DynAny::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
+template class
+  TAO_Seq_Out_T<
+      AnySeq,
+      AnySeq_var,
+      CORBA::Any
+    >;
 
-CORBA::Object*
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_upcast (void *src) const
-{
-  DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, src);
-  return *tmp;
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      AnySeq, \
+      CORBA::Any \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      AnySeq, \
+      AnySeq_var, \
+      CORBA::Any \
+    >
 
-#if !defined (_DYNAMICANY_DYNANYSEQ_CS_)
-#define _DYNAMICANY_DYNANYSEQ_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// DynamicAny::DynAnySeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 DynamicAny::DynAnySeq::DynAnySeq (void)
 {}
 
 DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Object_Sequence<
+        DynamicAny::DynAny,
+        DynamicAny::DynAny_var,
+        DynamicAny::tao_DynAny_life,
+        DynamicAny::tao_DynAny_cast
+      >
+    (max)
 {}
 
 DynamicAny::DynAnySeq::DynAnySeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    DynamicAny::DynAny_ptr *buffer,
+    DynamicAny::DynAny_ptr* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Object_Sequence<
+        DynamicAny::DynAny,
+        DynamicAny::DynAny_var,
+        DynamicAny::tao_DynAny_life,
+        DynamicAny::tao_DynAny_cast
+      >
+    (max, length, buffer, release)
 {}
 
 DynamicAny::DynAnySeq::DynAnySeq (const DynAnySeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Object_Sequence<
+        DynamicAny::DynAny,
+        DynamicAny::DynAny_var,
+        DynamicAny::tao_DynAny_life,
+        DynamicAny::tao_DynAny_cast
+      >
+    (seq)
 {}
 
-DynamicAny::DynAnySeq::~DynAnySeq (void) // dtor
+DynamicAny::DynAnySeq::~DynAnySeq (void)
 {}
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int DynamicAny::DynSequence::_tao_class_id = 0;
-
-DynamicAny::DynSequence_ptr
-tao_DynamicAny_DynSequence_duplicate (
-    DynamicAny::DynSequence_ptr p
-  )
-{
-  return DynamicAny::DynSequence::_duplicate (p);
-}
-
-void
-tao_DynamicAny_DynSequence_release (
-    DynamicAny::DynSequence_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynSequence_ptr
-tao_DynamicAny_DynSequence_nil (
-    void
-  )
-{
-  return DynamicAny::DynSequence::_nil ();
-}
-
-DynamicAny::DynSequence_ptr
-tao_DynamicAny_DynSequence_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_DynamicAny_DynSequence_upcast (
-    void *src
-  )
-{
-  DynamicAny::DynSequence **tmp =
-    ACE_static_cast (DynamicAny::DynSequence **, src);
-  return *tmp;
-}
-
-CORBA::Boolean
-tao_DynamicAny_DynSequence_marshal (
-    DynamicAny::DynSequence_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynSequence_var
-// *************************************************************
-
-DynamicAny::DynSequence_var::DynSequence_var (void)
-  : ptr_ (DynSequence::_nil ())
-{}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::ptr (void) const
-{
-  return this->ptr_;
-}
+template class
+  TAO_Object_Manager<
+      DynamicAny::DynAny,
+      DynamicAny::DynAny_var,
+      DynamicAny::tao_DynAny_life
+    >;
 
-DynamicAny::DynSequence_var::DynSequence_var (const ::DynamicAny::DynSequence_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynSequence::_duplicate (p.ptr ()))
-{}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-DynamicAny::DynSequence_var::~DynSequence_var (void)
-{
-  CORBA::release (this->ptr_);
-}
+# pragma instantiate \
+    TAO_Object_Manager< \
+        DynamicAny::DynAny, \
+        DynamicAny::DynAny_var, \
+        DynamicAny::tao_DynAny_life \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      DynamicAny::DynAnySeq,
+      TAO_Object_Manager<
+          DynamicAny::DynAny,
+          DynamicAny::DynAny_var,
+          DynamicAny::tao_DynAny_life
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      DynamicAny::DynAnySeq,
+      DynamicAny::DynAnySeq_var,
+      TAO_Object_Manager<
+          DynamicAny::DynAny,
+          DynamicAny::DynAny_var,
+          DynamicAny::tao_DynAny_life
+        >
+    >;
 
-DynamicAny::DynSequence_var &
-DynamicAny::DynSequence_var::operator= (DynSequence_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-DynamicAny::DynSequence_var &
-DynamicAny::DynSequence_var::operator= (const ::DynamicAny::DynSequence_var &p)
-{
-  if (this != &p)
+# pragma instantiate \
+    TAO_MngSeq_Var_T< \
+        DynamicAny::DynAnySeq, \
+        TAO_Object_Manager< \
+            DynamicAny::DynAny, \
+            DynamicAny::DynAny_var, \
+            DynamicAny::tao_DynAny_life \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        DynamicAny::DynAnySeq, \
+        DynamicAny::DynAnySeq_var, \
+        TAO_Object_Manager< \
+            DynamicAny::DynAny, \
+            DynamicAny::DynAny_var, \
+            DynamicAny::tao_DynAny_life \
+          > \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+
+  int DynamicAny::DynSequence::_tao_class_id = 0;
+
+  DynamicAny::DynSequence_ptr
+  DynamicAny::tao_DynSequence_life::tao_duplicate (
+      DynamicAny::DynSequence_ptr p
+    )
   {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynSequence::_duplicate (p.ptr ());
+    return DynamicAny::DynSequence::_duplicate (p);
   }
-  return *this;
-}
-
-DynamicAny::DynSequence_var::operator const ::DynamicAny::DynSequence_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynSequence_ptr &
-DynamicAny::DynSequence_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynSequence_ptr &
-DynamicAny::DynSequence_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynSequence_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
-  return val;
-}
-
-::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::tao_duplicate (DynSequence_ptr p)
-{
-  return ::DynamicAny::DynSequence::_duplicate (p);
-}
 
-void
-DynamicAny::DynSequence_var::tao_release (DynSequence_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::tao_nil (void)
-{
-  return ::DynamicAny::DynSequence::_nil ();
-}
-
-::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-DynamicAny::DynSequence_var::tao_upcast (void *src)
-{
-  DynSequence **tmp =
-    ACE_static_cast (DynSequence **, src);
-  return *tmp;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynSequence_out
-// *************************************************************
-
-DynamicAny::DynSequence_out::DynSequence_out (DynSequence_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
-}
-
-DynamicAny::DynSequence_out::DynSequence_out (DynSequence_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
-}
-
-DynamicAny::DynSequence_out::DynSequence_out (const ::DynamicAny::DynSequence_out &p)
-  : ptr_ (ACE_const_cast (DynSequence_out &, p).ptr_)
-{}
-
-::DynamicAny::DynSequence_out &
-DynamicAny::DynSequence_out::operator= (const ::DynamicAny::DynSequence_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynSequence_out&, p).ptr_;
-  return *this;
-}
-
-DynamicAny::DynSequence_out &
-DynamicAny::DynSequence_out::operator= (const ::DynamicAny::DynSequence_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynSequence::_duplicate (p.ptr ());
-  return *this;
-}
-
-DynamicAny::DynSequence_out &
-DynamicAny::DynSequence_out::operator= (DynSequence_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-DynamicAny::DynSequence_out::operator ::DynamicAny::DynSequence_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynSequence_ptr &
-DynamicAny::DynSequence_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_out::operator-> (void)
-{
-  return this->ptr_;
-}
+  void
+  DynamicAny::tao_DynSequence_life::tao_release (
+      DynamicAny::DynSequence_ptr p
+    )
+  {
+    CORBA::release (p);
+  }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+  DynamicAny::DynSequence_ptr
+  DynamicAny::tao_DynSequence_life::tao_nil (
+      void
+    )
+  {
+    return DynamicAny::DynSequence::_nil ();
+  }
 
-DynamicAny::DynSequence::DynSequence (void)
-{}
+  CORBA::Boolean
+  DynamicAny::tao_DynSequence_life::tao_marshal (
+      DynamicAny::DynSequence_ptr p,
+      TAO_OutputCDR &cdr
+    )
+  {
+    return p->marshal (cdr);
+  }
 
-DynamicAny::DynSequence::~DynSequence (void)
-{}
+  DynamicAny::DynSequence_ptr
+  DynamicAny::tao_DynSequence_cast::tao_narrow (
+      CORBA::Object *p
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER);
+  }
 
-DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DynSequence::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
+  CORBA::Object *
+  DynamicAny::tao_DynSequence_cast::tao_upcast (
+      void *src
+    )
+  {
+    DynamicAny::DynSequence **tmp =
+      ACE_static_cast (DynamicAny::DynSequence **, src);
+    return *tmp;
+  }
 
-DynamicAny::DynSequence_ptr 
-DynamicAny::DynSequence::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return DynSequence::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          DynSequence_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptr_arith_t,
-                  &DynSequence::_tao_class_id
-                )
-            )
-        );
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class
+      TAO_Objref_Var_T<
+          DynamicAny::DynSequence,
+          DynamicAny::tao_DynSequence_life
+        >;
+    template class
+      TAO_Objref_Out_T<
+          DynamicAny::DynSequence,
+          DynamicAny::tao_DynSequence_life
+        >;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  # pragma instantiate \
+      TAO_Objref_Var_T< \
+          DynamicAny::DynSequence, \
+          DynamicAny::tao_DynSequence_life \
+        >
+  # pragma instantiate \
+      TAO_Objref_Out_T< \
+          DynamicAny::DynSequence, \
+          DynamicAny::tao_DynSequence_life \
+        >
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+
+  DynamicAny::DynSequence::DynSequence (void)
+  {}
+
+  DynamicAny::DynSequence::~DynSequence (void)
+  {}
+
+  DynamicAny::DynSequence_ptr
+  DynamicAny::DynSequence::_narrow (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return DynSequence::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  }
 
-DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
+  DynamicAny::DynSequence_ptr
+  DynamicAny::DynSequence::_unchecked_narrow (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL_NOT_USED
+    )
+  {
+    if (CORBA::is_nil (obj))
+      {
+        return DynSequence::_nil ();
+      }
 
-void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &ACE_NESTED_CLASS (::DynamicAny, DynSequence)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
-            )
-    {
-      retv =
+    return
         ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                DynamicAny::DynAny_ptr,
-                this
+            DynSequence_ptr,
+            obj->_tao_QueryInterface (
+                ACE_reinterpret_cast (
+                    ptr_arith_t,
+                    &DynSequence::_tao_class_id
+                  )
               )
           );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
-const char* DynamicAny::DynSequence::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynSequence:1.0";
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int DynamicAny::DynArray::_tao_class_id = 0;
-
-DynamicAny::DynArray_ptr
-tao_DynamicAny_DynArray_duplicate (
-    DynamicAny::DynArray_ptr p
-  )
-{
-  return DynamicAny::DynArray::_duplicate (p);
-}
-
-void
-tao_DynamicAny_DynArray_release (
-    DynamicAny::DynArray_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynArray_ptr
-tao_DynamicAny_DynArray_nil (
-    void
-  )
-{
-  return DynamicAny::DynArray::_nil ();
-}
-
-DynamicAny::DynArray_ptr
-tao_DynamicAny_DynArray_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_DynamicAny_DynArray_upcast (
-    void *src
-  )
-{
-  DynamicAny::DynArray **tmp =
-    ACE_static_cast (DynamicAny::DynArray **, src);
-  return *tmp;
-}
-
-CORBA::Boolean
-tao_DynamicAny_DynArray_marshal (
-    DynamicAny::DynArray_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynArray_var
-// *************************************************************
-
-DynamicAny::DynArray_var::DynArray_var (void)
-  : ptr_ (DynArray::_nil ())
-{}
+  }
 
-::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::ptr (void) const
-{
-  return this->ptr_;
-}
+  DynamicAny::DynSequence_ptr
+  DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj)
+  {
+    if (! CORBA::is_nil (obj))
+      {
+        obj->_add_ref ();
+      }
 
-DynamicAny::DynArray_var::DynArray_var (const ::DynamicAny::DynArray_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynArray::_duplicate (p.ptr ()))
-{}
+    return obj;
+  }
 
-DynamicAny::DynArray_var::~DynArray_var (void)
-{
-  CORBA::release (this->ptr_);
-}
+  void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type)
+  {
+    void *retv = 0;
 
-DynamicAny::DynArray_var &
-DynamicAny::DynArray_var::operator= (DynArray_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
+    if (type == ACE_reinterpret_cast (
+                ptr_arith_t,
+                &ACE_NESTED_CLASS (::DynamicAny, DynSequence)::_tao_class_id)
+              )
+      {
+        retv = ACE_reinterpret_cast (void*, this);
+      }
+    else if (type == ACE_reinterpret_cast (
+                ptr_arith_t,
+                &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+              )
+      {
+        retv =
+          ACE_reinterpret_cast (
+              void *,
+              ACE_static_cast (
+                  DynamicAny::DynAny_ptr,
+                  this
+                )
+            );
+      }
+    else if (type == ACE_reinterpret_cast (
+                 ptr_arith_t,
+                 &CORBA::Object::_tao_class_id)
+               )
+      {
+        retv =
+          ACE_reinterpret_cast (
+              void *,
+              ACE_static_cast (CORBA::Object_ptr, this)
+            );
+      }
+
+    if (retv != 0)
+      {
+        this->_add_ref ();
+      }
+
+    return retv;
+  }
 
-DynamicAny::DynArray_var &
-DynamicAny::DynArray_var::operator= (const ::DynamicAny::DynArray_var &p)
-{
-  if (this != &p)
+  const char* DynamicAny::DynSequence::_interface_repository_id (void) const
   {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynArray::_duplicate (p.ptr ());
+    return "IDL:omg.org/DynamicAny/DynSequence:1.0";
   }
-  return *this;
-}
-
-DynamicAny::DynArray_var::operator const ::DynamicAny::DynArray_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::in (void) const
-{
-  return this->ptr_;
-}
 
-::DynamicAny::DynArray_ptr &
-DynamicAny::DynArray_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynArray_ptr &
-DynamicAny::DynArray_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynArray::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynArray_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynArray::_nil ();
-  return val;
-}
-
-::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::tao_duplicate (DynArray_ptr p)
-{
-  return ::DynamicAny::DynArray::_duplicate (p);
-}
-
-void
-DynamicAny::DynArray_var::tao_release (DynArray_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::tao_nil (void)
-{
-  return ::DynamicAny::DynArray::_nil ();
-}
-
-::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-DynamicAny::DynArray_var::tao_upcast (void *src)
-{
-  DynArray **tmp =
-    ACE_static_cast (DynArray **, src);
-  return *tmp;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynArray_out
-// *************************************************************
-
-DynamicAny::DynArray_out::DynArray_out (DynArray_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynArray::_nil ();
-}
-
-DynamicAny::DynArray_out::DynArray_out (DynArray_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynArray::_nil ();
-}
-
-DynamicAny::DynArray_out::DynArray_out (const ::DynamicAny::DynArray_out &p)
-  : ptr_ (ACE_const_cast (DynArray_out &, p).ptr_)
-{}
-
-::DynamicAny::DynArray_out &
-DynamicAny::DynArray_out::operator= (const ::DynamicAny::DynArray_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynArray_out&, p).ptr_;
-  return *this;
-}
-
-DynamicAny::DynArray_out &
-DynamicAny::DynArray_out::operator= (const ::DynamicAny::DynArray_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynArray::_duplicate (p.ptr ());
-  return *this;
-}
+  CORBA::Boolean
+  DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
+  {
+    return 0;
+  }
 
-DynamicAny::DynArray_out &
-DynamicAny::DynArray_out::operator= (DynArray_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-DynamicAny::DynArray_out::operator ::DynamicAny::DynArray_ptr &() // cast
-{
-  return this->ptr_;
-}
+  int DynamicAny::DynArray::_tao_class_id = 0;
 
-::DynamicAny::DynArray_ptr &
-DynamicAny::DynArray_out::ptr (void)
-{
-  return this->ptr_;
-}
+  DynamicAny::DynArray_ptr
+  DynamicAny::tao_DynArray_life::tao_duplicate (
+      DynamicAny::DynArray_ptr p
+    )
+  {
+    return DynamicAny::DynArray::_duplicate (p);
+  }
 
-::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_out::operator-> (void)
-{
-  return this->ptr_;
-}
+  void
+  DynamicAny::tao_DynArray_life::tao_release (
+      DynamicAny::DynArray_ptr p
+    )
+  {
+    CORBA::release (p);
+  }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+  DynamicAny::DynArray_ptr
+  DynamicAny::tao_DynArray_life::tao_nil (
+      void
+    )
+  {
+    return DynamicAny::DynArray::_nil ();
+  }
 
-DynamicAny::DynArray::DynArray (void)
-{}
+  CORBA::Boolean
+  DynamicAny::tao_DynArray_life::tao_marshal (
+      DynamicAny::DynArray_ptr p,
+      TAO_OutputCDR &cdr
+    )
+  {
+    return p->marshal (cdr);
+  }
 
-DynamicAny::DynArray::~DynArray (void)
-{}
+  DynamicAny::DynArray_ptr
+  DynamicAny::tao_DynArray_cast::tao_narrow (
+      CORBA::Object *p
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER);
+  }
 
-DynamicAny::DynArray_ptr
-DynamicAny::DynArray::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DynArray::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
+  CORBA::Object *
+  DynamicAny::tao_DynArray_cast::tao_upcast (
+      void *src
+    )
+  {
+    DynamicAny::DynArray **tmp =
+      ACE_static_cast (DynamicAny::DynArray **, src);
+    return *tmp;
+  }
 
-DynamicAny::DynArray_ptr 
-DynamicAny::DynArray::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return DynArray::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          DynArray_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptr_arith_t,
-                  &DynArray::_tao_class_id
-                )
-            )
-        );
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class
+      TAO_Objref_Var_T<
+          DynamicAny::DynArray,
+          DynamicAny::tao_DynArray_life
+        >;
+    template class
+      TAO_Objref_Out_T<
+          DynamicAny::DynArray,
+          DynamicAny::tao_DynArray_life
+        >;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  # pragma instantiate \
+      TAO_Objref_Var_T< \
+          DynamicAny::DynArray, \
+          DynamicAny::tao_DynArray_life \
+        >
+  # pragma instantiate \
+      TAO_Objref_Out_T< \
+          DynamicAny::DynArray, \
+          DynamicAny::tao_DynArray_life \
+        >
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+
+  DynamicAny::DynArray::DynArray (void)
+  {}
+
+  DynamicAny::DynArray::~DynArray (void)
+  {}
+
+  DynamicAny::DynArray_ptr
+  DynamicAny::DynArray::_narrow (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return DynArray::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  }
 
-DynamicAny::DynArray_ptr
-DynamicAny::DynArray::_duplicate (DynArray_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
+  DynamicAny::DynArray_ptr
+  DynamicAny::DynArray::_unchecked_narrow (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL_NOT_USED
+    )
+  {
+    if (CORBA::is_nil (obj))
+      {
+        return DynArray::_nil ();
+      }
 
-void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &ACE_NESTED_CLASS (::DynamicAny, DynArray)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
-            )
-    {
-      retv =
+    return
         ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                DynamicAny::DynAny_ptr,
-                this
+            DynArray_ptr,
+            obj->_tao_QueryInterface (
+                ACE_reinterpret_cast (
+                    ptr_arith_t,
+                    &DynArray::_tao_class_id
+                  )
               )
           );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
-const char* DynamicAny::DynArray::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynArray:1.0";
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int DynamicAny::DynValue::_tao_class_id = 0;
-
-DynamicAny::DynValue_ptr
-tao_DynamicAny_DynValue_duplicate (
-    DynamicAny::DynValue_ptr p
-  )
-{
-  return DynamicAny::DynValue::_duplicate (p);
-}
-
-void
-tao_DynamicAny_DynValue_release (
-    DynamicAny::DynValue_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynValue_ptr
-tao_DynamicAny_DynValue_nil (
-    void
-  )
-{
-  return DynamicAny::DynValue::_nil ();
-}
-
-DynamicAny::DynValue_ptr
-tao_DynamicAny_DynValue_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_DynamicAny_DynValue_upcast (
-    void *src
-  )
-{
-  DynamicAny::DynValue **tmp =
-    ACE_static_cast (DynamicAny::DynValue **, src);
-  return *tmp;
-}
-
-CORBA::Boolean
-tao_DynamicAny_DynValue_marshal (
-    DynamicAny::DynValue_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynValue_var
-// *************************************************************
-
-DynamicAny::DynValue_var::DynValue_var (void)
-  : ptr_ (DynValue::_nil ())
-{}
+  }
 
-::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::ptr (void) const
-{
-  return this->ptr_;
-}
+  DynamicAny::DynArray_ptr
+  DynamicAny::DynArray::_duplicate (DynArray_ptr obj)
+  {
+    if (! CORBA::is_nil (obj))
+      {
+        obj->_add_ref ();
+      }
 
-DynamicAny::DynValue_var::DynValue_var (const ::DynamicAny::DynValue_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynValue::_duplicate (p.ptr ()))
-{}
+    return obj;
+  }
 
-DynamicAny::DynValue_var::~DynValue_var (void)
-{
-  CORBA::release (this->ptr_);
-}
+  void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type)
+  {
+    void *retv = 0;
 
-DynamicAny::DynValue_var &
-DynamicAny::DynValue_var::operator= (DynValue_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
+    if (type == ACE_reinterpret_cast (
+                ptr_arith_t,
+                &ACE_NESTED_CLASS (::DynamicAny, DynArray)::_tao_class_id)
+              )
+      {
+        retv = ACE_reinterpret_cast (void*, this);
+      }
+    else if (type == ACE_reinterpret_cast (
+                ptr_arith_t,
+                &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+              )
+      {
+        retv =
+          ACE_reinterpret_cast (
+              void *,
+              ACE_static_cast (
+                  DynamicAny::DynAny_ptr,
+                  this
+                )
+            );
+      }
+    else if (type == ACE_reinterpret_cast (
+                 ptr_arith_t,
+                 &CORBA::Object::_tao_class_id)
+               )
+      {
+        retv =
+          ACE_reinterpret_cast (
+              void *,
+              ACE_static_cast (CORBA::Object_ptr, this)
+            );
+      }
+
+    if (retv != 0)
+      {
+        this->_add_ref ();
+      }
+
+    return retv;
+  }
 
-DynamicAny::DynValue_var &
-DynamicAny::DynValue_var::operator= (const ::DynamicAny::DynValue_var &p)
-{
-  if (this != &p)
+  const char* DynamicAny::DynArray::_interface_repository_id (void) const
   {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynValue::_duplicate (p.ptr ());
+    return "IDL:omg.org/DynamicAny/DynArray:1.0";
   }
-  return *this;
-}
-
-DynamicAny::DynValue_var::operator const ::DynamicAny::DynValue_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynValue_ptr &
-DynamicAny::DynValue_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynValue_ptr &
-DynamicAny::DynValue_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynValue::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynValue_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynValue::_nil ();
-  return val;
-}
-
-::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::tao_duplicate (DynValue_ptr p)
-{
-  return ::DynamicAny::DynValue::_duplicate (p);
-}
-
-void
-DynamicAny::DynValue_var::tao_release (DynValue_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::tao_nil (void)
-{
-  return ::DynamicAny::DynValue::_nil ();
-}
-
-::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
 
-CORBA::Object *
-DynamicAny::DynValue_var::tao_upcast (void *src)
-{
-  DynValue **tmp =
-    ACE_static_cast (DynValue **, src);
-  return *tmp;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynValue_out
-// *************************************************************
-
-DynamicAny::DynValue_out::DynValue_out (DynValue_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynValue::_nil ();
-}
-
-DynamicAny::DynValue_out::DynValue_out (DynValue_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynValue::_nil ();
-}
-
-DynamicAny::DynValue_out::DynValue_out (const ::DynamicAny::DynValue_out &p)
-  : ptr_ (ACE_const_cast (DynValue_out &, p).ptr_)
-{}
-
-::DynamicAny::DynValue_out &
-DynamicAny::DynValue_out::operator= (const ::DynamicAny::DynValue_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynValue_out&, p).ptr_;
-  return *this;
-}
-
-DynamicAny::DynValue_out &
-DynamicAny::DynValue_out::operator= (const ::DynamicAny::DynValue_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynValue::_duplicate (p.ptr ());
-  return *this;
-}
+  CORBA::Boolean
+  DynamicAny::DynArray::marshal (TAO_OutputCDR &)
+  {
+    return 0;
+  }
 
-DynamicAny::DynValue_out &
-DynamicAny::DynValue_out::operator= (DynValue_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-DynamicAny::DynValue_out::operator ::DynamicAny::DynValue_ptr &() // cast
-{
-  return this->ptr_;
-}
+  int DynamicAny::DynValue::_tao_class_id = 0;
 
-::DynamicAny::DynValue_ptr &
-DynamicAny::DynValue_out::ptr (void)
-{
-  return this->ptr_;
-}
+  DynamicAny::DynValue_ptr
+  DynamicAny::tao_DynValue_life::tao_duplicate (
+      DynamicAny::DynValue_ptr p
+    )
+  {
+    return DynamicAny::DynValue::_duplicate (p);
+  }
 
-::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_out::operator-> (void)
-{
-  return this->ptr_;
-}
+  void
+  DynamicAny::tao_DynValue_life::tao_release (
+      DynamicAny::DynValue_ptr p
+    )
+  {
+    CORBA::release (p);
+  }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+  DynamicAny::DynValue_ptr
+  DynamicAny::tao_DynValue_life::tao_nil (
+      void
+    )
+  {
+    return DynamicAny::DynValue::_nil ();
+  }
 
-DynamicAny::DynValue::DynValue (void)
-{}
+  CORBA::Boolean
+  DynamicAny::tao_DynValue_life::tao_marshal (
+      DynamicAny::DynValue_ptr p,
+      TAO_OutputCDR &cdr
+    )
+  {
+    return p->marshal (cdr);
+  }
 
-DynamicAny::DynValue::~DynValue (void)
-{}
+  DynamicAny::DynValue_ptr
+  DynamicAny::tao_DynValue_cast::tao_narrow (
+      CORBA::Object *p
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER);
+  }
 
-DynamicAny::DynValue_ptr
-DynamicAny::DynValue::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DynValue::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
+  CORBA::Object *
+  DynamicAny::tao_DynValue_cast::tao_upcast (
+      void *src
+    )
+  {
+    DynamicAny::DynValue **tmp =
+      ACE_static_cast (DynamicAny::DynValue **, src);
+    return *tmp;
+  }
 
-DynamicAny::DynValue_ptr 
-DynamicAny::DynValue::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return DynValue::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          DynValue_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptr_arith_t,
-                  &DynValue::_tao_class_id
-                )
-            )
-        );
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class
+      TAO_Objref_Var_T<
+          DynamicAny::DynValue,
+          DynamicAny::tao_DynValue_life
+        >;
+    template class
+      TAO_Objref_Out_T<
+          DynamicAny::DynValue,
+          DynamicAny::tao_DynValue_life
+        >;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  # pragma instantiate \
+      TAO_Objref_Var_T< \
+          DynamicAny::DynValue, \
+          DynamicAny::tao_DynValue_life \
+        >
+  # pragma instantiate \
+      TAO_Objref_Out_T< \
+          DynamicAny::DynValue, \
+          DynamicAny::tao_DynValue_life \
+        >
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+
+  DynamicAny::DynValue::DynValue (void)
+  {}
+
+  DynamicAny::DynValue::~DynValue (void)
+  {}
+
+  DynamicAny::DynValue_ptr
+  DynamicAny::DynValue::_narrow (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return DynValue::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  }
 
-DynamicAny::DynValue_ptr
-DynamicAny::DynValue::_duplicate (DynValue_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
+  DynamicAny::DynValue_ptr
+  DynamicAny::DynValue::_unchecked_narrow (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL_NOT_USED
+    )
+  {
+    if (CORBA::is_nil (obj))
+      {
+        return DynValue::_nil ();
+      }
 
-void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &ACE_NESTED_CLASS (::DynamicAny, DynValue)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
-            )
-    {
-      retv =
+    return
         ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                DynamicAny::DynAny_ptr,
-                this
+            DynValue_ptr,
+            obj->_tao_QueryInterface (
+                ACE_reinterpret_cast (
+                    ptr_arith_t,
+                    &DynValue::_tao_class_id
+                  )
               )
           );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
-const char* DynamicAny::DynValue::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynValue:1.0";
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int DynamicAny::DynAnyFactory::_tao_class_id = 0;
-
-DynamicAny::DynAnyFactory_ptr
-tao_DynamicAny_DynAnyFactory_duplicate (
-    DynamicAny::DynAnyFactory_ptr p
-  )
-{
-  return DynamicAny::DynAnyFactory::_duplicate (p);
-}
-
-void
-tao_DynamicAny_DynAnyFactory_release (
-    DynamicAny::DynAnyFactory_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-DynamicAny::DynAnyFactory_ptr
-tao_DynamicAny_DynAnyFactory_nil (
-    void
-  )
-{
-  return DynamicAny::DynAnyFactory::_nil ();
-}
-
-DynamicAny::DynAnyFactory_ptr
-tao_DynamicAny_DynAnyFactory_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_DynamicAny_DynAnyFactory_upcast (
-    void *src
-  )
-{
-  DynamicAny::DynAnyFactory **tmp =
-    ACE_static_cast (DynamicAny::DynAnyFactory **, src);
-  return *tmp;
-}
-
-CORBA::Boolean
-tao_DynamicAny_DynAnyFactory_marshal (
-    DynamicAny::DynAnyFactory_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// DynamicAny::DynAnyFactory_var
-// *************************************************************
-
-DynamicAny::DynAnyFactory_var::DynAnyFactory_var (void)
-  : ptr_ (DynAnyFactory::_nil ())
-{}
+  }
 
-::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
+  DynamicAny::DynValue_ptr
+  DynamicAny::DynValue::_duplicate (DynValue_ptr obj)
+  {
+    if (! CORBA::is_nil (obj))
+      {
+        obj->_add_ref ();
+      }
 
-DynamicAny::DynAnyFactory_var::DynAnyFactory_var (const ::DynamicAny::DynAnyFactory_var &p)
-  : TAO_Base_var (),
-    ptr_ (DynAnyFactory::_duplicate (p.ptr ()))
-{}
+    return obj;
+  }
 
-DynamicAny::DynAnyFactory_var::~DynAnyFactory_var (void)
-{
-  CORBA::release (this->ptr_);
-}
+  void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type)
+  {
+    void *retv = 0;
 
-DynamicAny::DynAnyFactory_var &
-DynamicAny::DynAnyFactory_var::operator= (DynAnyFactory_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
+    if (type == ACE_reinterpret_cast (
+                ptr_arith_t,
+                &ACE_NESTED_CLASS (::DynamicAny, DynValue)::_tao_class_id)
+              )
+      {
+        retv = ACE_reinterpret_cast (void*, this);
+      }
+    else if (type == ACE_reinterpret_cast (
+                ptr_arith_t,
+                &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id)
+              )
+      {
+        retv =
+          ACE_reinterpret_cast (
+              void *,
+              ACE_static_cast (
+                  DynamicAny::DynAny_ptr,
+                  this
+                )
+            );
+      }
+    else if (type == ACE_reinterpret_cast (
+                 ptr_arith_t,
+                 &CORBA::Object::_tao_class_id)
+               )
+      {
+        retv =
+          ACE_reinterpret_cast (
+              void *,
+              ACE_static_cast (CORBA::Object_ptr, this)
+            );
+      }
+
+    if (retv != 0)
+      {
+        this->_add_ref ();
+      }
+
+    return retv;
+  }
 
-DynamicAny::DynAnyFactory_var &
-DynamicAny::DynAnyFactory_var::operator= (const ::DynamicAny::DynAnyFactory_var &p)
-{
-  if (this != &p)
+  const char* DynamicAny::DynValue::_interface_repository_id (void) const
   {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynAnyFactory::_duplicate (p.ptr ());
+    return "IDL:omg.org/DynamicAny/DynValue:1.0";
   }
-  return *this;
-}
-
-DynamicAny::DynAnyFactory_var::operator const ::DynamicAny::DynAnyFactory_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAnyFactory_ptr &
-DynamicAny::DynAnyFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::DynamicAny::DynAnyFactory_ptr &
-DynamicAny::DynAnyFactory_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
-  return this->ptr_;
-}
-
-::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynAnyFactory_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
-  return val;
-}
-
-::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::tao_duplicate (DynAnyFactory_ptr p)
-{
-  return ::DynamicAny::DynAnyFactory::_duplicate (p);
-}
-
-void
-DynamicAny::DynAnyFactory_var::tao_release (DynAnyFactory_ptr p)
-{
-  CORBA::release (p);
-}
-
-::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::tao_nil (void)
-{
-  return ::DynamicAny::DynAnyFactory::_nil ();
-}
-
-::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
 
-CORBA::Object *
-DynamicAny::DynAnyFactory_var::tao_upcast (void *src)
-{
-  DynAnyFactory **tmp =
-    ACE_static_cast (DynAnyFactory **, src);
-  return *tmp;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// DynamicAny::DynAnyFactory_out
-// *************************************************************
+  CORBA::Boolean
+  DynamicAny::DynValue::marshal (TAO_OutputCDR &)
+  {
+    return 0;
+  }
 
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
-}
+  int DynamicAny::DynAnyFactory::_tao_class_id = 0;
 
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (const ::DynamicAny::DynAnyFactory_out &p)
-  : ptr_ (ACE_const_cast (DynAnyFactory_out &, p).ptr_)
-{}
+  DynamicAny::DynAnyFactory_ptr
+  DynamicAny::tao_DynAnyFactory_life::tao_duplicate (
+      DynamicAny::DynAnyFactory_ptr p
+    )
+  {
+    return DynamicAny::DynAnyFactory::_duplicate (p);
+  }
 
-::DynamicAny::DynAnyFactory_out &
-DynamicAny::DynAnyFactory_out::operator= (const ::DynamicAny::DynAnyFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynAnyFactory_out&, p).ptr_;
-  return *this;
-}
+  void
+  DynamicAny::tao_DynAnyFactory_life::tao_release (
+      DynamicAny::DynAnyFactory_ptr p
+    )
+  {
+    CORBA::release (p);
+  }
 
-DynamicAny::DynAnyFactory_out &
-DynamicAny::DynAnyFactory_out::operator= (const ::DynamicAny::DynAnyFactory_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_duplicate (p.ptr ());
-  return *this;
-}
+  DynamicAny::DynAnyFactory_ptr
+  DynamicAny::tao_DynAnyFactory_life::tao_nil (
+      void
+    )
+  {
+    return DynamicAny::DynAnyFactory::_nil ();
+  }
 
-DynamicAny::DynAnyFactory_out &
-DynamicAny::DynAnyFactory_out::operator= (DynAnyFactory_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+  CORBA::Boolean
+  DynamicAny::tao_DynAnyFactory_life::tao_marshal (
+      DynamicAny::DynAnyFactory_ptr p,
+      TAO_OutputCDR &cdr
+    )
+  {
+    return p->marshal (cdr);
+  }
 
-DynamicAny::DynAnyFactory_out::operator ::DynamicAny::DynAnyFactory_ptr &() // cast
-{
-  return this->ptr_;
-}
+  DynamicAny::DynAnyFactory_ptr
+  DynamicAny::tao_DynAnyFactory_cast::tao_narrow (
+      CORBA::Object *p
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
+  }
 
-::DynamicAny::DynAnyFactory_ptr &
-DynamicAny::DynAnyFactory_out::ptr (void)
-{
-  return this->ptr_;
-}
+  CORBA::Object *
+  DynamicAny::tao_DynAnyFactory_cast::tao_upcast (
+      void *src
+    )
+  {
+    DynamicAny::DynAnyFactory **tmp =
+      ACE_static_cast (DynamicAny::DynAnyFactory **, src);
+    return *tmp;
+  }
 
-::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class
+      TAO_Objref_Var_T<
+          DynamicAny::DynAnyFactory,
+          DynamicAny::tao_DynAnyFactory_life
+        >;
+    template class
+      TAO_Objref_Out_T<
+          DynamicAny::DynAnyFactory,
+          DynamicAny::tao_DynAnyFactory_life
+        >;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  # pragma instantiate \
+      TAO_Objref_Var_T< \
+          DynamicAny::DynAnyFactory, \
+          DynamicAny::tao_DynAnyFactory_life \
+        >
+  # pragma instantiate \
+      TAO_Objref_Out_T< \
+          DynamicAny::DynAnyFactory, \
+          DynamicAny::tao_DynAnyFactory_life \
+        >
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+
+  DynamicAny::DynAnyFactory::DynAnyFactory (void)
+  {}
+
+  DynamicAny::DynAnyFactory::~DynAnyFactory (void)
+  {}
+
+  DynamicAny::DynAnyFactory_ptr
+  DynamicAny::DynAnyFactory::_narrow (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return DynAnyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+  DynamicAny::DynAnyFactory_ptr
+  DynamicAny::DynAnyFactory::_unchecked_narrow (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL_NOT_USED
+    )
+  {
+    if (CORBA::is_nil (obj))
+      {
+        return DynAnyFactory::_nil ();
+      }
 
-DynamicAny::DynAnyFactory::DynAnyFactory (void)
-{}
+    return
+        ACE_reinterpret_cast (
+            DynAnyFactory_ptr,
+            obj->_tao_QueryInterface (
+                ACE_reinterpret_cast (
+                    ptr_arith_t,
+                    &DynAnyFactory::_tao_class_id
+                  )
+              )
+          );
+  }
 
-DynamicAny::DynAnyFactory::~DynAnyFactory (void)
-{}
+  DynamicAny::DynAnyFactory_ptr
+  DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj)
+  {
+    if (! CORBA::is_nil (obj))
+      {
+        obj->_add_ref ();
+      }
 
-DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return DynAnyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
+    return obj;
+  }
 
-DynamicAny::DynAnyFactory_ptr 
-DynamicAny::DynAnyFactory::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return DynAnyFactory::_nil ();
-    }
-  
-  return
-      ACE_reinterpret_cast (
-          DynAnyFactory_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptr_arith_t,
-                  &DynAnyFactory::_tao_class_id
-                )
-            )
-        );
-}
+  void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptr_arith_t type)
+  {
+    void *retv = 0;
 
-DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
+    if (type == ACE_reinterpret_cast (
+                ptr_arith_t,
+                &ACE_NESTED_CLASS (::DynamicAny, DynAnyFactory)::_tao_class_id)
+              )
+      {
+        retv = ACE_reinterpret_cast (void*, this);
+      }
+    else if (type == ACE_reinterpret_cast (
+                 ptr_arith_t,
+                 &CORBA::Object::_tao_class_id)
+               )
+      {
+        retv =
+          ACE_reinterpret_cast (
+              void *,
+              ACE_static_cast (CORBA::Object_ptr, this)
+            );
+      }
+
+    if (retv != 0)
+      {
+        this->_add_ref ();
+      }
+
+    return retv;
+  }
 
-void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
-              &ACE_NESTED_CLASS (::DynamicAny, DynAnyFactory)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
+  const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
+  {
+    return "IDL:omg.org/DynamicAny/DynAnyFactory:1.0";
+  }
 
-const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/DynamicAny/DynAnyFactory:1.0";
-}
+  CORBA::Boolean
+  DynamicAny::DynAnyFactory::marshal (TAO_OutputCDR &)
+  {
+    return 0;
+  }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
-  : CORBA::UserException (
-        "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
-        "InconsistentTypeCode"
-      )
-{
-}
+  DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
+    : CORBA::UserException (
+          "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
+          "InconsistentTypeCode"
+        )
+  {
+  }
 
-DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
-{
-}
+  DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
+  {
+  }
 
-DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
+  DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
+    : CORBA::UserException (
+          _tao_excp._rep_id (),
+          _tao_excp._name ()
+        )
+  {
 }
 
 DynamicAny::DynAnyFactory::InconsistentTypeCode&
@@ -3922,7 +2363,7 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode (
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -3930,20 +2371,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -3953,7 +2394,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -3963,32 +2404,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -3996,20 +2437,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -4019,7 +2460,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -4029,26 +2470,26 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index c21b9584550..89677ec8bf8 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -67,96 +67,59 @@
 
 TAO_NAMESPACE  DynamicAny
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_DYNAMICANY_DYNANY__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNANY__ODDS_N_ENDS_CH_
 
-#if !defined (_DYNAMICANY_DYNANY___PTR_CH_)
-#define _DYNAMICANY_DYNANY___PTR_CH_
-  
   class DynAny;
   typedef DynAny *DynAny_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNANY___VAR_CH_)
-#define _DYNAMICANY_DYNANY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynAny_var : public TAO_Base_var
+  struct tao_DynAny_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynAny,
+        tao_DynAny_life
+      >
+    DynAny_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynAny,
+        tao_DynAny_life
+      >
+    DynAny_out;
+
+  struct TAO_DynamicAny_Export tao_DynAny_life
   {
-  public:
-    DynAny_var (void); // default constructor
-    DynAny_var (DynAny_ptr p) : ptr_ (p) {} 
-    DynAny_var (const DynAny_var &); // copy constructor
-    ~DynAny_var (void); // destructor
-    
-    DynAny_var &operator= (DynAny_ptr);
-    DynAny_var &operator= (const DynAny_var &);
-    DynAny_ptr operator-> (void) const;
-    
-    operator const DynAny_ptr &() const;
-    operator DynAny_ptr &();
-    // in, inout, out, _retn 
-    DynAny_ptr in (void) const;
-    DynAny_ptr &inout (void);
-    DynAny_ptr &out (void);
-    DynAny_ptr _retn (void);
-    DynAny_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynAny_ptr tao_duplicate (DynAny_ptr);
     static void tao_release (DynAny_ptr);
     static DynAny_ptr tao_nil (void);
-    static DynAny_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynAny_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynAny_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynAny_var (const TAO_Base_var &rhs);
-    DynAny_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNANY___OUT_CH_)
-#define _DYNAMICANY_DYNANY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynAny_out
+  struct TAO_DynamicAny_Export tao_DynAny_cast
   {
-  public:
-    DynAny_out (DynAny_ptr &);
-    DynAny_out (DynAny_var &);
-    DynAny_out (const DynAny_out &);
-    DynAny_out &operator= (const DynAny_out &);
-    DynAny_out &operator= (const DynAny_var &);
-    DynAny_out &operator= (DynAny_ptr);
-    operator DynAny_ptr &();
-    DynAny_ptr &ptr (void);
-    DynAny_ptr operator-> (void);
-  
-  private:
-    DynAny_ptr &ptr_;
+    static DynAny_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNANY_CH_)
 #define _DYNAMICANY_DYNANY_CH_
-  
+
   class TAO_DynamicAny_Export DynAny
     : public virtual CORBA::Object
   {
@@ -164,43 +127,43 @@ TAO_NAMESPACE  DynamicAny
     typedef DynAny_ptr _ptr_type;
     typedef DynAny_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynAny_ptr _duplicate (DynAny_ptr obj);
-    
+
     static DynAny_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAny_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAny_ptr _nil (void)
       {
         return (DynAny_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANY_INVALIDVALUE_CH_)
 #define _DYNAMICANY_DYNANY_INVALIDVALUE_CH_
-    
+
     class TAO_DynamicAny_Export InvalidValue : public CORBA::UserException
     {
     public:
-      
+
       InvalidValue (void);
       InvalidValue (const InvalidValue &);
       ~InvalidValue (void);
 
       InvalidValue &operator= (const InvalidValue &);
-      
+
       static InvalidValue *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -212,34 +175,34 @@ TAO_NAMESPACE  DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANY_TYPEMISMATCH_CH_)
 #define _DYNAMICANY_DYNANY_TYPEMISMATCH_CH_
-    
+
     class TAO_DynamicAny_Export TypeMismatch : public CORBA::UserException
     {
     public:
-      
+
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-      
+
       static TypeMismatch *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -251,31 +214,31 @@ TAO_NAMESPACE  DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void assign (
         DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -284,10 +247,10 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void from_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -297,20 +260,20 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * to_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean equal (
         DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -318,30 +281,30 @@ TAO_NAMESPACE  DynamicAny
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_boolean (
         CORBA::Boolean value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -351,10 +314,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_octet (
         CORBA::Octet value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -364,10 +327,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_char (
         CORBA::Char value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -377,10 +340,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_short (
         CORBA::Short value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -390,10 +353,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ushort (
         CORBA::UShort value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -403,10 +366,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_long (
         CORBA::Long value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -416,10 +379,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ulong (
         CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -429,10 +392,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_float (
         CORBA::Float value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -442,10 +405,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_double (
         CORBA::Double value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -455,10 +418,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -468,10 +431,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_reference (
         CORBA::Object_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -481,10 +444,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_typecode (
         CORBA::TypeCode_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -494,10 +457,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_longlong (
         CORBA::LongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -507,10 +470,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ulonglong (
         CORBA::ULongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -520,10 +483,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_longdouble (
         CORBA::LongDouble value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -533,10 +496,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_wchar (
         CORBA::WChar value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -546,10 +509,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_wstring (
         const CORBA::WChar * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -559,10 +522,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -572,10 +535,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_dyn_any (
         DynamicAny::DynAny_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -585,12 +548,12 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_val (
-        CORBA::ValueBase_ptr value
+        CORBA::ValueBase * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -598,10 +561,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean get_boolean (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -610,10 +573,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Octet get_octet (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -622,10 +585,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Char get_char (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -634,10 +597,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Short get_short (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -646,10 +609,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::UShort get_ushort (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -658,10 +621,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Long get_long (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -670,10 +633,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_ulong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -682,10 +645,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Float get_float (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -694,10 +657,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Double get_double (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -706,10 +669,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * get_string (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -718,10 +681,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr get_reference (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -730,10 +693,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr get_typecode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -742,10 +705,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::LongLong get_longlong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -754,10 +717,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULongLong get_ulonglong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -766,10 +729,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::LongDouble get_longdouble (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -778,10 +741,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::WChar get_wchar (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -790,10 +753,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::WChar * get_wstring (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -802,10 +765,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * get_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -814,10 +777,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr get_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -826,11 +789,11 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ValueBase_ptr get_val (
+
+    virtual CORBA::ValueBase * get_val (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -838,10 +801,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean seek (
         CORBA::Long index
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -849,40 +812,40 @@ TAO_NAMESPACE  DynamicAny
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void rewind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean next (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong component_count (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr current_component (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -890,119 +853,78 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynAny (void);
     virtual ~DynAny (void);
-    
-    friend class _TAO_DynAny_Remote_Proxy_Impl;
-    friend class _TAO_DynAny_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynAny_Direct_Proxy_Impl;
-  
+
   private:
     DynAny (const DynAny &);
     void operator= (const DynAny &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_DYNAMICANY_DYNFIXED__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNFIXED__ODDS_N_ENDS_CH_
 
-#if !defined (_DYNAMICANY_DYNFIXED___PTR_CH_)
-#define _DYNAMICANY_DYNFIXED___PTR_CH_
-  
   class DynFixed;
   typedef DynFixed *DynFixed_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNFIXED___VAR_CH_)
-#define _DYNAMICANY_DYNFIXED___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynFixed_var : public TAO_Base_var
+  struct tao_DynFixed_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynFixed,
+        tao_DynFixed_life
+      >
+    DynFixed_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynFixed,
+        tao_DynFixed_life
+      >
+    DynFixed_out;
+
+  struct TAO_DynamicAny_Export tao_DynFixed_life
   {
-  public:
-    DynFixed_var (void); // default constructor
-    DynFixed_var (DynFixed_ptr p) : ptr_ (p) {} 
-    DynFixed_var (const DynFixed_var &); // copy constructor
-    ~DynFixed_var (void); // destructor
-    
-    DynFixed_var &operator= (DynFixed_ptr);
-    DynFixed_var &operator= (const DynFixed_var &);
-    DynFixed_ptr operator-> (void) const;
-    
-    operator const DynFixed_ptr &() const;
-    operator DynFixed_ptr &();
-    // in, inout, out, _retn 
-    DynFixed_ptr in (void) const;
-    DynFixed_ptr &inout (void);
-    DynFixed_ptr &out (void);
-    DynFixed_ptr _retn (void);
-    DynFixed_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynFixed_ptr tao_duplicate (DynFixed_ptr);
     static void tao_release (DynFixed_ptr);
     static DynFixed_ptr tao_nil (void);
-    static DynFixed_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynFixed_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynFixed_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynFixed_var (const TAO_Base_var &rhs);
-    DynFixed_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNFIXED___OUT_CH_)
-#define _DYNAMICANY_DYNFIXED___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynFixed_out
+  struct TAO_DynamicAny_Export tao_DynFixed_cast
   {
-  public:
-    DynFixed_out (DynFixed_ptr &);
-    DynFixed_out (DynFixed_var &);
-    DynFixed_out (const DynFixed_out &);
-    DynFixed_out &operator= (const DynFixed_out &);
-    DynFixed_out &operator= (const DynFixed_var &);
-    DynFixed_out &operator= (DynFixed_ptr);
-    operator DynFixed_ptr &();
-    DynFixed_ptr &ptr (void);
-    DynFixed_ptr operator-> (void);
-  
-  private:
-    DynFixed_ptr &ptr_;
+    static DynFixed_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNFIXED_CH_)
 #define _DYNAMICANY_DYNFIXED_CH_
-  
+
   class TAO_DynamicAny_Export DynFixed
     : public virtual DynamicAny::DynAny
   {
@@ -1010,40 +932,40 @@ TAO_NAMESPACE  DynamicAny
     typedef DynFixed_ptr _ptr_type;
     typedef DynFixed_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynFixed_ptr _duplicate (DynFixed_ptr obj);
-    
+
     static DynFixed_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynFixed_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynFixed_ptr _nil (void)
       {
         return (DynFixed_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * get_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_value (
         const char * val
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1053,119 +975,78 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynFixed (void);
     virtual ~DynFixed (void);
-    
-    friend class _TAO_DynFixed_Remote_Proxy_Impl;
-    friend class _TAO_DynFixed_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynFixed_Direct_Proxy_Impl;
-  
+
   private:
     DynFixed (const DynFixed &);
     void operator= (const DynFixed &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_DYNAMICANY_DYNENUM__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNENUM__ODDS_N_ENDS_CH_
 
-#if !defined (_DYNAMICANY_DYNENUM___PTR_CH_)
-#define _DYNAMICANY_DYNENUM___PTR_CH_
-  
   class DynEnum;
   typedef DynEnum *DynEnum_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNENUM___VAR_CH_)
-#define _DYNAMICANY_DYNENUM___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynEnum_var : public TAO_Base_var
+  struct tao_DynEnum_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynEnum,
+        tao_DynEnum_life
+      >
+    DynEnum_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynEnum,
+        tao_DynEnum_life
+      >
+    DynEnum_out;
+
+  struct TAO_DynamicAny_Export tao_DynEnum_life
   {
-  public:
-    DynEnum_var (void); // default constructor
-    DynEnum_var (DynEnum_ptr p) : ptr_ (p) {} 
-    DynEnum_var (const DynEnum_var &); // copy constructor
-    ~DynEnum_var (void); // destructor
-    
-    DynEnum_var &operator= (DynEnum_ptr);
-    DynEnum_var &operator= (const DynEnum_var &);
-    DynEnum_ptr operator-> (void) const;
-    
-    operator const DynEnum_ptr &() const;
-    operator DynEnum_ptr &();
-    // in, inout, out, _retn 
-    DynEnum_ptr in (void) const;
-    DynEnum_ptr &inout (void);
-    DynEnum_ptr &out (void);
-    DynEnum_ptr _retn (void);
-    DynEnum_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynEnum_ptr tao_duplicate (DynEnum_ptr);
     static void tao_release (DynEnum_ptr);
     static DynEnum_ptr tao_nil (void);
-    static DynEnum_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynEnum_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynEnum_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynEnum_var (const TAO_Base_var &rhs);
-    DynEnum_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNENUM___OUT_CH_)
-#define _DYNAMICANY_DYNENUM___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynEnum_out
+  struct TAO_DynamicAny_Export tao_DynEnum_cast
   {
-  public:
-    DynEnum_out (DynEnum_ptr &);
-    DynEnum_out (DynEnum_var &);
-    DynEnum_out (const DynEnum_out &);
-    DynEnum_out &operator= (const DynEnum_out &);
-    DynEnum_out &operator= (const DynEnum_var &);
-    DynEnum_out &operator= (DynEnum_ptr);
-    operator DynEnum_ptr &();
-    DynEnum_ptr &ptr (void);
-    DynEnum_ptr operator-> (void);
-  
-  private:
-    DynEnum_ptr &ptr_;
+    static DynEnum_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNENUM_CH_)
 #define _DYNAMICANY_DYNENUM_CH_
-  
+
   class TAO_DynamicAny_Export DynEnum
     : public virtual DynamicAny::DynAny
   {
@@ -1173,40 +1054,40 @@ TAO_NAMESPACE  DynamicAny
     typedef DynEnum_ptr _ptr_type;
     typedef DynEnum_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynEnum_ptr _duplicate (DynEnum_ptr obj);
-    
+
     static DynEnum_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynEnum_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynEnum_ptr _nil (void)
       {
         return (DynEnum_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * get_as_string (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_as_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1215,20 +1096,20 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_as_ulong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_as_ulong (
         CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1237,600 +1118,227 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynEnum (void);
     virtual ~DynEnum (void);
-    
-    friend class _TAO_DynEnum_Remote_Proxy_Impl;
-    friend class _TAO_DynEnum_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynEnum_Direct_Proxy_Impl;
-  
+
   private:
     DynEnum (const DynEnum &);
     void operator= (const DynEnum &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+
   typedef char * FieldName;
   typedef CORBA::String_var FieldName_var;
   typedef CORBA::String_out FieldName_out;
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct NameValuePair;
+
+  typedef
+    TAO_Var_Var_T<
+        NameValuePair
+      >
+    NameValuePair_var;
+
+  typedef
+    TAO_Out_T<
+        NameValuePair,
+        NameValuePair_var
+      >
+    NameValuePair_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class NameValuePair_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_DynamicAny_Export NameValuePair
   {
     typedef NameValuePair_var _var_type;
-    
-    
-    TAO_String_Manager id;
-    CORBA::Any value;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_DynamicAny_Export NameValuePair_var
-  {
-  public:
-    NameValuePair_var (void);
-    NameValuePair_var (NameValuePair *);
-    NameValuePair_var (const NameValuePair_var &);
-    ~NameValuePair_var (void);
-    
-    NameValuePair_var &operator= (NameValuePair *);
-    NameValuePair_var &operator= (const NameValuePair_var &);
-    NameValuePair *operator-> (void);
-    const NameValuePair *operator-> (void) const;
-    
-    operator const NameValuePair &() const;
-    operator NameValuePair &();
-    operator NameValuePair &() const;
-    
-    // Variable-size types only.
-    operator NameValuePair *&();
-    
-    // in, inout, out, _retn 
-    const NameValuePair &in (void) const;
-    NameValuePair &inout (void);
-    NameValuePair *&out (void);
-    NameValuePair *_retn (void);
-    NameValuePair *ptr (void) const;
-  
-  private:
-    NameValuePair *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_DynamicAny_Export NameValuePair_out
-  {
-  public:
-    NameValuePair_out (NameValuePair *&);
-    NameValuePair_out (NameValuePair_var &);
-    NameValuePair_out (const NameValuePair_out &);
-    NameValuePair_out &operator= (const NameValuePair_out &);
-    NameValuePair_out &operator= (NameValuePair *);
-    operator NameValuePair *&();
-    NameValuePair *&ptr (void);
-    NameValuePair *operator-> (void);
-    
-  private:
-    NameValuePair *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const NameValuePair_var &);
-  };
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
-  
-  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void);
-    _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        NameValuePair *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
-        const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &operator= (
-        const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void);
-    
-    // = Accessors.
-    NameValuePair &operator[] (CORBA::ULong i);
-    const NameValuePair &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static NameValuePair *allocbuf (CORBA::ULong size);
-    static void freebuf (NameValuePair *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    NameValuePair *get_buffer (CORBA::Boolean orphan = 0);
-    const NameValuePair *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        NameValuePair *data,
-        CORBA::Boolean release
-      );
+    TAO_String_Manager id;
+    CORBA::Any value;
   };
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class NameValuePairSeq;
-  class NameValuePairSeq_var;
-  
-  // *************************************************************
-  // DynamicAny::NameValuePairSeq
-  // *************************************************************
-  
-  class TAO_DynamicAny_Export NameValuePairSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<NameValuePair>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_VarSeq_Var_T<
+        NameValuePairSeq,
+        DynamicAny::NameValuePair
+      >
+    NameValuePairSeq_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        NameValuePairSeq,
+        NameValuePairSeq_var,
+        DynamicAny::NameValuePair
+      >
+    NameValuePairSeq_out;
+
+  class TAO_DynamicAny_Export NameValuePairSeq
+    : public
+        TAO_Unbounded_Sequence<
+            DynamicAny::NameValuePair
+          >
   {
   public:
     NameValuePairSeq (void);
     NameValuePairSeq (CORBA::ULong max);
     NameValuePairSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        NameValuePair *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        NameValuePair* buffer,
         CORBA::Boolean release = 0
       );
     NameValuePairSeq (const NameValuePairSeq &);
     ~NameValuePairSeq (void);
-    
+
     typedef NameValuePairSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ___VAR_CH_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class DynamicAny::NameValuePairSeq_var
-  // *************************************************************
-  
-  class TAO_DynamicAny_Export NameValuePairSeq_var
-  {
-  public:
-    NameValuePairSeq_var (void);
-    NameValuePairSeq_var (NameValuePairSeq *);
-    NameValuePairSeq_var (const NameValuePairSeq_var &);
-    ~NameValuePairSeq_var (void);
-    
-    NameValuePairSeq_var &operator= (NameValuePairSeq *);
-    NameValuePairSeq_var &operator= (const NameValuePairSeq_var &);
-    NameValuePairSeq *operator-> (void);
-    const NameValuePairSeq *operator-> (void) const;
-    
-    operator const NameValuePairSeq &() const;
-    operator NameValuePairSeq &();
-    operator NameValuePairSeq &() const;
-    
-    // Variable-size base types only.
-    operator NameValuePairSeq *&();
-    
-    NameValuePair & operator[] (CORBA::ULong index);
-    const NameValuePair & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const NameValuePairSeq &in (void) const;
-    NameValuePairSeq &inout (void);
-    NameValuePairSeq *&out (void);
-    NameValuePairSeq *_retn (void);
-    NameValuePairSeq *ptr (void) const;
-  
-  private:
-    NameValuePairSeq *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
 
-#endif /* end #if !defined */
+  struct NameDynAnyPair;
 
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ___OUT_CH_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_DynamicAny_Export NameValuePairSeq_out
-  {
-  public:
-    NameValuePairSeq_out (NameValuePairSeq *&);
-    NameValuePairSeq_out (NameValuePairSeq_var &);
-    NameValuePairSeq_out (const NameValuePairSeq_out &);
-    NameValuePairSeq_out &operator= (const NameValuePairSeq_out &);
-    NameValuePairSeq_out &operator= (NameValuePairSeq *);
-    operator NameValuePairSeq *&();
-    NameValuePairSeq *&ptr (void);
-    NameValuePairSeq *operator-> (void);
-    NameValuePair & operator[] (CORBA::ULong index);
-  
-  private:
-    NameValuePairSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const NameValuePairSeq_var &);
-  };
+  typedef
+    TAO_Var_Var_T<
+        NameDynAnyPair
+      >
+    NameDynAnyPair_var;
+
+  typedef
+    TAO_Out_T<
+        NameDynAnyPair,
+        NameDynAnyPair_var
+      >
+    NameDynAnyPair_out;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class NameDynAnyPair_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_DynamicAny_Export NameDynAnyPair
   {
     typedef NameDynAnyPair_var _var_type;
-    
-    
-    TAO_String_Manager id;
-    DynamicAny::DynAny_var value;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_DynamicAny_Export NameDynAnyPair_var
-  {
-  public:
-    NameDynAnyPair_var (void);
-    NameDynAnyPair_var (NameDynAnyPair *);
-    NameDynAnyPair_var (const NameDynAnyPair_var &);
-    ~NameDynAnyPair_var (void);
-    
-    NameDynAnyPair_var &operator= (NameDynAnyPair *);
-    NameDynAnyPair_var &operator= (const NameDynAnyPair_var &);
-    NameDynAnyPair *operator-> (void);
-    const NameDynAnyPair *operator-> (void) const;
-    
-    operator const NameDynAnyPair &() const;
-    operator NameDynAnyPair &();
-    operator NameDynAnyPair &() const;
-    
-    // Variable-size types only.
-    operator NameDynAnyPair *&();
-    
-    // in, inout, out, _retn 
-    const NameDynAnyPair &in (void) const;
-    NameDynAnyPair &inout (void);
-    NameDynAnyPair *&out (void);
-    NameDynAnyPair *_retn (void);
-    NameDynAnyPair *ptr (void) const;
-  
-  private:
-    NameDynAnyPair *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_DynamicAny_Export NameDynAnyPair_out
-  {
-  public:
-    NameDynAnyPair_out (NameDynAnyPair *&);
-    NameDynAnyPair_out (NameDynAnyPair_var &);
-    NameDynAnyPair_out (const NameDynAnyPair_out &);
-    NameDynAnyPair_out &operator= (const NameDynAnyPair_out &);
-    NameDynAnyPair_out &operator= (NameDynAnyPair *);
-    operator NameDynAnyPair *&();
-    NameDynAnyPair *&ptr (void);
-    NameDynAnyPair *operator-> (void);
-    
-  private:
-    NameDynAnyPair *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const NameDynAnyPair_var &);
-  };
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
-  
-  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void);
-    _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        NameDynAnyPair *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
-        const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &operator= (
-        const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void);
-    
-    // = Accessors.
-    NameDynAnyPair &operator[] (CORBA::ULong i);
-    const NameDynAnyPair &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static NameDynAnyPair *allocbuf (CORBA::ULong size);
-    static void freebuf (NameDynAnyPair *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    NameDynAnyPair *get_buffer (CORBA::Boolean orphan = 0);
-    const NameDynAnyPair *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        NameDynAnyPair *data,
-        CORBA::Boolean release
-      );
+    TAO_String_Manager id;
+    DynamicAny::DynAny_var value;
   };
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class NameDynAnyPairSeq;
-  class NameDynAnyPairSeq_var;
-  
-  // *************************************************************
-  // DynamicAny::NameDynAnyPairSeq
-  // *************************************************************
-  
-  class TAO_DynamicAny_Export NameDynAnyPairSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<NameDynAnyPair>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_VarSeq_Var_T<
+        NameDynAnyPairSeq,
+        DynamicAny::NameDynAnyPair
+      >
+    NameDynAnyPairSeq_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        NameDynAnyPairSeq,
+        NameDynAnyPairSeq_var,
+        DynamicAny::NameDynAnyPair
+      >
+    NameDynAnyPairSeq_out;
+
+  class TAO_DynamicAny_Export NameDynAnyPairSeq
+    : public
+        TAO_Unbounded_Sequence<
+            DynamicAny::NameDynAnyPair
+          >
   {
   public:
     NameDynAnyPairSeq (void);
     NameDynAnyPairSeq (CORBA::ULong max);
     NameDynAnyPairSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        NameDynAnyPair *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        NameDynAnyPair* buffer,
         CORBA::Boolean release = 0
       );
     NameDynAnyPairSeq (const NameDynAnyPairSeq &);
     ~NameDynAnyPairSeq (void);
-    
+
     typedef NameDynAnyPairSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ___VAR_CH_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class DynamicAny::NameDynAnyPairSeq_var
-  // *************************************************************
-  
-  class TAO_DynamicAny_Export NameDynAnyPairSeq_var
-  {
-  public:
-    NameDynAnyPairSeq_var (void);
-    NameDynAnyPairSeq_var (NameDynAnyPairSeq *);
-    NameDynAnyPairSeq_var (const NameDynAnyPairSeq_var &);
-    ~NameDynAnyPairSeq_var (void);
-    
-    NameDynAnyPairSeq_var &operator= (NameDynAnyPairSeq *);
-    NameDynAnyPairSeq_var &operator= (const NameDynAnyPairSeq_var &);
-    NameDynAnyPairSeq *operator-> (void);
-    const NameDynAnyPairSeq *operator-> (void) const;
-    
-    operator const NameDynAnyPairSeq &() const;
-    operator NameDynAnyPairSeq &();
-    operator NameDynAnyPairSeq &() const;
-    
-    // Variable-size base types only.
-    operator NameDynAnyPairSeq *&();
-    
-    NameDynAnyPair & operator[] (CORBA::ULong index);
-    const NameDynAnyPair & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const NameDynAnyPairSeq &in (void) const;
-    NameDynAnyPairSeq &inout (void);
-    NameDynAnyPairSeq *&out (void);
-    NameDynAnyPairSeq *_retn (void);
-    NameDynAnyPairSeq *ptr (void) const;
-  
-  private:
-    NameDynAnyPairSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ___OUT_CH_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_DynamicAny_Export NameDynAnyPairSeq_out
-  {
-  public:
-    NameDynAnyPairSeq_out (NameDynAnyPairSeq *&);
-    NameDynAnyPairSeq_out (NameDynAnyPairSeq_var &);
-    NameDynAnyPairSeq_out (const NameDynAnyPairSeq_out &);
-    NameDynAnyPairSeq_out &operator= (const NameDynAnyPairSeq_out &);
-    NameDynAnyPairSeq_out &operator= (NameDynAnyPairSeq *);
-    operator NameDynAnyPairSeq *&();
-    NameDynAnyPairSeq *&ptr (void);
-    NameDynAnyPairSeq *operator-> (void);
-    NameDynAnyPair & operator[] (CORBA::ULong index);
-  
-  private:
-    NameDynAnyPairSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const NameDynAnyPairSeq_var &);
-  };
+#if !defined (_DYNAMICANY_DYNSTRUCT__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNSTRUCT__ODDS_N_ENDS_CH_
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_DYNAMICANY_DYNSTRUCT___PTR_CH_)
-#define _DYNAMICANY_DYNSTRUCT___PTR_CH_
-  
   class DynStruct;
   typedef DynStruct *DynStruct_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNSTRUCT___VAR_CH_)
-#define _DYNAMICANY_DYNSTRUCT___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynStruct_var : public TAO_Base_var
+  struct tao_DynStruct_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynStruct,
+        tao_DynStruct_life
+      >
+    DynStruct_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynStruct,
+        tao_DynStruct_life
+      >
+    DynStruct_out;
+
+  struct TAO_DynamicAny_Export tao_DynStruct_life
   {
-  public:
-    DynStruct_var (void); // default constructor
-    DynStruct_var (DynStruct_ptr p) : ptr_ (p) {} 
-    DynStruct_var (const DynStruct_var &); // copy constructor
-    ~DynStruct_var (void); // destructor
-    
-    DynStruct_var &operator= (DynStruct_ptr);
-    DynStruct_var &operator= (const DynStruct_var &);
-    DynStruct_ptr operator-> (void) const;
-    
-    operator const DynStruct_ptr &() const;
-    operator DynStruct_ptr &();
-    // in, inout, out, _retn 
-    DynStruct_ptr in (void) const;
-    DynStruct_ptr &inout (void);
-    DynStruct_ptr &out (void);
-    DynStruct_ptr _retn (void);
-    DynStruct_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynStruct_ptr tao_duplicate (DynStruct_ptr);
     static void tao_release (DynStruct_ptr);
     static DynStruct_ptr tao_nil (void);
-    static DynStruct_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynStruct_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynStruct_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynStruct_var (const TAO_Base_var &rhs);
-    DynStruct_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNSTRUCT___OUT_CH_)
-#define _DYNAMICANY_DYNSTRUCT___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynStruct_out
+  struct TAO_DynamicAny_Export tao_DynStruct_cast
   {
-  public:
-    DynStruct_out (DynStruct_ptr &);
-    DynStruct_out (DynStruct_var &);
-    DynStruct_out (const DynStruct_out &);
-    DynStruct_out &operator= (const DynStruct_out &);
-    DynStruct_out &operator= (const DynStruct_var &);
-    DynStruct_out &operator= (DynStruct_ptr);
-    operator DynStruct_ptr &();
-    DynStruct_ptr &ptr (void);
-    DynStruct_ptr operator-> (void);
-  
-  private:
-    DynStruct_ptr &ptr_;
+    static DynStruct_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNSTRUCT_CH_)
 #define _DYNAMICANY_DYNSTRUCT_CH_
-  
+
   class TAO_DynamicAny_Export DynStruct
     : public virtual DynamicAny::DynAny
   {
@@ -1838,30 +1346,30 @@ TAO_NAMESPACE  DynamicAny
     typedef DynStruct_ptr _ptr_type;
     typedef DynStruct_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynStruct_ptr _duplicate (DynStruct_ptr obj);
-    
+
     static DynStruct_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynStruct_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynStruct_ptr _nil (void)
       {
         return (DynStruct_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * current_member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1870,10 +1378,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1882,20 +1390,20 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::NameValuePairSeq * get_members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members (
         const DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1905,20 +1413,20 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members_as_dyn_any (
         const DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1928,119 +1436,78 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynStruct (void);
     virtual ~DynStruct (void);
-    
-    friend class _TAO_DynStruct_Remote_Proxy_Impl;
-    friend class _TAO_DynStruct_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynStruct_Direct_Proxy_Impl;
-  
+
   private:
     DynStruct (const DynStruct &);
     void operator= (const DynStruct &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_DYNAMICANY_DYNUNION__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNUNION__ODDS_N_ENDS_CH_
 
-#if !defined (_DYNAMICANY_DYNUNION___PTR_CH_)
-#define _DYNAMICANY_DYNUNION___PTR_CH_
-  
   class DynUnion;
   typedef DynUnion *DynUnion_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNUNION___VAR_CH_)
-#define _DYNAMICANY_DYNUNION___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynUnion_var : public TAO_Base_var
+  struct tao_DynUnion_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynUnion,
+        tao_DynUnion_life
+      >
+    DynUnion_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynUnion,
+        tao_DynUnion_life
+      >
+    DynUnion_out;
+
+  struct TAO_DynamicAny_Export tao_DynUnion_life
   {
-  public:
-    DynUnion_var (void); // default constructor
-    DynUnion_var (DynUnion_ptr p) : ptr_ (p) {} 
-    DynUnion_var (const DynUnion_var &); // copy constructor
-    ~DynUnion_var (void); // destructor
-    
-    DynUnion_var &operator= (DynUnion_ptr);
-    DynUnion_var &operator= (const DynUnion_var &);
-    DynUnion_ptr operator-> (void) const;
-    
-    operator const DynUnion_ptr &() const;
-    operator DynUnion_ptr &();
-    // in, inout, out, _retn 
-    DynUnion_ptr in (void) const;
-    DynUnion_ptr &inout (void);
-    DynUnion_ptr &out (void);
-    DynUnion_ptr _retn (void);
-    DynUnion_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynUnion_ptr tao_duplicate (DynUnion_ptr);
     static void tao_release (DynUnion_ptr);
     static DynUnion_ptr tao_nil (void);
-    static DynUnion_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynUnion_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynUnion_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynUnion_var (const TAO_Base_var &rhs);
-    DynUnion_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNUNION___OUT_CH_)
-#define _DYNAMICANY_DYNUNION___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynUnion_out
+  struct TAO_DynamicAny_Export tao_DynUnion_cast
   {
-  public:
-    DynUnion_out (DynUnion_ptr &);
-    DynUnion_out (DynUnion_var &);
-    DynUnion_out (const DynUnion_out &);
-    DynUnion_out &operator= (const DynUnion_out &);
-    DynUnion_out &operator= (const DynUnion_var &);
-    DynUnion_out &operator= (DynUnion_ptr);
-    operator DynUnion_ptr &();
-    DynUnion_ptr &ptr (void);
-    DynUnion_ptr operator-> (void);
-  
-  private:
-    DynUnion_ptr &ptr_;
+    static DynUnion_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNUNION_CH_)
 #define _DYNAMICANY_DYNUNION_CH_
-  
+
   class TAO_DynamicAny_Export DynUnion
     : public virtual DynamicAny::DynAny
   {
@@ -2048,40 +1515,40 @@ TAO_NAMESPACE  DynamicAny
     typedef DynUnion_ptr _ptr_type;
     typedef DynUnion_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynUnion_ptr _duplicate (DynUnion_ptr obj);
-    
+
     static DynUnion_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynUnion_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynUnion_ptr _nil (void)
       {
         return (DynUnion_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr get_discriminator (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_discriminator (
         DynamicAny::DynAny_ptr d
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2090,10 +1557,10 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_to_default_member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2101,10 +1568,10 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_to_no_active_member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2112,30 +1579,30 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean has_no_active_member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind discriminator_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2143,10 +1610,10 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2154,10 +1621,10 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2165,458 +1632,171 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynUnion (void);
     virtual ~DynUnion (void);
-    
-    friend class _TAO_DynUnion_Remote_Proxy_Impl;
-    friend class _TAO_DynUnion_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynUnion_Direct_Proxy_Impl;
-  
+
   private:
     DynUnion (const DynUnion &);
     void operator= (const DynUnion &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_
-  
-  class TAO_DynamicAny_Export _TAO_Unbounded_Sequence_DynamicAny_AnySeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_DynamicAny_AnySeq (void);
-    _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_DynamicAny_AnySeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA::Any *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_DynamicAny_AnySeq (
-        const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs
-      );
-    _TAO_Unbounded_Sequence_DynamicAny_AnySeq &operator= (
-        const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void);
-    
-    // = Accessors.
-    CORBA::Any &operator[] (CORBA::ULong i);
-    const CORBA::Any &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static CORBA::Any *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA::Any *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA::Any *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA::Any *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Any *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#if !defined (_DYNAMICANY_ANYSEQ_CH_)
-#define _DYNAMICANY_ANYSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class AnySeq;
-  class AnySeq_var;
-  
-  // *************************************************************
-  // DynamicAny::AnySeq
-  // *************************************************************
-  
-  class TAO_DynamicAny_Export AnySeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_DynamicAny_AnySeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Any>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_VarSeq_Var_T<
+        AnySeq,
+        CORBA::Any
+      >
+    AnySeq_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        AnySeq,
+        AnySeq_var,
+        CORBA::Any
+      >
+    AnySeq_out;
+
+  class TAO_DynamicAny_Export AnySeq
+    : public
+        TAO_Unbounded_Sequence<
+            CORBA::Any
+          >
   {
   public:
     AnySeq (void);
     AnySeq (CORBA::ULong max);
     AnySeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::Any *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::Any* buffer,
         CORBA::Boolean release = 0
       );
     AnySeq (const AnySeq &);
     ~AnySeq (void);
-    
-    typedef AnySeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_ANYSEQ___VAR_CH_)
-#define _DYNAMICANY_ANYSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class DynamicAny::AnySeq_var
-  // *************************************************************
-  
-  class TAO_DynamicAny_Export AnySeq_var
-  {
-  public:
-    AnySeq_var (void);
-    AnySeq_var (AnySeq *);
-    AnySeq_var (const AnySeq_var &);
-    ~AnySeq_var (void);
-    
-    AnySeq_var &operator= (AnySeq *);
-    AnySeq_var &operator= (const AnySeq_var &);
-    AnySeq *operator-> (void);
-    const AnySeq *operator-> (void) const;
-    
-    operator const AnySeq &() const;
-    operator AnySeq &();
-    operator AnySeq &() const;
-    
-    // Variable-size base types only.
-    operator AnySeq *&();
-    
-    CORBA::Any & operator[] (CORBA::ULong index);
-    const CORBA::Any & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const AnySeq &in (void) const;
-    AnySeq &inout (void);
-    AnySeq *&out (void);
-    AnySeq *_retn (void);
-    AnySeq *ptr (void) const;
-  
-  private:
-    AnySeq *ptr_;
-  };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_ANYSEQ___OUT_CH_)
-#define _DYNAMICANY_ANYSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_DynamicAny_Export AnySeq_out
-  {
-  public:
-    AnySeq_out (AnySeq *&);
-    AnySeq_out (AnySeq_var &);
-    AnySeq_out (const AnySeq_out &);
-    AnySeq_out &operator= (const AnySeq_out &);
-    AnySeq_out &operator= (AnySeq *);
-    operator AnySeq *&();
-    AnySeq *&ptr (void);
-    AnySeq *operator-> (void);
-    CORBA::Any & operator[] (CORBA::ULong index);
-  
-  private:
-    AnySeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const AnySeq_var &);
+    typedef AnySeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_
-  
-  class TAO_DynamicAny_Export _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void);
-    _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        DynAny* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (
-        const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static DynAny **allocbuf (CORBA::ULong nelems);
-    static void freebuf (DynAny **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    DynAny* *get_buffer (CORBA::Boolean orphan = 0);
-    const DynAny* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    virtual CORBA::Object* _upcast (void *src) const;
-  };
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMICANY_DYNANYSEQ_CH_)
-#define _DYNAMICANY_DYNANYSEQ_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
   class DynAnySeq;
-  class DynAnySeq_var;
-  
-  // *************************************************************
-  // DynamicAny::DynAnySeq
-  // *************************************************************
-  
-  class TAO_DynamicAny_Export DynAnySeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<DynAny,DynAny_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        DynAnySeq,
+        TAO_Object_Manager<
+            DynamicAny::DynAny,
+            DynamicAny::DynAny_var,
+            DynamicAny::tao_DynAny_life
+          >
+      >
+    DynAnySeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        DynAnySeq,
+        DynAnySeq_var,
+        TAO_Object_Manager<
+            DynamicAny::DynAny,
+            DynamicAny::DynAny_var,
+            DynamicAny::tao_DynAny_life
+          >
+      >
+    DynAnySeq_out;
+
+  class TAO_DynamicAny_Export DynAnySeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            DynamicAny::DynAny,
+            DynamicAny::DynAny_var,
+            DynamicAny::tao_DynAny_life,
+            DynamicAny::tao_DynAny_cast
+          >
   {
   public:
     DynAnySeq (void);
     DynAnySeq (CORBA::ULong max);
     DynAnySeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        DynAny_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        DynAny_ptr* buffer,
         CORBA::Boolean release = 0
       );
     DynAnySeq (const DynAnySeq &);
     ~DynAnySeq (void);
-    
+
     typedef DynAnySeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNANYSEQ___VAR_CH_)
-#define _DYNAMICANY_DYNANYSEQ___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class DynamicAny::DynAnySeq_var
-  // *************************************************************
-  
-  class TAO_DynamicAny_Export DynAnySeq_var
-  {
-  public:
-    DynAnySeq_var (void);
-    DynAnySeq_var (DynAnySeq *);
-    DynAnySeq_var (const DynAnySeq_var &);
-    ~DynAnySeq_var (void);
-    
-    DynAnySeq_var &operator= (DynAnySeq *);
-    DynAnySeq_var &operator= (const DynAnySeq_var &);
-    DynAnySeq *operator-> (void);
-    const DynAnySeq *operator-> (void) const;
-    
-    operator const DynAnySeq &() const;
-    operator DynAnySeq &();
-    operator DynAnySeq &() const;
-    
-    // Variable-size base types only.
-    operator DynAnySeq *&();
-    
-    TAO_Object_Manager<DynAny, DynAny_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const DynAnySeq &in (void) const;
-    DynAnySeq &inout (void);
-    DynAnySeq *&out (void);
-    DynAnySeq *_retn (void);
-    DynAnySeq *ptr (void) const;
-  
-  private:
-    DynAnySeq *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNANYSEQ___OUT_CH_)
-#define _DYNAMICANY_DYNANYSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_DynamicAny_Export DynAnySeq_out
-  {
-  public:
-    DynAnySeq_out (DynAnySeq *&);
-    DynAnySeq_out (DynAnySeq_var &);
-    DynAnySeq_out (const DynAnySeq_out &);
-    DynAnySeq_out &operator= (const DynAnySeq_out &);
-    DynAnySeq_out &operator= (DynAnySeq *);
-    operator DynAnySeq *&();
-    DynAnySeq *&ptr (void);
-    DynAnySeq *operator-> (void);
-    TAO_Object_Manager<DynAny, DynAny_var> operator[] (CORBA::ULong index);
-  
-  private:
-    DynAnySeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const DynAnySeq_var &);
-  };
+#if !defined (_DYNAMICANY_DYNSEQUENCE__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNSEQUENCE__ODDS_N_ENDS_CH_
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE___PTR_CH_)
-#define _DYNAMICANY_DYNSEQUENCE___PTR_CH_
-  
   class DynSequence;
   typedef DynSequence *DynSequence_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE___VAR_CH_)
-#define _DYNAMICANY_DYNSEQUENCE___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynSequence_var : public TAO_Base_var
+  struct tao_DynSequence_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynSequence,
+        tao_DynSequence_life
+      >
+    DynSequence_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynSequence,
+        tao_DynSequence_life
+      >
+    DynSequence_out;
+
+  struct TAO_DynamicAny_Export tao_DynSequence_life
   {
-  public:
-    DynSequence_var (void); // default constructor
-    DynSequence_var (DynSequence_ptr p) : ptr_ (p) {} 
-    DynSequence_var (const DynSequence_var &); // copy constructor
-    ~DynSequence_var (void); // destructor
-    
-    DynSequence_var &operator= (DynSequence_ptr);
-    DynSequence_var &operator= (const DynSequence_var &);
-    DynSequence_ptr operator-> (void) const;
-    
-    operator const DynSequence_ptr &() const;
-    operator DynSequence_ptr &();
-    // in, inout, out, _retn 
-    DynSequence_ptr in (void) const;
-    DynSequence_ptr &inout (void);
-    DynSequence_ptr &out (void);
-    DynSequence_ptr _retn (void);
-    DynSequence_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynSequence_ptr tao_duplicate (DynSequence_ptr);
     static void tao_release (DynSequence_ptr);
     static DynSequence_ptr tao_nil (void);
-    static DynSequence_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynSequence_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynSequence_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynSequence_var (const TAO_Base_var &rhs);
-    DynSequence_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE___OUT_CH_)
-#define _DYNAMICANY_DYNSEQUENCE___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynSequence_out
+  struct TAO_DynamicAny_Export tao_DynSequence_cast
   {
-  public:
-    DynSequence_out (DynSequence_ptr &);
-    DynSequence_out (DynSequence_var &);
-    DynSequence_out (const DynSequence_out &);
-    DynSequence_out &operator= (const DynSequence_out &);
-    DynSequence_out &operator= (const DynSequence_var &);
-    DynSequence_out &operator= (DynSequence_ptr);
-    operator DynSequence_ptr &();
-    DynSequence_ptr &ptr (void);
-    DynSequence_ptr operator-> (void);
-  
-  private:
-    DynSequence_ptr &ptr_;
+    static DynSequence_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE_CH_)
 #define _DYNAMICANY_DYNSEQUENCE_CH_
-  
+
   class TAO_DynamicAny_Export DynSequence
     : public virtual DynamicAny::DynAny
   {
@@ -2624,40 +1804,40 @@ TAO_NAMESPACE  DynamicAny
     typedef DynSequence_ptr _ptr_type;
     typedef DynSequence_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynSequence_ptr _duplicate (DynSequence_ptr obj);
-    
+
     static DynSequence_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynSequence_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynSequence_ptr _nil (void)
       {
         return (DynSequence_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_length (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_length (
         CORBA::ULong len
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2666,20 +1846,20 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::AnySeq * get_elements (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements (
         const DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2689,20 +1869,20 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements_as_dyn_any (
         const DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2712,119 +1892,78 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynSequence (void);
     virtual ~DynSequence (void);
-    
-    friend class _TAO_DynSequence_Remote_Proxy_Impl;
-    friend class _TAO_DynSequence_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynSequence_Direct_Proxy_Impl;
-  
+
   private:
     DynSequence (const DynSequence &);
     void operator= (const DynSequence &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_DYNAMICANY_DYNARRAY__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNARRAY__ODDS_N_ENDS_CH_
 
-#if !defined (_DYNAMICANY_DYNARRAY___PTR_CH_)
-#define _DYNAMICANY_DYNARRAY___PTR_CH_
-  
   class DynArray;
   typedef DynArray *DynArray_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNARRAY___VAR_CH_)
-#define _DYNAMICANY_DYNARRAY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynArray_var : public TAO_Base_var
+  struct tao_DynArray_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynArray,
+        tao_DynArray_life
+      >
+    DynArray_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynArray,
+        tao_DynArray_life
+      >
+    DynArray_out;
+
+  struct TAO_DynamicAny_Export tao_DynArray_life
   {
-  public:
-    DynArray_var (void); // default constructor
-    DynArray_var (DynArray_ptr p) : ptr_ (p) {} 
-    DynArray_var (const DynArray_var &); // copy constructor
-    ~DynArray_var (void); // destructor
-    
-    DynArray_var &operator= (DynArray_ptr);
-    DynArray_var &operator= (const DynArray_var &);
-    DynArray_ptr operator-> (void) const;
-    
-    operator const DynArray_ptr &() const;
-    operator DynArray_ptr &();
-    // in, inout, out, _retn 
-    DynArray_ptr in (void) const;
-    DynArray_ptr &inout (void);
-    DynArray_ptr &out (void);
-    DynArray_ptr _retn (void);
-    DynArray_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynArray_ptr tao_duplicate (DynArray_ptr);
     static void tao_release (DynArray_ptr);
     static DynArray_ptr tao_nil (void);
-    static DynArray_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynArray_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynArray_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynArray_var (const TAO_Base_var &rhs);
-    DynArray_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNARRAY___OUT_CH_)
-#define _DYNAMICANY_DYNARRAY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynArray_out
+  struct TAO_DynamicAny_Export tao_DynArray_cast
   {
-  public:
-    DynArray_out (DynArray_ptr &);
-    DynArray_out (DynArray_var &);
-    DynArray_out (const DynArray_out &);
-    DynArray_out &operator= (const DynArray_out &);
-    DynArray_out &operator= (const DynArray_var &);
-    DynArray_out &operator= (DynArray_ptr);
-    operator DynArray_ptr &();
-    DynArray_ptr &ptr (void);
-    DynArray_ptr operator-> (void);
-  
-  private:
-    DynArray_ptr &ptr_;
+    static DynArray_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNARRAY_CH_)
 #define _DYNAMICANY_DYNARRAY_CH_
-  
+
   class TAO_DynamicAny_Export DynArray
     : public virtual DynamicAny::DynAny
   {
@@ -2832,40 +1971,40 @@ TAO_NAMESPACE  DynamicAny
     typedef DynArray_ptr _ptr_type;
     typedef DynArray_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynArray_ptr _duplicate (DynArray_ptr obj);
-    
+
     static DynArray_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynArray_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynArray_ptr _nil (void)
       {
         return (DynArray_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::AnySeq * get_elements (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements (
         const DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2875,20 +2014,20 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements_as_dyn_any (
         const DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2898,119 +2037,78 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynArray (void);
     virtual ~DynArray (void);
-    
-    friend class _TAO_DynArray_Remote_Proxy_Impl;
-    friend class _TAO_DynArray_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynArray_Direct_Proxy_Impl;
-  
+
   private:
     DynArray (const DynArray &);
     void operator= (const DynArray &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_DYNAMICANY_DYNVALUE__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNVALUE__ODDS_N_ENDS_CH_
 
-#if !defined (_DYNAMICANY_DYNVALUE___PTR_CH_)
-#define _DYNAMICANY_DYNVALUE___PTR_CH_
-  
   class DynValue;
   typedef DynValue *DynValue_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNVALUE___VAR_CH_)
-#define _DYNAMICANY_DYNVALUE___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynValue_var : public TAO_Base_var
+  struct tao_DynValue_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynValue,
+        tao_DynValue_life
+      >
+    DynValue_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynValue,
+        tao_DynValue_life
+      >
+    DynValue_out;
+
+  struct TAO_DynamicAny_Export tao_DynValue_life
   {
-  public:
-    DynValue_var (void); // default constructor
-    DynValue_var (DynValue_ptr p) : ptr_ (p) {} 
-    DynValue_var (const DynValue_var &); // copy constructor
-    ~DynValue_var (void); // destructor
-    
-    DynValue_var &operator= (DynValue_ptr);
-    DynValue_var &operator= (const DynValue_var &);
-    DynValue_ptr operator-> (void) const;
-    
-    operator const DynValue_ptr &() const;
-    operator DynValue_ptr &();
-    // in, inout, out, _retn 
-    DynValue_ptr in (void) const;
-    DynValue_ptr &inout (void);
-    DynValue_ptr &out (void);
-    DynValue_ptr _retn (void);
-    DynValue_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynValue_ptr tao_duplicate (DynValue_ptr);
     static void tao_release (DynValue_ptr);
     static DynValue_ptr tao_nil (void);
-    static DynValue_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynValue_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynValue_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynValue_var (const TAO_Base_var &rhs);
-    DynValue_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNVALUE___OUT_CH_)
-#define _DYNAMICANY_DYNVALUE___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynValue_out
+  struct TAO_DynamicAny_Export tao_DynValue_cast
   {
-  public:
-    DynValue_out (DynValue_ptr &);
-    DynValue_out (DynValue_var &);
-    DynValue_out (const DynValue_out &);
-    DynValue_out &operator= (const DynValue_out &);
-    DynValue_out &operator= (const DynValue_var &);
-    DynValue_out &operator= (DynValue_ptr);
-    operator DynValue_ptr &();
-    DynValue_ptr &ptr (void);
-    DynValue_ptr operator-> (void);
-  
-  private:
-    DynValue_ptr &ptr_;
+    static DynValue_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNVALUE_CH_)
 #define _DYNAMICANY_DYNVALUE_CH_
-  
+
   class TAO_DynamicAny_Export DynValue
     : public virtual DynamicAny::DynAny
   {
@@ -3018,30 +2116,30 @@ TAO_NAMESPACE  DynamicAny
     typedef DynValue_ptr _ptr_type;
     typedef DynValue_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynValue_ptr _duplicate (DynValue_ptr obj);
-    
+
     static DynValue_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynValue_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynValue_ptr _nil (void)
       {
         return (DynValue_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * current_member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -3050,10 +2148,10 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -3062,20 +2160,20 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::NameValuePairSeq * get_members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members (
         const DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3085,20 +2183,20 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members_as_dyn_any (
         const DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3108,119 +2206,78 @@ TAO_NAMESPACE  DynamicAny
         , DynamicAny::DynAny::TypeMismatch
         , DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynValue (void);
     virtual ~DynValue (void);
-    
-    friend class _TAO_DynValue_Remote_Proxy_Impl;
-    friend class _TAO_DynValue_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynValue_Direct_Proxy_Impl;
-  
+
   private:
     DynValue (const DynValue &);
     void operator= (const DynValue &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_DYNAMICANY_DYNANYFACTORY__ODDS_N_ENDS_CH_)
+#define _DYNAMICANY_DYNANYFACTORY__ODDS_N_ENDS_CH_
 
-#if !defined (_DYNAMICANY_DYNANYFACTORY___PTR_CH_)
-#define _DYNAMICANY_DYNANYFACTORY___PTR_CH_
-  
   class DynAnyFactory;
   typedef DynAnyFactory *DynAnyFactory_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY___VAR_CH_)
-#define _DYNAMICANY_DYNANYFACTORY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_DynamicAny_Export DynAnyFactory_var : public TAO_Base_var
+  struct tao_DynAnyFactory_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        DynAnyFactory,
+        tao_DynAnyFactory_life
+      >
+    DynAnyFactory_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        DynAnyFactory,
+        tao_DynAnyFactory_life
+      >
+    DynAnyFactory_out;
+
+  struct TAO_DynamicAny_Export tao_DynAnyFactory_life
   {
-  public:
-    DynAnyFactory_var (void); // default constructor
-    DynAnyFactory_var (DynAnyFactory_ptr p) : ptr_ (p) {} 
-    DynAnyFactory_var (const DynAnyFactory_var &); // copy constructor
-    ~DynAnyFactory_var (void); // destructor
-    
-    DynAnyFactory_var &operator= (DynAnyFactory_ptr);
-    DynAnyFactory_var &operator= (const DynAnyFactory_var &);
-    DynAnyFactory_ptr operator-> (void) const;
-    
-    operator const DynAnyFactory_ptr &() const;
-    operator DynAnyFactory_ptr &();
-    // in, inout, out, _retn 
-    DynAnyFactory_ptr in (void) const;
-    DynAnyFactory_ptr &inout (void);
-    DynAnyFactory_ptr &out (void);
-    DynAnyFactory_ptr _retn (void);
-    DynAnyFactory_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DynAnyFactory_ptr tao_duplicate (DynAnyFactory_ptr);
     static void tao_release (DynAnyFactory_ptr);
     static DynAnyFactory_ptr tao_nil (void);
-    static DynAnyFactory_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DynAnyFactory_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DynAnyFactory_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DynAnyFactory_var (const TAO_Base_var &rhs);
-    DynAnyFactory_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY___OUT_CH_)
-#define _DYNAMICANY_DYNANYFACTORY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_DynamicAny_Export DynAnyFactory_out
+  struct TAO_DynamicAny_Export tao_DynAnyFactory_cast
   {
-  public:
-    DynAnyFactory_out (DynAnyFactory_ptr &);
-    DynAnyFactory_out (DynAnyFactory_var &);
-    DynAnyFactory_out (const DynAnyFactory_out &);
-    DynAnyFactory_out &operator= (const DynAnyFactory_out &);
-    DynAnyFactory_out &operator= (const DynAnyFactory_var &);
-    DynAnyFactory_out &operator= (DynAnyFactory_ptr);
-    operator DynAnyFactory_ptr &();
-    DynAnyFactory_ptr &ptr (void);
-    DynAnyFactory_ptr operator-> (void);
-  
-  private:
-    DynAnyFactory_ptr &ptr_;
+    static DynAnyFactory_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_CH_
-  
+
   class TAO_DynamicAny_Export DynAnyFactory
     : public virtual CORBA::Object
   {
@@ -3228,43 +2285,43 @@ TAO_NAMESPACE  DynamicAny
     typedef DynAnyFactory_ptr _ptr_type;
     typedef DynAnyFactory_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj);
-    
+
     static DynAnyFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAnyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAnyFactory_ptr _nil (void)
       {
         return (DynAnyFactory_ptr)0;
       }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_
-    
+
     class TAO_DynamicAny_Export InconsistentTypeCode : public CORBA::UserException
     {
     public:
-      
+
       InconsistentTypeCode (void);
       InconsistentTypeCode (const InconsistentTypeCode &);
       ~InconsistentTypeCode (void);
 
       InconsistentTypeCode &operator= (const InconsistentTypeCode &);
-      
+
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3276,21 +2333,21 @@ TAO_NAMESPACE  DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr create_dyn_any (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3299,10 +2356,10 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
         CORBA::TypeCode_ptr type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3311,23 +2368,19 @@ TAO_NAMESPACE  DynamicAny
         CORBA::SystemException
         , DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     DynAnyFactory (void);
     virtual ~DynAnyFactory (void);
-    
-    friend class _TAO_DynAnyFactory_Remote_Proxy_Impl;
-    friend class _TAO_DynAnyFactory_ThruPOA_Proxy_Impl;
-    friend class _TAO_DynAnyFactory_Direct_Proxy_Impl;
-  
+
   private:
     DynAnyFactory (const DynAnyFactory &);
     void operator= (const DynAnyFactory &);
@@ -3392,7 +2445,7 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "DynamicAnyC.i"
@@ -3408,4 +2461,3 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i
index c317e10a441..232f8b56095 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ b/TAO/tao/DynamicAny/DynamicAnyC.i
@@ -26,13 +26,6 @@
 #if !defined (_DYNAMICANY_DYNANY___CI_)
 #define _DYNAMICANY_DYNANY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynAny::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -41,13 +34,6 @@ DynamicAny::DynAny::marshal (TAO_OutputCDR &)
 #if !defined (_DYNAMICANY_DYNFIXED___CI_)
 #define _DYNAMICANY_DYNFIXED___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -56,1351 +42,6 @@ DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
 #if !defined (_DYNAMICANY_DYNENUM___CI_)
 #define _DYNAMICANY_DYNENUM___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynEnum::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class DynamicAny::NameValuePair_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::NameValuePair_var::NameValuePair_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-DynamicAny::NameValuePair_var::NameValuePair_var (NameValuePair *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-DynamicAny::NameValuePair_var::NameValuePair_var (const ::DynamicAny::NameValuePair_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::DynamicAny::NameValuePair (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair_var::~NameValuePair_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair_var &
-DynamicAny::NameValuePair_var::operator= (NameValuePair *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePair_var &
-DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          NameValuePair *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              NameValuePair (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              NameValuePair *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::DynamicAny::NameValuePair *
-DynamicAny::NameValuePair_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameValuePair *
-DynamicAny::NameValuePair_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair_var::operator const ::DynamicAny::NameValuePair &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::DynamicAny::NameValuePair &
-DynamicAny::NameValuePair_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameValuePair &
-DynamicAny::NameValuePair_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::DynamicAny::NameValuePair *&
-DynamicAny::NameValuePair_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameValuePair *
-DynamicAny::NameValuePair_var::_retn (void)
-{
-  ::DynamicAny::NameValuePair *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::DynamicAny::NameValuePair *
-DynamicAny::NameValuePair_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class DynamicAny::NameValuePair_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::NameValuePair_out::NameValuePair_out (::DynamicAny::NameValuePair *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair_out::NameValuePair_out (NameValuePair_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair_out::NameValuePair_out (const ::DynamicAny::NameValuePair_out &p)
-  : ptr_ (ACE_const_cast (NameValuePair_out&, p).ptr_)
-{}
-
-ACE_INLINE
-DynamicAny::NameValuePair_out &
-DynamicAny::NameValuePair_out::operator= (const ::DynamicAny::NameValuePair_out &p)
-{
-  this->ptr_ = ACE_const_cast (NameValuePair_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair_out &
-DynamicAny::NameValuePair_out::operator= (NameValuePair *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::NameValuePair_out::operator ::DynamicAny::NameValuePair *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameValuePair *&
-DynamicAny::NameValuePair_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameValuePair *
-DynamicAny::NameValuePair_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_
-
-ACE_INLINE
-DynamicAny::NameValuePair *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (CORBA::ULong size)
-{
-  DynamicAny::NameValuePair *retval = 0;
-  ACE_NEW_RETURN (retval, DynamicAny::NameValuePair[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (DynamicAny::NameValuePair *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void)
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    DynamicAny::NameValuePair *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (
-    const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      DynamicAny::NameValuePair *tmp1 =
-        _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->maximum_);
-      DynamicAny::NameValuePair * const tmp2 =
-        ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator= (
-    const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          DynamicAny::NameValuePair *tmp =
-            ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  DynamicAny::NameValuePair *tmp1 =
-    ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
-  DynamicAny::NameValuePair * const tmp2 =
-    ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-DynamicAny::NameValuePair &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameValuePair* tmp =
-    ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const DynamicAny::NameValuePair &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameValuePair * const tmp =
-    ACE_reinterpret_cast (DynamicAny::NameValuePair* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-DynamicAny::NameValuePair *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (CORBA::Boolean orphan)
-{
-  DynamicAny::NameValuePair *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const DynamicAny::NameValuePair *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const DynamicAny::NameValuePair * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    DynamicAny::NameValuePair *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      DynamicAny::NameValuePair *tmp =
-        ACE_reinterpret_cast (DynamicAny::NameValuePair*, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_)
-#define _DYNAMICANY_NAMEVALUEPAIRSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class DynamicAny::NameValuePairSeq_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (NameValuePairSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var::NameValuePairSeq_var (const ::DynamicAny::NameValuePairSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::DynamicAny::NameValuePairSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var::~NameValuePairSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var &
-DynamicAny::NameValuePairSeq_var::operator= (NameValuePairSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq_var &
-DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          NameValuePairSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              NameValuePairSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              NameValuePairSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::DynamicAny::NameValuePairSeq *
-DynamicAny::NameValuePairSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq *
-DynamicAny::NameValuePairSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var::operator const ::DynamicAny::NameValuePairSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair &
-DynamicAny::NameValuePairSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const DynamicAny::NameValuePair &
-DynamicAny::NameValuePairSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const DynamicAny::NameValuePair &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::DynamicAny::NameValuePairSeq &
-DynamicAny::NameValuePairSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq &
-DynamicAny::NameValuePairSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq *&
-DynamicAny::NameValuePairSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq *
-DynamicAny::NameValuePairSeq_var::_retn (void)
-{
-  ::DynamicAny::NameValuePairSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq *
-DynamicAny::NameValuePairSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class DynamicAny::NameValuePairSeq_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_out::NameValuePairSeq_out (const ::DynamicAny::NameValuePairSeq_out &p)
-  : ptr_ (ACE_const_cast (NameValuePairSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq_out &
-DynamicAny::NameValuePairSeq_out::operator= (const ::DynamicAny::NameValuePairSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (NameValuePairSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq_out &
-DynamicAny::NameValuePairSeq_out::operator= (NameValuePairSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePairSeq_out::operator ::DynamicAny::NameValuePairSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq *&
-DynamicAny::NameValuePairSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameValuePairSeq *
-DynamicAny::NameValuePairSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameValuePair &
-DynamicAny::NameValuePairSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class DynamicAny::NameDynAnyPair_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (NameDynAnyPair *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var::NameDynAnyPair_var (const ::DynamicAny::NameDynAnyPair_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPair (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var::~NameDynAnyPair_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var &
-DynamicAny::NameDynAnyPair_var::operator= (NameDynAnyPair *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPair_var &
-DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          NameDynAnyPair *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              NameDynAnyPair (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              NameDynAnyPair *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::DynamicAny::NameDynAnyPair *
-DynamicAny::NameDynAnyPair_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameDynAnyPair *
-DynamicAny::NameDynAnyPair_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var::operator const ::DynamicAny::NameDynAnyPair &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::DynamicAny::NameDynAnyPair &
-DynamicAny::NameDynAnyPair_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameDynAnyPair &
-DynamicAny::NameDynAnyPair_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::DynamicAny::NameDynAnyPair *&
-DynamicAny::NameDynAnyPair_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameDynAnyPair *
-DynamicAny::NameDynAnyPair_var::_retn (void)
-{
-  ::DynamicAny::NameDynAnyPair *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::DynamicAny::NameDynAnyPair *
-DynamicAny::NameDynAnyPair_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class DynamicAny::NameDynAnyPair_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (::DynamicAny::NameDynAnyPair *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (NameDynAnyPair_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_out::NameDynAnyPair_out (const ::DynamicAny::NameDynAnyPair_out &p)
-  : ptr_ (ACE_const_cast (NameDynAnyPair_out&, p).ptr_)
-{}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_out &
-DynamicAny::NameDynAnyPair_out::operator= (const ::DynamicAny::NameDynAnyPair_out &p)
-{
-  this->ptr_ = ACE_const_cast (NameDynAnyPair_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair_out &
-DynamicAny::NameDynAnyPair_out::operator= (NameDynAnyPair *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::NameDynAnyPair_out::operator ::DynamicAny::NameDynAnyPair *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameDynAnyPair *&
-DynamicAny::NameDynAnyPair_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::NameDynAnyPair *
-DynamicAny::NameDynAnyPair_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (CORBA::ULong size)
-{
-  DynamicAny::NameDynAnyPair *retval = 0;
-  ACE_NEW_RETURN (retval, DynamicAny::NameDynAnyPair[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (DynamicAny::NameDynAnyPair *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void)
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    DynamicAny::NameDynAnyPair *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (
-    const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      DynamicAny::NameDynAnyPair *tmp1 =
-        _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->maximum_);
-      DynamicAny::NameDynAnyPair * const tmp2 =
-        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator= (
-    const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          DynamicAny::NameDynAnyPair *tmp =
-            ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  DynamicAny::NameDynAnyPair *tmp1 =
-    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
-  DynamicAny::NameDynAnyPair * const tmp2 =
-    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-DynamicAny::NameDynAnyPair &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameDynAnyPair* tmp =
-    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const DynamicAny::NameDynAnyPair &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  DynamicAny::NameDynAnyPair * const tmp =
-    ACE_reinterpret_cast (DynamicAny::NameDynAnyPair* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (CORBA::Boolean orphan)
-{
-  DynamicAny::NameDynAnyPair *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const DynamicAny::NameDynAnyPair *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const DynamicAny::NameDynAnyPair * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    DynamicAny::NameDynAnyPair *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      DynamicAny::NameDynAnyPair *tmp =
-        ACE_reinterpret_cast (DynamicAny::NameDynAnyPair*, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_)
-#define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class DynamicAny::NameDynAnyPairSeq_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (NameDynAnyPairSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::NameDynAnyPairSeq_var (const ::DynamicAny::NameDynAnyPairSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::DynamicAny::NameDynAnyPairSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::~NameDynAnyPairSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var &
-DynamicAny::NameDynAnyPairSeq_var::operator= (NameDynAnyPairSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq_var &
-DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPairSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          NameDynAnyPairSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              NameDynAnyPairSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              NameDynAnyPairSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::DynamicAny::NameDynAnyPairSeq *
-DynamicAny::NameDynAnyPairSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq *
-DynamicAny::NameDynAnyPairSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::operator const ::DynamicAny::NameDynAnyPairSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair &
-DynamicAny::NameDynAnyPairSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const DynamicAny::NameDynAnyPair &
-DynamicAny::NameDynAnyPairSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const DynamicAny::NameDynAnyPair &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::DynamicAny::NameDynAnyPairSeq &
-DynamicAny::NameDynAnyPairSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq &
-DynamicAny::NameDynAnyPairSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq *&
-DynamicAny::NameDynAnyPairSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq *
-DynamicAny::NameDynAnyPairSeq_var::_retn (void)
-{
-  ::DynamicAny::NameDynAnyPairSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq *
-DynamicAny::NameDynAnyPairSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class DynamicAny::NameDynAnyPairSeq_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (NameDynAnyPairSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_out::NameDynAnyPairSeq_out (const ::DynamicAny::NameDynAnyPairSeq_out &p)
-  : ptr_ (ACE_const_cast (NameDynAnyPairSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq_out &
-DynamicAny::NameDynAnyPairSeq_out::operator= (const ::DynamicAny::NameDynAnyPairSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (NameDynAnyPairSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq_out &
-DynamicAny::NameDynAnyPairSeq_out::operator= (NameDynAnyPairSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_out::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq *&
-DynamicAny::NameDynAnyPairSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::NameDynAnyPairSeq *
-DynamicAny::NameDynAnyPairSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::NameDynAnyPair &
-DynamicAny::NameDynAnyPairSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -1409,13 +50,6 @@ DynamicAny::NameDynAnyPairSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_DYNAMICANY_DYNSTRUCT___CI_)
 #define _DYNAMICANY_DYNSTRUCT___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -1424,903 +58,6 @@ DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
 #if !defined (_DYNAMICANY_DYNUNION___CI_)
 #define _DYNAMICANY_DYNUNION___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynUnion::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_
-
-ACE_INLINE
-CORBA::Any *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::Any *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::Any[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (CORBA::Any *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void)
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Any *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (
-    const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::Any *tmp1 =
-        _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->maximum_);
-      CORBA::Any * const tmp2 =
-        ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator= (
-    const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::Any *tmp =
-            ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::Any *tmp1 =
-    ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
-  CORBA::Any * const tmp2 =
-    ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::Any &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::Any* tmp =
-    ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::Any &
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::Any * const tmp =
-    ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::Any *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Any *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::Any *
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Any * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Any *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Any *tmp =
-        ACE_reinterpret_cast (CORBA::Any*, this->buffer_);
-      _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMICANY_ANYSEQ_CI_)
-#define _DYNAMICANY_ANYSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class DynamicAny::AnySeq_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::AnySeq_var::AnySeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-DynamicAny::AnySeq_var::AnySeq_var (AnySeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-DynamicAny::AnySeq_var::AnySeq_var (const ::DynamicAny::AnySeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::DynamicAny::AnySeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::AnySeq_var::~AnySeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::AnySeq_var &
-DynamicAny::AnySeq_var::operator= (AnySeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq_var &
-DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          AnySeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              AnySeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              AnySeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::DynamicAny::AnySeq *
-DynamicAny::AnySeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq *
-DynamicAny::AnySeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::AnySeq_var::operator const ::DynamicAny::AnySeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Any &
-DynamicAny::AnySeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::Any &
-DynamicAny::AnySeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Any &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::DynamicAny::AnySeq &
-DynamicAny::AnySeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq &
-DynamicAny::AnySeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq *&
-DynamicAny::AnySeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq *
-DynamicAny::AnySeq_var::_retn (void)
-{
-  ::DynamicAny::AnySeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq *
-DynamicAny::AnySeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class DynamicAny::AnySeq_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::AnySeq_out::AnySeq_out (AnySeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::AnySeq_out::AnySeq_out (AnySeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::AnySeq_out::AnySeq_out (const ::DynamicAny::AnySeq_out &p)
-  : ptr_ (ACE_const_cast (AnySeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::DynamicAny::AnySeq_out &
-DynamicAny::AnySeq_out::operator= (const ::DynamicAny::AnySeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (AnySeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq_out &
-DynamicAny::AnySeq_out::operator= (AnySeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-DynamicAny::AnySeq_out::operator ::DynamicAny::AnySeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq *&
-DynamicAny::AnySeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::AnySeq *
-DynamicAny::AnySeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Any &
-DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_
-
-ACE_INLINE
-DynamicAny::DynAny **
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (CORBA::ULong nelems)
-{
-  DynamicAny::DynAny **buf = 0;
-  
-  ACE_NEW_RETURN (buf, DynamicAny::DynAny*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = DynamicAny::DynAny::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (DynamicAny::DynAny **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void)
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    DynamicAny::DynAny* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(
-    const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      DynamicAny::DynAny **tmp1 =
-        _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
-      DynamicAny::DynAny ** const tmp2 =
-        ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      DynamicAny::DynAny **tmp =
-        ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = DynamicAny::DynAny::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  DynamicAny::DynAny **tmp1 =
-    ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
-  
-  DynamicAny::DynAny ** const tmp2 =
-    ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  DynamicAny::DynAny ** const tmp =
-    ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-DynamicAny::DynAny* *
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (CORBA::Boolean orphan)
-{
-  DynamicAny::DynAny **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(DynamicAny::DynAny**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const DynamicAny::DynAny* *
-DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMICANY_DYNANYSEQ_CI_)
-#define _DYNAMICANY_DYNANYSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynAnySeq_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynAnySeq_var::DynAnySeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_var::DynAnySeq_var (DynAnySeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_var::DynAnySeq_var (const ::DynamicAny::DynAnySeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::DynamicAny::DynAnySeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_var::~DynAnySeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_var &
-DynamicAny::DynAnySeq_var::operator= (DynAnySeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq_var &
-DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          DynAnySeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              DynAnySeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              DynAnySeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::DynamicAny::DynAnySeq *
-DynamicAny::DynAnySeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq *
-DynamicAny::DynAnySeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_var::operator const ::DynamicAny::DynAnySeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
-DynamicAny::DynAnySeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::DynamicAny::DynAnySeq &
-DynamicAny::DynAnySeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq &
-DynamicAny::DynAnySeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq *&
-DynamicAny::DynAnySeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq *
-DynamicAny::DynAnySeq_var::_retn (void)
-{
-  ::DynamicAny::DynAnySeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq *
-DynamicAny::DynAnySeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynAnySeq_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_out::DynAnySeq_out (DynAnySeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_out::DynAnySeq_out (const ::DynamicAny::DynAnySeq_out &p)
-  : ptr_ (ACE_const_cast (DynAnySeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq_out &
-DynamicAny::DynAnySeq_out::operator= (const ::DynamicAny::DynAnySeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynAnySeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq_out &
-DynamicAny::DynAnySeq_out::operator= (DynAnySeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-DynamicAny::DynAnySeq_out::operator ::DynamicAny::DynAnySeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq *&
-DynamicAny::DynAnySeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::DynamicAny::DynAnySeq *
-DynamicAny::DynAnySeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<DynamicAny::DynAny, DynamicAny::DynAny_var>
-DynamicAny::DynAnySeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -2329,13 +66,6 @@ DynamicAny::DynAnySeq_out::operator[] (CORBA::ULong index)
 #if !defined (_DYNAMICANY_DYNSEQUENCE___CI_)
 #define _DYNAMICANY_DYNSEQUENCE___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -2344,13 +74,6 @@ DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
 #if !defined (_DYNAMICANY_DYNARRAY___CI_)
 #define _DYNAMICANY_DYNARRAY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynArray::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -2359,13 +82,6 @@ DynamicAny::DynArray::marshal (TAO_OutputCDR &)
 #if !defined (_DYNAMICANY_DYNVALUE___CI_)
 #define _DYNAMICANY_DYNVALUE___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynValue::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -2374,17 +90,10 @@ DynamicAny::DynValue::marshal (TAO_OutputCDR &)
 #if !defined (_DYNAMICANY_DYNANYFACTORY___CI_)
 #define _DYNAMICANY_DYNANYFACTORY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-DynamicAny::DynAnyFactory::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index ab184af4546..11655c250e8 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -24,17 +24,6 @@
 
 
 #include "DynamicC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -51,61 +40,61 @@ static const CORBA::Long _oc_Dynamic_Parameter[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x723a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x723a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
     10,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
   ACE_NTOHL (0x72000000),  // name = Parameter
   2, // member count
     9,
-  ACE_NTOHL (0x61726775), 
-  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x61726775),
+  ACE_NTOHL (0x6d656e74),
   ACE_NTOHL (0x0),  // name = argument
     CORBA::tk_any,
 
   5,
-  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x6d6f6465),
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5061), 
-    ACE_NTOHL (0x72616d65), 
-    ACE_NTOHL (0x7465724d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5061),
+    ACE_NTOHL (0x72616d65),
+    ACE_NTOHL (0x7465724d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
     14,
-    ACE_NTOHL (0x50617261), 
-    ACE_NTOHL (0x6d657465), 
-    ACE_NTOHL (0x724d6f64), 
+    ACE_NTOHL (0x50617261),
+    ACE_NTOHL (0x6d657465),
+    ACE_NTOHL (0x724d6f64),
     ACE_NTOHL (0x65000000),  // name = ParameterMode
     3, // member count
     9,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
     ACE_NTOHL (0x0),  // name = PARAM_IN
     10,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f4f55), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f4f55),
     ACE_NTOHL (0x54000000),  // name = PARAM_OUT
     12,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-    
+
 };
 
 static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
@@ -125,8 +114,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -134,85 +123,48 @@ void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CS_
+template class
+  TAO_Var_Var_T<
+      Parameter
+    >;
 
-void
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_allocate_buffer (CORBA::ULong length)
-{
-  Dynamic::Parameter* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      Dynamic::Parameter *old =
-        ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Out_T<
+      Parameter,
+      Parameter_var
+    >;
 
-void
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  Dynamic::Parameter *tmp =
-    ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-  _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      Parameter \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      Parameter, \
+      Parameter_var \
+    >
 
-#if !defined (_DYNAMIC_PARAMETERLIST_CS_)
-#define _DYNAMIC_PARAMETERLIST_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// Dynamic::ParameterList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 Dynamic::ParameterList::ParameterList (void)
 {}
 
 Dynamic::ParameterList::ParameterList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Dynamic_ParameterList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Dynamic::Parameter>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        Dynamic::Parameter
+      >
+    (max)
 {}
 
 Dynamic::ParameterList::ParameterList (
@@ -221,30 +173,20 @@ Dynamic::ParameterList::ParameterList (
     Dynamic::Parameter *buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Dynamic_ParameterList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Dynamic::Parameter>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        Dynamic::Parameter
+      >
+    (max, length, buffer, release)
 {}
 
 Dynamic::ParameterList::ParameterList (const ParameterList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Dynamic_ParameterList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Dynamic::Parameter>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        Dynamic::Parameter
+      >
+    (seq)
 {}
 
-Dynamic::ParameterList::~ParameterList (void) // dtor
+Dynamic::ParameterList::~ParameterList (void)
 {}
 
 void Dynamic::ParameterList::_tao_any_destructor (void *_tao_void_pointer)
@@ -253,7 +195,37 @@ void Dynamic::ParameterList::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      ParameterList,
+      Dynamic::Parameter
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ParameterList,
+      ParameterList_var,
+      Dynamic::Parameter
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ParameterList, \
+      Dynamic::Parameter \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ParameterList, \
+      ParameterList_var, \
+      Dynamic::Parameter \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -262,20 +234,20 @@ static const CORBA::Long _oc_Dynamic_ParameterList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x743a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0
     14,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x724c6973), 
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x724c6973),
   ACE_NTOHL (0x74000000),  // name = ParameterList
     CORBA::tk_sequence, // typecode kind
   236, // encapsulation length
@@ -284,61 +256,61 @@ static const CORBA::Long _oc_Dynamic_ParameterList[] =
     220, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x44796e61), 
-      ACE_NTOHL (0x6d69632f), 
-      ACE_NTOHL (0x50617261), 
-      ACE_NTOHL (0x6d657465), 
-      ACE_NTOHL (0x723a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x44796e61),
+      ACE_NTOHL (0x6d69632f),
+      ACE_NTOHL (0x50617261),
+      ACE_NTOHL (0x6d657465),
+      ACE_NTOHL (0x723a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
             10,
-      ACE_NTOHL (0x50617261), 
-      ACE_NTOHL (0x6d657465), 
+      ACE_NTOHL (0x50617261),
+      ACE_NTOHL (0x6d657465),
       ACE_NTOHL (0x72000000),  // name = Parameter
       2, // member count
             9,
-      ACE_NTOHL (0x61726775), 
-      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x61726775),
+      ACE_NTOHL (0x6d656e74),
       ACE_NTOHL (0x0),  // name = argument
             CORBA::tk_any,
 
       5,
-      ACE_NTOHL (0x6d6f6465), 
+      ACE_NTOHL (0x6d6f6465),
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5061), 
-        ACE_NTOHL (0x72616d65), 
-        ACE_NTOHL (0x7465724d), 
-        ACE_NTOHL (0x6f64653a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5061),
+        ACE_NTOHL (0x72616d65),
+        ACE_NTOHL (0x7465724d),
+        ACE_NTOHL (0x6f64653a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
         14,
-        ACE_NTOHL (0x50617261), 
-        ACE_NTOHL (0x6d657465), 
-        ACE_NTOHL (0x724d6f64), 
+        ACE_NTOHL (0x50617261),
+        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x724d6f64),
         ACE_NTOHL (0x65000000),  // name = ParameterMode
         3, // member count
         9,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f494e), 
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f494e),
         ACE_NTOHL (0x0),  // name = PARAM_IN
         10,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f4f55), 
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f4f55),
         ACE_NTOHL (0x54000000),  // name = PARAM_OUT
         12,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f494e), 
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f494e),
         ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-        
+
 
     0U,
 
@@ -368,39 +340,39 @@ static const CORBA::Long _oc_Dynamic_ContextList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x6578744c), 
-  ACE_NTOHL (0x6973743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x6578744c),
+  ACE_NTOHL (0x6973743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Dynamic/ContextList:1.0
     12,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x6578744c), 
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x6578744c),
   ACE_NTOHL (0x69737400),  // name = ContextList
     CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72696e67), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5374),
+    ACE_NTOHL (0x72696e67),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
         10,
-    ACE_NTOHL (0x53747269), 
-    ACE_NTOHL (0x6e675365), 
+    ACE_NTOHL (0x53747269),
+    ACE_NTOHL (0x6e675365),
     ACE_NTOHL (0x71000000),  // name = StringSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       0U,
 
@@ -431,18 +403,18 @@ static const CORBA::Long _oc_Dynamic_TypeCode[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Dynamic/TypeCode:1.0
     9,
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x436f6465),
   ACE_NTOHL (0x0),  // name = TypeCode
     CORBA::tk_TypeCode,
 
@@ -466,111 +438,17 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::TypeCode **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::TypeCode **old = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA::TypeCode::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::TypeCode::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::~_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::TypeCode **tmp = ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::TypeCode::_nil ();
-    }
-}
-
-
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CS_)
-#define _DYNAMIC_EXCEPTIONLIST_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// Dynamic::ExceptionList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 Dynamic::ExceptionList::ExceptionList (void)
 {}
 
 Dynamic::ExceptionList::ExceptionList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Pseudo_Sequence<
+        Dynamic::TypeCode,
+        Dynamic::TypeCode_var
+      >
+    (max)
 {}
 
 Dynamic::ExceptionList::ExceptionList (
@@ -579,30 +457,22 @@ Dynamic::ExceptionList::ExceptionList (
     CORBA::TypeCode_ptr *buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Pseudo_Sequence<
+        Dynamic::TypeCode,
+        Dynamic::TypeCode_var
+      >
+    (max, length, buffer, release)
 {}
 
 Dynamic::ExceptionList::ExceptionList (const ExceptionList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Pseudo_Sequence<
+        Dynamic::TypeCode,
+        Dynamic::TypeCode_var
+      >
+    (seq)
 {}
 
-Dynamic::ExceptionList::~ExceptionList (void) // dtor
+Dynamic::ExceptionList::~ExceptionList (void)
 {}
 
 void Dynamic::ExceptionList::_tao_any_destructor (void *_tao_void_pointer)
@@ -611,7 +481,49 @@ void Dynamic::ExceptionList::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      Dynamic::ExceptionList,
+      TAO_Pseudo_Object_Manager<
+          Dynamic::TypeCode,
+          Dynamic::TypeCode_var
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      Dynamic::ExceptionList,
+      Dynamic::ExceptionList_var,
+      TAO_Pseudo_Object_Manager<
+          Dynamic::TypeCode,
+          Dynamic::TypeCode_var
+        >
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      Dynamic::ExceptionList, \
+      TAO_Pseudo_Object_Manager< \
+          Dynamic::TypeCode, \
+          Dynamic::TypeCode_var \
+        > \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      Dynamic::ExceptionList, \
+      Dynamic::ExceptionList_var, \
+      TAO_Pseudo_Object_Manager< \
+          Dynamic::TypeCode, \
+          Dynamic::TypeCode_var \
+        > \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -620,20 +532,20 @@ static const CORBA::Long _oc_Dynamic_ExceptionList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e4c6973), 
-  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x743a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0
     14,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e4c6973), 
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e4c6973),
   ACE_NTOHL (0x74000000),  // name = ExceptionList
     CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
@@ -642,18 +554,18 @@ static const CORBA::Long _oc_Dynamic_ExceptionList[] =
     64, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x44796e61), 
-      ACE_NTOHL (0x6d69632f), 
-      ACE_NTOHL (0x54797065), 
-      ACE_NTOHL (0x436f6465), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x44796e61),
+      ACE_NTOHL (0x6d69632f),
+      ACE_NTOHL (0x54797065),
+      ACE_NTOHL (0x436f6465),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Dynamic/TypeCode:1.0
             9,
-      ACE_NTOHL (0x54797065), 
-      ACE_NTOHL (0x436f6465), 
+      ACE_NTOHL (0x54797065),
+      ACE_NTOHL (0x436f6465),
       ACE_NTOHL (0x0),  // name = TypeCode
             CORBA::tk_TypeCode,
 
@@ -686,41 +598,41 @@ static const CORBA::Long _oc_Dynamic_RequestContext[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737443), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737443),
+  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x78743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0
     15,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737443), 
-  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737443),
+  ACE_NTOHL (0x6f6e7465),
   ACE_NTOHL (0x78740000),  // name = RequestContext
     CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72696e67), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5374),
+    ACE_NTOHL (0x72696e67),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
         10,
-    ACE_NTOHL (0x53747269), 
-    ACE_NTOHL (0x6e675365), 
+    ACE_NTOHL (0x53747269),
+    ACE_NTOHL (0x6e675365),
     ACE_NTOHL (0x71000000),  // name = StringSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       0U,
 
@@ -744,7 +656,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -809,7 +721,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::Parameter>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -874,7 +786,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::ParameterList>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -940,7 +852,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -948,20 +860,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -971,7 +883,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -981,32 +893,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1014,20 +926,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -1037,7 +949,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1047,27 +959,26 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
-
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index 4e384bd664a..bf8bb56e1f1 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -36,6 +36,9 @@
 #include "tao/TAO_Export.h"
 #include "tao/Any_T.h"
 #include "tao/Sequence.h"
+#include "tao/VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -67,9 +70,25 @@ TAO_NAMESPACE  Dynamic
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class Parameter_var;
+  struct Parameter;
+  
+  typedef
+    TAO_Var_Var_T<
+        Parameter
+      >
+    Parameter_var;
+  
+  typedef
+    TAO_Out_T<
+        Parameter,
+        Parameter_var
+      >
+    Parameter_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export Parameter
   {
@@ -81,234 +100,52 @@ TAO_NAMESPACE  Dynamic
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export Parameter_var
-  {
-  public:
-    Parameter_var (void);
-    Parameter_var (Parameter *);
-    Parameter_var (const Parameter_var &);
-    ~Parameter_var (void);
-    
-    Parameter_var &operator= (Parameter *);
-    Parameter_var &operator= (const Parameter_var &);
-    Parameter *operator-> (void);
-    const Parameter *operator-> (void) const;
-    
-    operator const Parameter &() const;
-    operator Parameter &();
-    operator Parameter &() const;
-    
-    // Variable-size types only.
-    operator Parameter *&();
-    
-    // in, inout, out, _retn 
-    const Parameter &in (void) const;
-    Parameter &inout (void);
-    Parameter *&out (void);
-    Parameter *_retn (void);
-    Parameter *ptr (void) const;
-  
-  private:
-    Parameter *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_Export Parameter_out
-  {
-  public:
-    Parameter_out (Parameter *&);
-    Parameter_out (Parameter_var &);
-    Parameter_out (const Parameter_out &);
-    Parameter_out &operator= (const Parameter_out &);
-    Parameter_out &operator= (Parameter *);
-    operator Parameter *&();
-    Parameter *&ptr (void);
-    Parameter *operator-> (void);
-    
-  private:
-    Parameter *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const Parameter_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
   
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Sequence_Dynamic_ParameterList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList (void);
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        Parameter *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList (
-        const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
-      );
-    _TAO_Unbounded_Sequence_Dynamic_ParameterList &operator= (
-        const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_Dynamic_ParameterList (void);
-    
-    // = Accessors.
-    Parameter &operator[] (CORBA::ULong i);
-    const Parameter &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static Parameter *allocbuf (CORBA::ULong size);
-    static void freebuf (Parameter *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    Parameter *get_buffer (CORBA::Boolean orphan = 0);
-    const Parameter *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Parameter *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CH_)
-#define _DYNAMIC_PARAMETERLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
   
   class ParameterList;
-  class ParameterList_var;
-  
-  // *************************************************************
-  // Dynamic::ParameterList
-  // *************************************************************
   
-  class TAO_Export ParameterList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_Dynamic_ParameterList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<Parameter>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_VarSeq_Var_T<
+        ParameterList,
+        Dynamic::Parameter
+      >
+    ParameterList_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ParameterList,
+        ParameterList_var,
+        Dynamic::Parameter
+      >
+    ParameterList_out;
+  
+  class TAO_Export ParameterList
+    : public
+        TAO_Unbounded_Sequence<
+            Dynamic::Parameter
+          >
   {
   public:
     ParameterList (void);
     ParameterList (CORBA::ULong max);
     ParameterList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
+        CORBA::ULong max,
+        CORBA::ULong length,
         Parameter *buffer, 
         CORBA::Boolean release = 0
       );
     ParameterList (const ParameterList &);
     ~ParameterList (void);
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
     
     typedef ParameterList_var _var_type;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_PARAMETERLIST___VAR_CH_)
-#define _DYNAMIC_PARAMETERLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class Dynamic::ParameterList_var
-  // *************************************************************
-  
-  class TAO_Export ParameterList_var
-  {
-  public:
-    ParameterList_var (void);
-    ParameterList_var (ParameterList *);
-    ParameterList_var (const ParameterList_var &);
-    ~ParameterList_var (void);
-    
-    ParameterList_var &operator= (ParameterList *);
-    ParameterList_var &operator= (const ParameterList_var &);
-    ParameterList *operator-> (void);
-    const ParameterList *operator-> (void) const;
-    
-    operator const ParameterList &() const;
-    operator ParameterList &();
-    operator ParameterList &() const;
-    
-    // Variable-size base types only.
-    operator ParameterList *&();
-    
-    Parameter & operator[] (CORBA::ULong index);
-    const Parameter & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ParameterList &in (void) const;
-    ParameterList &inout (void);
-    ParameterList *&out (void);
-    ParameterList *_retn (void);
-    ParameterList *ptr (void) const;
-  
-  private:
-    ParameterList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_PARAMETERLIST___OUT_CH_)
-#define _DYNAMIC_PARAMETERLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export ParameterList_out
-  {
-  public:
-    ParameterList_out (ParameterList *&);
-    ParameterList_out (ParameterList_var &);
-    ParameterList_out (const ParameterList_out &);
-    ParameterList_out &operator= (const ParameterList_out &);
-    ParameterList_out &operator= (ParameterList *);
-    operator ParameterList *&();
-    ParameterList *&ptr (void);
-    ParameterList *operator-> (void);
-    Parameter & operator[] (CORBA::ULong index);
-  
-  private:
-    ParameterList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ParameterList_var &);
-  };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -316,7 +153,7 @@ TAO_NAMESPACE  Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterList;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
   
   typedef CORBA::StringSeq ContextList;
   typedef CORBA::StringSeq_var ContextList_var;
@@ -328,7 +165,7 @@ TAO_NAMESPACE  Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextList;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::TypeCode TypeCode;
   typedef CORBA::TypeCode_ptr TypeCode_ptr;
@@ -341,170 +178,54 @@ TAO_NAMESPACE  Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCode;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA::TypeCode* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
-        const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &operator= (
-        const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void);
-    
-    // = Accessors.
-    TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static CORBA::TypeCode **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA::TypeCode **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA::TypeCode* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA::TypeCode* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CH_)
-#define _DYNAMIC_EXCEPTIONLIST_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
   
   class ExceptionList;
-  class ExceptionList_var;
   
-  // *************************************************************
-  // Dynamic::ExceptionList
-  // *************************************************************
-  
-  class TAO_Export ExceptionList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,CORBA::TypeCode_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_VarSeq_Var_T<
+        ExceptionList,
+        TAO_Pseudo_Object_Manager<
+            Dynamic::TypeCode,
+            Dynamic::TypeCode_var
+          >
+      >
+    ExceptionList_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ExceptionList,
+        ExceptionList_var,
+        TAO_Pseudo_Object_Manager<
+            Dynamic::TypeCode,
+            Dynamic::TypeCode_var
+          >
+      >
+    ExceptionList_out;
+  
+  class TAO_Export ExceptionList
+    : public
+        TAO_Unbounded_Pseudo_Sequence<
+            Dynamic::TypeCode,
+            Dynamic::TypeCode_var
+          >
   {
   public:
     ExceptionList (void);
     ExceptionList (CORBA::ULong max);
     ExceptionList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
+        CORBA::ULong max,
+        CORBA::ULong length,
         CORBA::TypeCode_ptr *buffer, 
         CORBA::Boolean release = 0
       );
     ExceptionList (const ExceptionList &);
     ~ExceptionList (void);
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
     
     typedef ExceptionList_var _var_type;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST___VAR_CH_)
-#define _DYNAMIC_EXCEPTIONLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class Dynamic::ExceptionList_var
-  // *************************************************************
-  
-  class TAO_Export ExceptionList_var
-  {
-  public:
-    ExceptionList_var (void);
-    ExceptionList_var (ExceptionList *);
-    ExceptionList_var (const ExceptionList_var &);
-    ~ExceptionList_var (void);
-    
-    ExceptionList_var &operator= (ExceptionList *);
-    ExceptionList_var &operator= (const ExceptionList_var &);
-    ExceptionList *operator-> (void);
-    const ExceptionList *operator-> (void) const;
-    
-    operator const ExceptionList &() const;
-    operator ExceptionList &();
-    operator ExceptionList &() const;
-    
-    // Variable-size base types only.
-    operator ExceptionList *&();
-    
-    TAO_Pseudo_Object_Manager<TypeCode,TypeCode_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ExceptionList &in (void) const;
-    ExceptionList &inout (void);
-    ExceptionList *&out (void);
-    ExceptionList *_retn (void);
-    ExceptionList *ptr (void) const;
-  
-  private:
-    ExceptionList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST___OUT_CH_)
-#define _DYNAMIC_EXCEPTIONLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export ExceptionList_out
-  {
-  public:
-    ExceptionList_out (ExceptionList *&);
-    ExceptionList_out (ExceptionList_var &);
-    ExceptionList_out (const ExceptionList_out &);
-    ExceptionList_out &operator= (const ExceptionList_out &);
-    ExceptionList_out &operator= (ExceptionList *);
-    operator ExceptionList *&();
-    ExceptionList *&ptr (void);
-    ExceptionList *operator-> (void);
-    TAO_Pseudo_Object_Manager<TypeCode,TypeCode_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ExceptionList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExceptionList_var &);
-  };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -512,7 +233,7 @@ TAO_NAMESPACE  Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionList;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
   
   typedef CORBA::StringSeq RequestContext;
   typedef CORBA::StringSeq_var RequestContext_var;
@@ -604,7 +325,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "DynamicC.i"
diff --git a/TAO/tao/DynamicC.i b/TAO/tao/DynamicC.i
index 323bbc4e31d..768188d6cad 100644
--- a/TAO/tao/DynamicC.i
+++ b/TAO/tao/DynamicC.i
@@ -21,1108 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class Dynamic::Parameter_var
-// *************************************************************
-
-ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (Parameter *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Dynamic::Parameter_var::Parameter_var (const ::Dynamic::Parameter_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Dynamic::Parameter (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::Parameter_var::~Parameter_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter_var &
-Dynamic::Parameter_var::operator= (Parameter *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::Parameter_var &
-Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Parameter *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Parameter (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Parameter *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::Dynamic::Parameter *
-Dynamic::Parameter_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter *
-Dynamic::Parameter_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter_var::operator const ::Dynamic::Parameter &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Dynamic::Parameter_var::operator ::Dynamic::Parameter *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::Dynamic::Parameter &
-Dynamic::Parameter_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter &
-Dynamic::Parameter_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::Dynamic::Parameter *&
-Dynamic::Parameter_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter *
-Dynamic::Parameter_var::_retn (void)
-{
-  ::Dynamic::Parameter *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::Dynamic::Parameter *
-Dynamic::Parameter_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class Dynamic::Parameter_out
-// *************************************************************
-
-ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (::Dynamic::Parameter *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (Parameter_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::Parameter_out::Parameter_out (const ::Dynamic::Parameter_out &p)
-  : ptr_ (ACE_const_cast (Parameter_out&, p).ptr_)
-{}
-
-ACE_INLINE
-Dynamic::Parameter_out &
-Dynamic::Parameter_out::operator= (const ::Dynamic::Parameter_out &p)
-{
-  this->ptr_ = ACE_const_cast (Parameter_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-Dynamic::Parameter_out &
-Dynamic::Parameter_out::operator= (Parameter *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-Dynamic::Parameter_out::operator ::Dynamic::Parameter *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter *&
-Dynamic::Parameter_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Dynamic::Parameter *
-Dynamic::Parameter_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_DYNAMIC_PARAMETERLIST_CI_
-
-ACE_INLINE
-Dynamic::Parameter *
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (CORBA::ULong size)
-{
-  Dynamic::Parameter *retval = 0;
-  ACE_NEW_RETURN (retval, Dynamic::Parameter[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (Dynamic::Parameter *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (void)
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    Dynamic::Parameter *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::_TAO_Unbounded_Sequence_Dynamic_ParameterList (
-    const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      Dynamic::Parameter *tmp1 =
-        _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->maximum_);
-      Dynamic::Parameter * const tmp2 =
-        ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList &
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator= (
-    const _TAO_Unbounded_Sequence_Dynamic_ParameterList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          Dynamic::Parameter *tmp =
-            ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  Dynamic::Parameter *tmp1 =
-    ACE_reinterpret_cast (Dynamic::Parameter *, this->buffer_);
-  Dynamic::Parameter * const tmp2 =
-    ACE_reinterpret_cast (Dynamic::Parameter * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-Dynamic::Parameter &
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  Dynamic::Parameter* tmp =
-    ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const Dynamic::Parameter &
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  Dynamic::Parameter * const tmp =
-    ACE_reinterpret_cast (Dynamic::Parameter* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-Dynamic::Parameter *
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (CORBA::Boolean orphan)
-{
-  Dynamic::Parameter *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_Dynamic_ParameterList::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(Dynamic::Parameter*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const Dynamic::Parameter *
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const Dynamic::Parameter * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-Dynamic::_TAO_Unbounded_Sequence_Dynamic_ParameterList::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    Dynamic::Parameter *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      Dynamic::Parameter *tmp =
-        ACE_reinterpret_cast (Dynamic::Parameter*, this->buffer_);
-      _TAO_Unbounded_Sequence_Dynamic_ParameterList::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CI_)
-#define _DYNAMIC_PARAMETERLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class Dynamic::ParameterList_var
-// *************************************************************
-
-ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (ParameterList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Dynamic::ParameterList_var::ParameterList_var (const ::Dynamic::ParameterList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Dynamic::ParameterList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var::~ParameterList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var &
-Dynamic::ParameterList_var::operator= (ParameterList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList_var &
-Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ParameterList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ParameterList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ParameterList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::Dynamic::ParameterList *
-Dynamic::ParameterList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *
-Dynamic::ParameterList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var::operator const ::Dynamic::ParameterList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Dynamic::ParameterList_var::operator ::Dynamic::ParameterList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter &
-Dynamic::ParameterList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const Dynamic::Parameter &
-Dynamic::ParameterList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const Dynamic::Parameter &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::Dynamic::ParameterList &
-Dynamic::ParameterList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList &
-Dynamic::ParameterList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *&
-Dynamic::ParameterList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *
-Dynamic::ParameterList_var::_retn (void)
-{
-  ::Dynamic::ParameterList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *
-Dynamic::ParameterList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class Dynamic::ParameterList_out
-// *************************************************************
-
-ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (ParameterList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (ParameterList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_out::ParameterList_out (const ::Dynamic::ParameterList_out &p)
-  : ptr_ (ACE_const_cast (ParameterList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::Dynamic::ParameterList_out &
-Dynamic::ParameterList_out::operator= (const ::Dynamic::ParameterList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ParameterList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList_out &
-Dynamic::ParameterList_out::operator= (ParameterList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Dynamic::ParameterList_out::operator ::Dynamic::ParameterList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *&
-Dynamic::ParameterList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ParameterList *
-Dynamic::ParameterList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::Parameter &
-Dynamic::ParameterList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMIC_EXCEPTIONLIST_CI_
-
-ACE_INLINE
-CORBA::TypeCode **
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::TypeCode **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::TypeCode*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::TypeCode::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (CORBA::TypeCode **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (void)
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::TypeCode* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList(
-    const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::TypeCode **tmp1 =
-        _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
-      CORBA::TypeCode ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator= (
-    const _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::TypeCode **tmp =
-        ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = CORBA::TypeCode::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::TypeCode **tmp1 =
-    ACE_reinterpret_cast (CORBA::TypeCode **, this->buffer_);
-  
-  CORBA::TypeCode ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::TypeCode::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::TypeCode ** const tmp =
-    ACE_reinterpret_cast (CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::TypeCode* *
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::TypeCode **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::TypeCode**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::TypeCode**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::TypeCode* *
-Dynamic::_TAO_Unbounded_Object_Sequence_Dynamic_ExceptionList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::TypeCode ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CI_)
-#define _DYNAMIC_EXCEPTIONLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class Dynamic::ExceptionList_var
-// *************************************************************
-
-ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (ExceptionList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::ExceptionList_var (const ::Dynamic::ExceptionList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Dynamic::ExceptionList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::~ExceptionList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var &
-Dynamic::ExceptionList_var::operator= (ExceptionList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList_var &
-Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExceptionList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExceptionList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExceptionList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::Dynamic::ExceptionList *
-Dynamic::ExceptionList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *
-Dynamic::ExceptionList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::operator const ::Dynamic::ExceptionList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Dynamic::ExceptionList_var::operator ::Dynamic::ExceptionList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
-Dynamic::ExceptionList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::Dynamic::ExceptionList &
-Dynamic::ExceptionList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList &
-Dynamic::ExceptionList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *&
-Dynamic::ExceptionList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *
-Dynamic::ExceptionList_var::_retn (void)
-{
-  ::Dynamic::ExceptionList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *
-Dynamic::ExceptionList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class Dynamic::ExceptionList_out
-// *************************************************************
-
-ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (ExceptionList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_out::ExceptionList_out (const ::Dynamic::ExceptionList_out &p)
-  : ptr_ (ACE_const_cast (ExceptionList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::Dynamic::ExceptionList_out &
-Dynamic::ExceptionList_out::operator= (const ::Dynamic::ExceptionList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExceptionList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList_out &
-Dynamic::ExceptionList_out::operator= (ExceptionList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Dynamic::ExceptionList_out::operator ::Dynamic::ExceptionList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *&
-Dynamic::ExceptionList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Dynamic::ExceptionList *
-Dynamic::ExceptionList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Pseudo_Object_Manager<Dynamic::TypeCode,Dynamic::TypeCode_var>
-Dynamic::ExceptionList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index d4597c1cf9f..1f881dbdce4 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -211,3 +211,20 @@ CORBA::ContextList::_decr_refcnt (void)
       delete this;
     }
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Var_T<CORBA::Context>;
+  template class TAO_Pseudo_Out_T<CORBA::Context, CORBA::Context_var>;
+  template class TAO_Pseudo_Var_T<CORBA::ContextList>;
+  template class TAO_Pseudo_Out_T<CORBA::ContextList, CORBA::ContextList_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::Context>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::Context, CORBA::Context_var>
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::ContextList>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::ContextList, CORBA::ContextList_var>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 29ab3664b70..3683727bd59 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -19,17 +19,29 @@
 #include "ace/pre.h"
 
 #include "dynamicinterface_export.h"
-#include "tao/corbafwd.h"
-#include "ace/Unbounded_Queue.h"
-#include "ace/Atomic_Op.h"
-#include "ace/CORBA_macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/corbafwd.h"
+#include "tao/Pseudo_VarOut_T.h"
+
+#include "ace/Unbounded_Queue.h"
+#include "ace/Atomic_Op.h"
+#include "ace/CORBA_macros.h"
+
 namespace CORBA
 {
+  TAO_DynamicInterface_Export void release (ContextList_ptr);
+  TAO_DynamicInterface_Export Boolean is_nil (ContextList_ptr);
+
+  typedef TAO_Pseudo_Var_T<Context> Context_var;
+  typedef TAO_Pseudo_Out_T<Context, Context_var> Context_out;
+
+  typedef TAO_Pseudo_Var_T<ContextList> ContextList_var;
+  typedef TAO_Pseudo_Out_T<ContextList, ContextList_var> ContextList_out;
+
   /**
    * @class Context
    *
@@ -97,62 +109,6 @@ namespace CORBA
     TAO_SYNCH_MUTEX refcount_lock_;
   };
 
-  /**
-   * @class Context_var
-   *
-   * @brief The T_var class for Context.
-   *
-   * As any other pseudo object Context must have a T_var class, the
-   * interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_DynamicInterface_Export Context_var
-  {
-  public:
-    Context_var (void);
-    Context_var (CORBA::Context_ptr);
-    Context_var (const Context_var &);
-    ~Context_var (void);
-
-    Context_var &operator= (CORBA::Context_ptr);
-    Context_var &operator= (const Context_var &);
-    Context_ptr operator-> (void) const;
-
-    operator const CORBA::Context_ptr &() const;
-    operator CORBA::Context_ptr &();
-    // in, inout, out, _retn
-    Context_ptr in (void) const;
-    Context_ptr &inout (void);
-    Context_ptr &out (void);
-    Context_ptr _retn (void);
-    Context_ptr ptr (void) const;
-
-  private:
-    Context_ptr ptr_;
-  };
-
-  class TAO_DynamicInterface_Export Context_out
-  {
-    // = TITLE
-    //    The T_out class for Context
-    //
-    // = DESCRIPTION
-    //    As any other pseudo object Context must have a T_out class,
-    //    the interface an semantics are specified in the CORBA spec.
-  public:
-    Context_out (Context_ptr &);
-    Context_out (Context_var &);
-    Context_out (Context_out &);
-    Context_out &operator= (Context_out &);
-    Context_out &operator= (const Context_var &);
-    Context_out &operator= (Context_ptr);
-    operator Context_ptr &();
-    Context_ptr &ptr (void);
-    Context_ptr operator-> (void);
-
-  private:
-    CORBA::Context_ptr &ptr_;
-  };
-
   class TAO_DynamicInterface_Export ContextList
   {
     // = TITLE
@@ -205,12 +161,9 @@ namespace CORBA
     void  _decr_refcnt (void);
     // Increment and decrement ref counts.
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     // Useful for template programming.
     typedef CORBA::ContextList_ptr _ptr_type;
     typedef CORBA::ContextList_var _var_type;
-#endif /* __GNUC__ */
-
 
   private:
   // Not allowed.
@@ -223,60 +176,6 @@ namespace CORBA
     ACE_Unbounded_Queue<char *> ctx_list_;
     // Internal list of typecodes.
   };
-
-  class TAO_DynamicInterface_Export ContextList_var
-  {
-  public:
-    ContextList_var (void); // default constructor
-    ContextList_var (ContextList_ptr);
-    ContextList_var (const ContextList_var &); // copy constructor
-    ~ContextList_var (void); // destructor
-
-    ContextList_var &operator= (ContextList_ptr);
-    ContextList_var &operator= (const ContextList_var &);
-    ContextList_ptr operator-> (void) const;
-
-    operator const ContextList_ptr &() const;
-    operator ContextList_ptr &();
-    // in, inout, out, _retn
-    ContextList_ptr in (void) const;
-    ContextList_ptr &inout (void);
-    ContextList_ptr &out (void);
-    ContextList_ptr _retn (void);
-    ContextList_ptr ptr (void) const;
-
-  private:
-    ContextList_ptr ptr_;
-  };
-
-  class TAO_DynamicInterface_Export ContextList_out
-  {
-    // = TITLE
-    //    The T_out class for ContextList
-    //
-    // = DESCRIPTION
-    //    As any other pseudo object ContextList must have a T_out class,
-    //    the interface an semantics are specified in the CORBA spec.
-    //
-    // = NOTE
-    //    We use ContextList_ptr as the _ptr type instead of
-    //    CORBA::ContextList_ptr, this is an attempt to reduced the cyclic
-    //    dependencies in TAO.
-    //
-  public:
-    ContextList_out (ContextList_ptr &);
-    ContextList_out (ContextList_var &);
-    ContextList_out (ContextList_out &);
-    ContextList_out &operator= (ContextList_out &);
-    ContextList_out &operator= (const ContextList_var &);
-    ContextList_out &operator= (ContextList_ptr);
-    operator ContextList_ptr &();
-    ContextList_ptr &ptr (void);
-    ContextList_ptr operator-> (void);
-
-  private:
-    ContextList_ptr &ptr_;
-  };
 } // End CORBA namespace.
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl
index 9281d7c1e69..af53a6b4cfe 100644
--- a/TAO/tao/DynamicInterface/Context.inl
+++ b/TAO/tao/DynamicInterface/Context.inl
@@ -2,182 +2,42 @@
 //
 // $Id$
 
-ACE_INLINE CORBA::Context_ptr
-CORBA::Context::_duplicate (CORBA::Context_ptr x)
+ACE_INLINE
+void
+CORBA::release (CORBA::ContextList_ptr x)
 {
   if (x != 0)
     {
-      x->_incr_refcnt ();
+      x->_decr_refcnt ();
     }
-
-  return x;
-}
-
-ACE_INLINE CORBA::Context_ptr
-CORBA::Context::_nil (void)
-{
-  return (CORBA::Context_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Context_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Context_var::Context_var (void)
-  : ptr_ (CORBA::Context::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::Context_var::Context_var (CORBA::Context_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Context_var::~Context_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::Context_ptr
-CORBA::Context_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Context_var::Context_var (const CORBA::Context_var &p)
-  : ptr_ (CORBA::Context::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA::Context_var &
-CORBA::Context_var::operator= (CORBA::Context_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Context_var &
-CORBA::Context_var::operator= (const CORBA::Context_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::Context::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Context_var::operator const CORBA::Context_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Context_var::operator CORBA::Context_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Context_ptr
-CORBA::Context_var::operator-> (void) const
-{
-  return this->ptr_;
 }
 
-ACE_INLINE CORBA::Context_ptr
-CORBA::Context_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Context_ptr &
-CORBA::Context_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Context_ptr &
-CORBA::Context_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Context::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Context_ptr
-CORBA::Context_var::_retn (void)
-{
-  // yield ownership
-  CORBA::Context_ptr val = this->ptr_;
-  this->ptr_ = CORBA::Context::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Context_out
-// *************************************************************
-
 ACE_INLINE
-CORBA::Context_out::Context_out (CORBA::Context_ptr &p)
-        : ptr_ (p)
+CORBA::Boolean
+CORBA::is_nil (CORBA::ContextList_ptr x)
 {
-  this->ptr_ = CORBA::Context::_nil ();
+  return (CORBA::Boolean) (x == 0);
 }
 
-ACE_INLINE
-CORBA::Context_out::Context_out (CORBA::Context_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Context::_nil ();
-}
-
-ACE_INLINE
-CORBA::Context_out::Context_out (CORBA::Context_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::Context_out &
-CORBA::Context_out::operator= (CORBA::Context_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Context_out &
-CORBA::Context_out::operator= (const CORBA::Context_var &p)
-{
-  this->ptr_ = CORBA::Context::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::Context_out &
-CORBA::Context_out::operator= (CORBA::Context_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+// ===================================================================
 
-ACE_INLINE
-CORBA::Context_out::operator CORBA::Context_ptr &()
+ACE_INLINE 
+CORBA::Context_ptr
+CORBA::Context::_duplicate (CORBA::Context_ptr x)
 {
-  return this->ptr_;
-}
+  if (x != 0)
+    {
+      x->_incr_refcnt ();
+    }
 
-ACE_INLINE CORBA::Context_ptr &
-CORBA::Context_out::ptr (void)
-{
-  return this->ptr_;
+  return x;
 }
 
-ACE_INLINE CORBA::Context_ptr
-CORBA::Context_out::operator-> (void)
+ACE_INLINE 
+CORBA::Context_ptr
+CORBA::Context::_nil (void)
 {
-  return this->ptr_;
+  return (CORBA::Context_ptr)0;
 }
 
 // *************************************************************
@@ -189,185 +49,29 @@ CORBA::ContextList::ContextList (void)
 {
 }
 
-ACE_INLINE CORBA::ULong
+ACE_INLINE 
+CORBA::ULong
 CORBA::ContextList::count (void)
 {
   return (CORBA::ULong) this->ctx_list_.size ();
 }
 
-ACE_INLINE CORBA::ContextList_ptr
+ACE_INLINE 
+CORBA::ContextList_ptr
 CORBA::ContextList::_nil (void)
 {
   return (CORBA::ContextList_ptr)0;
 }
 
-ACE_INLINE CORBA::ContextList *
-CORBA::ContextList::_duplicate (CORBA::ContextList* x)
+ACE_INLINE 
+CORBA::ContextList_ptr
+CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x)
 {
   if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ContextList_var
-// *************************************************************
-
-// default constructor
-
-ACE_INLINE
-CORBA::ContextList_var::ContextList_var (void)
-  : ptr_ (CORBA::ContextList::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ContextList_var::ContextList_var (CORBA::ContextList_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ContextList_ptr
-CORBA::ContextList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// copy constructor
-ACE_INLINE
-CORBA::ContextList_var::ContextList_var (const CORBA::ContextList_var &p)
-  : ptr_ (p.ptr_->_duplicate ())
-{}
-
-ACE_INLINE
-CORBA::ContextList_var::~ContextList_var (void) // destructor
-{
-  this->ptr_->_destroy ();
-}
-
-ACE_INLINE CORBA::ContextList_var &
-CORBA::ContextList_var::operator= (CORBA::ContextList_ptr p)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ContextList_var &
-CORBA::ContextList_var::operator= (const CORBA::ContextList_var &p)
-{
-  if (this != &p)
     {
-      this->ptr_->_destroy ();
-      this->ptr_ = p.ptr_->_duplicate ();
+      x->_incr_refcnt ();
     }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ContextList_var::operator const CORBA::ContextList_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContextList_var::operator CORBA::ContextList_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextList_ptr
-CORBA::ContextList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextList_ptr
-CORBA::ContextList_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextList_ptr &
-CORBA::ContextList_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextList_ptr &
-CORBA::ContextList_var::out (void)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = CORBA::ContextList::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextList_ptr
-CORBA::ContextList_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ContextList_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ContextList::_nil ();
-  return val;
-}
 
-// *************************************************************
-// Inline operations for class CORBA::ContextList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContextList_out::ContextList_out (CORBA::ContextList_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA::ContextList::_nil ();
-}
-
-ACE_INLINE
-CORBA::ContextList_out::ContextList_out (CORBA::ContextList_var &p)
-  : ptr_ (p.out ())
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = CORBA::ContextList::_nil ();
-}
-
-ACE_INLINE
-CORBA::ContextList_out::ContextList_out (CORBA::ContextList_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::ContextList_out &
-CORBA::ContextList_out::operator= (CORBA::ContextList_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ContextList_out &
-CORBA::ContextList_out::operator= (const CORBA::ContextList_var &p)
-{
-  this->ptr_ = p.ptr ()->_duplicate ();
-  return *this;
-}
-
-ACE_INLINE CORBA::ContextList_out &
-CORBA::ContextList_out::operator= (CORBA::ContextList_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ContextList_out::operator CORBA::ContextList_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ContextList_ptr &
-CORBA::ContextList_out::ptr (void)
-{
-  return this->ptr_;
+  return x;
 }
 
-ACE_INLINE CORBA::ContextList_ptr
-CORBA::ContextList_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index c666e8283a5..9e63357fdec 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -25,7 +25,10 @@
 #include "ace/pre.h"
 
 #include "dynamicinterface_export.h"
+
 #include "tao/corbafwd.h"
+#include "tao/Pseudo_VarOut_T.h"
+
 #include "ace/Unbounded_Queue.h"
 #include "ace/Atomic_Op.h"
 #include "ace/CORBA_macros.h"
@@ -37,8 +40,11 @@
 
 namespace CORBA
 {
-  class ExceptionList;
-  typedef ExceptionList *ExceptionList_ptr;
+  TAO_DynamicInterface_Export void release (ExceptionList_ptr);
+  TAO_DynamicInterface_Export Boolean is_nil (ExceptionList_ptr);
+
+  typedef TAO_Pseudo_Var_T<ExceptionList> ExceptionList_var;
+  typedef TAO_Pseudo_Out_T<ExceptionList, ExceptionList_var> ExceptionList_out;
 
   class TAO_DynamicInterface_Export ExceptionList
   {
@@ -54,7 +60,7 @@ namespace CORBA
     // Constructor.
     
     ExceptionList (CORBA::ULong len,
-                         CORBA::TypeCode_ptr *tc_list);
+                   CORBA::TypeCode_ptr *tc_list);
     // Constructor - initialize given a length and an array of
     // TypeCodes.
     
@@ -88,14 +94,12 @@ namespace CORBA
                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
     // Remove the typecode at slot i. Raises the "Bounds" exception.
     
-    void  _incr_refcnt (void);
-    void  _decr_refcnt (void);
+    void _incr_refcnt (void);
+    void _decr_refcnt (void);
     // Increment and decrement ref counts.
     
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef CORBA::ExceptionList_ptr _ptr_type;
     typedef CORBA::ExceptionList_var _var_type;
-#endif /* __GNUC__ */
     // Useful for template programming.
     
   private:
@@ -109,43 +113,6 @@ namespace CORBA
     ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_;
     // Internal list of typecodes.
   };
-  
-  class TAO_DynamicInterface_Export ExceptionList_var
-  {
-    // = TITLE
-    //    ExceptionList_var
-    //
-    // = DESCRIPTION
-    //    Lifecycle management helper class for ExceptionList objects.
-  public:
-    ExceptionList_var (void);
-    // Default constructor.
-    
-    ExceptionList_var (ExceptionList_ptr);
-    
-    ExceptionList_var (const ExceptionList_var &);
-    // Copy constructor.
-    
-    ~ExceptionList_var (void);
-    // Destructor.
-    
-    ExceptionList_var &operator= (ExceptionList_ptr);
-    ExceptionList_var &operator= (const ExceptionList_var &);
-    ExceptionList_ptr operator-> (void) const;
-    
-    operator const ExceptionList_ptr &() const;
-    operator ExceptionList_ptr &();
-    
-    // in, inout, out, _retn.
-    ExceptionList_ptr in (void) const;
-    ExceptionList_ptr &inout (void);
-    ExceptionList_ptr &out (void);
-    ExceptionList_ptr _retn (void);
-    ExceptionList_ptr ptr (void) const;
-    
-  private:
-    ExceptionList_ptr ptr_;
-  };
 }  // End CORBA namespace
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl
index f1f2c61806d..d08578a70ec 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.inl
+++ b/TAO/tao/DynamicInterface/ExceptionList.inl
@@ -3,139 +3,53 @@
 // $Id$
 
 ACE_INLINE
-CORBA::ExceptionList::ExceptionList (void)
-  : ref_count_ (1)
-{
-}
-
-ACE_INLINE CORBA::ULong
-CORBA::ExceptionList::count (void)
-{
-  return (CORBA::ULong) this->tc_list_.size ();
-}
-
-ACE_INLINE CORBA::ExceptionList_ptr
-CORBA::ExceptionList::_nil (void)
-{
-  return (CORBA::ExceptionList_ptr)0;
-}
-
-ACE_INLINE CORBA::ExceptionList *
-CORBA::ExceptionList::_duplicate (CORBA::ExceptionList* x)
+void
+CORBA::release (CORBA::ExceptionList_ptr x)
 {
   if (x != 0)
     {
-      x->_incr_refcnt ();
+      x->_decr_refcnt ();
     }
-
-  return x;
 }
 
 ACE_INLINE
-CORBA::ExceptionList_var::ExceptionList_var (void) // default constructor
-  : ptr_ (CORBA::ExceptionList::_nil ())
-{}
-
-ACE_INLINE
-CORBA::ExceptionList_var::ExceptionList_var (CORBA::ExceptionList_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::ExceptionList_ptr
-CORBA::ExceptionList_var::ptr (void) const
+CORBA::Boolean
+CORBA::is_nil (CORBA::ExceptionList_ptr x)
 {
-  return this->ptr_;
+  return (CORBA::Boolean) (x == 0);
 }
 
-ACE_INLINE
-CORBA::ExceptionList_var::ExceptionList_var (const CORBA::ExceptionList_var &p) // copy constructor
-  : ptr_ (CORBA::ExceptionList::_duplicate (p.ptr_))
-{
-}
+// ===================================================================
 
 ACE_INLINE
-CORBA::ExceptionList_var::~ExceptionList_var (void) // destructor
-{
-  if (this->ptr_ != 0)
-    {
-      this->ptr_->_destroy ();
-    }
-}
-
-ACE_INLINE CORBA::ExceptionList_var &
-CORBA::ExceptionList_var::operator= (CORBA::ExceptionList_ptr p)
-{
-  if (this->ptr_ != 0)
-    {
-      this->ptr_->_destroy ();
-    }
-
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ExceptionList_var &
-CORBA::ExceptionList_var::operator= (const CORBA::ExceptionList_var &p)
-{
-  if (this != &p)
-    {
-      if (this->ptr_ != 0)
-        {
-          this->ptr_->_destroy ();
-	}
-
-      this->ptr_ = CORBA::ExceptionList::_duplicate (p.ptr_);
-    }
-
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExceptionList_var::operator const CORBA::ExceptionList_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionList_var::operator CORBA::ExceptionList_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ExceptionList_ptr
-CORBA::ExceptionList_var::operator-> (void) const
+CORBA::ExceptionList::ExceptionList (void)
+  : ref_count_ (1)
 {
-  return this->ptr_;
 }
 
-ACE_INLINE CORBA::ExceptionList_ptr
-CORBA::ExceptionList_var::in (void) const
+ACE_INLINE 
+CORBA::ULong
+CORBA::ExceptionList::count (void)
 {
-  return this->ptr_;
+  return (CORBA::ULong) this->tc_list_.size ();
 }
 
-ACE_INLINE CORBA::ExceptionList_ptr &
-CORBA::ExceptionList_var::inout (void)
+ACE_INLINE 
+CORBA::ExceptionList_ptr
+CORBA::ExceptionList::_nil (void)
 {
-  return this->ptr_;
+  return (CORBA::ExceptionList_ptr)0;
 }
 
-ACE_INLINE CORBA::ExceptionList_ptr &
-CORBA::ExceptionList_var::out (void)
+ACE_INLINE 
+CORBA::ExceptionList_ptr
+CORBA::ExceptionList::_duplicate (CORBA::ExceptionList_ptr x)
 {
-  if (this->ptr_ != 0)
+  if (x != 0)
     {
-      this->ptr_->_destroy ();
+      x->_incr_refcnt ();
     }
 
-  this->ptr_ = CORBA::ExceptionList::_nil ();
-  return this->ptr_;
+  return x;
 }
 
-ACE_INLINE CORBA::ExceptionList_ptr
-CORBA::ExceptionList_var::_retn (void)
-{
-  CORBA::ExceptionList_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ExceptionList::_nil ();
-  return val;
-}
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index b4c488f0231..1d9156707e8 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -462,46 +462,3 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
   }
 }
 
-// Constructor.
-CORBA::ORB_RequestSeq::ORB_RequestSeq (CORBA::ULong max)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA::Request,CORBA::Request_var> (max)
-{
-  // No-op.
-}
-
-CORBA::ORB_RequestSeq::ORB_RequestSeq (const CORBA::ORB_RequestSeq &rhs)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA::Request,CORBA::Request_var> (rhs)
-{
-  // No-op.
-}
-
-CORBA::ORB_RequestSeq::ORB_RequestSeq (CORBA::ULong max,
-                                       CORBA::ULong length,
-                                       CORBA::Request **data,
-                                       CORBA::Boolean release)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA::Request,CORBA::Request_var> (max,
-                                                                       length,
-                                                                       data,
-                                                                       release)
-{
-  // No-op.
-}
-
-
-CORBA::ORB_RequestSeq::ORB_RequestSeq (void)
-{
-  // No-op.
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Pseudo_Sequence<CORBA::Request,CORBA::Request_var>;
-template class TAO_Pseudo_Object_Manager<CORBA::Request,CORBA::Request_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::Request,CORBA::Request_var>
-#pragma instantiate TAO_Pseudo_Object_Manager<CORBA::Request,CORBA::Request_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 2e550a39832..6c4581f22d5 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -164,11 +164,9 @@ namespace CORBA
     /// Accessor for the input stream containing the exception.
     ACE_CString &raw_user_exception (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     // Useful for template programming.
     typedef CORBA::Request_ptr _ptr_type;
     typedef CORBA::Request_var _var_type;
-#endif /* __GNUC__ */
 
   private:
     friend class ::TAO_Dynamic_Adapter_Impl;
@@ -244,152 +242,6 @@ namespace CORBA
     ACE_CString raw_user_exception_;
 
   };
-
-  /**
-   * @class Request_var
-   *
-   * @brief The T_var class for Request.
-   *
-   * As any other pseudo object Request must have a T_var class, the
-   * interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_DynamicInterface_Export Request_var
-  {
-  public:
-    Request_var (void);
-    Request_var (Request_ptr);
-    Request_var (const Request_var &);
-    ~Request_var (void);
-
-    Request_var &operator= (Request_ptr);
-    Request_var &operator= (const Request_var &);
-    Request_ptr operator-> (void) const;
-
-    operator const Request_ptr &() const;
-    operator Request_ptr &();
-
-    // in, inout, out, _retn.
-    Request_ptr in (void) const;
-    Request_ptr &inout (void);
-    Request_ptr &out (void);
-    Request_ptr _retn (void);
-    Request_ptr ptr (void) const;
-
-  private:
-    Request_ptr ptr_;
-  };
-
-  /**
-   * @class Request_out
-   *
-   * @brief The T_out class for Request
-   *
-   * As any other pseudo object Request must have a T_out class, the
-   * interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_DynamicInterface_Export Request_out
-  {
-  public:
-    Request_out (Request_ptr &);
-    Request_out (Request_var &);
-    Request_out (Request_out &);
-    Request_out &operator= (Request_out &);
-    Request_out &operator= (const Request_var &);
-    Request_out &operator= (Request_ptr);
-    operator Request_ptr &();
-    Request_ptr &ptr (void);
-    Request_ptr operator-> (void);
-
-  private:
-    Request_ptr &ptr_;
-  };
-
-  // Make sure you instantiate this in Request.cpp
-  class TAO_DynamicInterface_Export ORB_RequestSeq
-    : public TAO_Unbounded_Pseudo_Sequence<CORBA::Request, CORBA::Request_var>
-  {
-  public:
-    // Helpful with template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ORB_RequestSeq_var _var_type;
-#endif /* __GNUC__ */
-
-    // Implement the same constructors provided by the template here,
-    // check Sequence_T.h for ideas.
-    // Simply delegate on the template for the implementation...
-
-    /// Default constructor.
-    ORB_RequestSeq (void);
-
-    /// Constructor with a "hint" for the maximum capacity.
-    ORB_RequestSeq (CORBA::ULong max);
-
-    /// Constructor with a given buffer.
-    ORB_RequestSeq (CORBA::ULong maximum,
-                    CORBA::ULong length,
-                    CORBA::Request* * data,
-                    CORBA::Boolean release=0);
-
-    /// Copy ctor, deep copies.
-    ORB_RequestSeq (const ORB_RequestSeq &);
-
-  };
-
-  class TAO_DynamicInterface_Export ORB_RequestSeq_var
-  {
-  public:
-    /// Default constructor.
-    ORB_RequestSeq_var (void);
-
-    ORB_RequestSeq_var (ORB_RequestSeq *);
-
-    /// Copy constructor.
-    ORB_RequestSeq_var (const ORB_RequestSeq_var &);
-
-    /// Destructor.
-    ~ORB_RequestSeq_var (void);
-
-    ORB_RequestSeq_var &operator= (ORB_RequestSeq *);
-    ORB_RequestSeq_var &operator= (const ORB_RequestSeq_var &);
-    ORB_RequestSeq *operator-> (void);
-    const ORB_RequestSeq *operator-> (void) const;
-
-    operator const ORB_RequestSeq &() const;
-    operator ORB_RequestSeq &();
-    operator ORB_RequestSeq &() const;
-    CORBA::Octet &operator[] (CORBA::ULong slot);
-
-    // in, inout, out, _retn.
-    const ORB_RequestSeq &in (void) const;
-    ORB_RequestSeq &inout (void);
-    ORB_RequestSeq *&out (void);
-    ORB_RequestSeq *_retn (void);
-    ORB_RequestSeq *ptr (void) const;
-
-  private:
-    ORB_RequestSeq *ptr_;
-  };
-
-  class TAO_DynamicInterface_Export ORB_RequestSeq_out
-  {
-  public:
-    ORB_RequestSeq_out (ORB_RequestSeq *&);
-    ORB_RequestSeq_out (ORB_RequestSeq_var &);
-    ORB_RequestSeq_out (ORB_RequestSeq_out &);
-    ORB_RequestSeq_out &operator= (ORB_RequestSeq_out &);
-    ORB_RequestSeq_out &operator= (ORB_RequestSeq *);
-    operator ORB_RequestSeq *&();
-    ORB_RequestSeq *&ptr (void);
-    ORB_RequestSeq *operator-> (void);
-    CORBA::Octet &operator[] (CORBA::ULong slot);
-
-  private:
-    ORB_RequestSeq *&ptr_;
-
-    /// Assignment from T_var not allowed.
-    void operator= (const ORB_RequestSeq_var &);
-  };
-
 } // End CORBA namespace.
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index cc3470968d9..090bb3c25bf 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -162,164 +162,3 @@ CORBA::Request::raw_user_exception (void)
 {
   return this->raw_user_exception_;
 }
-
-// *************************************************************
-// Inline operations for class CORBA::Request_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Request_var::Request_var (void)
-  : ptr_ (CORBA::Request::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::Request_var::Request_var (CORBA::Request_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Request_var::~Request_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::Request_ptr
-CORBA::Request_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Request_var::Request_var (const Request_var &p)
-  : ptr_ (CORBA::Request::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA::Request_var &
-CORBA::Request_var::operator= (CORBA::Request_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Request_var &
-CORBA::Request_var::operator= (const CORBA::Request_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::Request::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Request_var::operator const CORBA::Request_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Request_var::operator CORBA::Request_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Request_ptr
-CORBA::Request_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Request_ptr
-CORBA::Request_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Request_ptr &
-CORBA::Request_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Request_ptr &
-CORBA::Request_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Request::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Request_ptr
-CORBA::Request_var::_retn (void)
-{
-  // yield ownership
-  CORBA::Request_ptr val = this->ptr_;
-  this->ptr_ = CORBA::Request::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Request_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Request_out::Request_out (CORBA::Request_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA::Request::_nil ();
-}
-
-ACE_INLINE
-CORBA::Request_out::Request_out (CORBA::Request_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Request::_nil ();
-}
-
-ACE_INLINE
-CORBA::Request_out::Request_out (CORBA::Request_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::Request_out &
-CORBA::Request_out::operator= (CORBA::Request_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Request_out &
-CORBA::Request_out::operator= (const CORBA::Request_var &p)
-{
-  this->ptr_ = CORBA::Request::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::Request_out &
-CORBA::Request_out::operator= (CORBA::Request_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Request_out::operator CORBA::Request_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Request_ptr &
-CORBA::Request_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Request_ptr
-CORBA::Request_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 8981cb2a7a4..f991bbe90b2 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -231,3 +231,16 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception)
 
   this->orb_server_request_.tao_send_reply ();
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Var_T<CORBA::ServerRequest>;
+  template class TAO_Pseudo_Out_T<CORBA::ServerRequest, CORBA::ServerRequest_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::ServerRequest>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::ServerRequest, CORBA::ServerRequest_var>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 6102941101b..73dde20f07b 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -39,6 +39,10 @@
 
 namespace CORBA
 {
+  class ServerRequest;
+  typedef TAO_Pseudo_Var_T<ServerRequest> ServerRequest_var;
+  typedef TAO_Pseudo_Out_T<ServerRequest, ServerRequest_var> ServerRequest_out;
+
   class TAO_DynamicInterface_Export ServerRequest
   {
     // = TITLE
@@ -123,11 +127,8 @@ namespace CORBA
     // Returns a user exception through a TAO gateway without
     // knowing its type.
     
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     // Useful for template programming.
-    typedef CORBA::ServerRequest_ptr _ptr_type;
-#endif /* __GNUC__ */
-    
+    typedef CORBA::ServerRequest_ptr _ptr_type;    
     
   private:
     int lazy_evaluation_;
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 86a43612b17..0b5b1c6de6c 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -224,3 +224,16 @@ CORBA::Environment_var::operator= (const CORBA::Environment_var &r)
   tmp.ptr_ = tmp_ptr;
   return *this;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Var_T<CORBA::Environment>;
+  template class TAO_Pseudo_Out_T<CORBA::Environment, CORBA::Environment_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::Environment>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::Environment, CORBA::Environment_var>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index fa1ef12e736..7282e1401fc 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -30,10 +30,16 @@
 #include <stdarg.h> // LynxOS requires this before stdio.h
 #include <stdio.h>  // Pull in "stdout" definition.
 
+#include "tao/Pseudo_VarOut_T.h"
+
 class TAO_ORB_Core;
 
 namespace CORBA
 {
+  class Environment;
+  typedef TAO_Pseudo_Var_T<Environment> Environment_var;
+  typedef TAO_Pseudo_Out_T<Environment, Environment_var> Environment_out;
+
   /**
    * @class Environment
    *
@@ -120,11 +126,9 @@ namespace CORBA
     // = Obtain a default environment to use with TAO.
     static CORBA::Environment &default_environment (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     // Useful for template programming.
     typedef CORBA::Environment_ptr _ptr_type;
     typedef CORBA::Environment_var _var_type;
-#endif /* __GNUC__ */
 
   private:
 
@@ -139,71 +143,6 @@ namespace CORBA
     /// The previous environment on the "default environment stack".
     Environment *previous_;
   };
-
-  /**
-   * @class Environment_var
-   *
-   * @brief Environment_var
-   *
-   * Provide for automatic storage deallocation on going out of
-   * scope.
-   */
-  class TAO_Export Environment_var
-  {
-  public:
-    /**
-     * default constructor
-     * copy constructor
-     * destructor
-     */
-    Environment_var (void);
-    Environment_var (CORBA::Environment_ptr);
-    Environment_var (const Environment_var &);
-    ~Environment_var (void);
-
-    Environment_var &operator= (CORBA::Environment_ptr);
-    Environment_var &operator= (const Environment_var &);
-    CORBA::Environment_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const CORBA::Environment_ptr &() const;
-    operator CORBA::Environment_ptr &();
-    CORBA::Environment_ptr in (void) const;
-    CORBA::Environment_ptr &inout (void);
-    CORBA::Environment_ptr &out (void);
-    CORBA::Environment_ptr _retn (void);
-    CORBA::Environment_ptr ptr (void) const;
-
-  private:
-    CORBA::Environment_ptr ptr_;
-  };
-
-  /**
-   * @class Environment_out
-   *
-   * @brief Environment_out
-   *
-   * The _out class for CORBA::Environment.  This is used to help in
-   * managing the out parameters.
-   */
-  class TAO_Export Environment_out
-  {
-  public:
-    Environment_out (Environment_ptr &);
-    Environment_out (Environment_var &);
-    Environment_out (const Environment_out &);
-    Environment_out &operator= (const Environment_out &);
-    Environment_out &operator= (CORBA::Environment_ptr);
-    operator CORBA::Environment_ptr &();
-    CORBA::Environment_ptr &ptr (void);
-    CORBA::Environment_ptr operator-> (void);
-
-  private:
-    Environment_ptr &ptr_;
-
-    /// Assignment from _var not allowed.
-    Environment_out &operator= (const CORBA::Environment_var &);
-  };
 } // End CORBA namespace
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
index b2aadaf0791..b0100a04e38 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -2,166 +2,48 @@
 //
 // $Id$
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 CORBA::is_nil (CORBA::Environment_ptr env)
 {
   return env == 0;
 }
 
-ACE_INLINE void
+ACE_INLINE 
+void
 CORBA::release (CORBA::Environment_ptr env)
 {
   if (env == 0)
-    return;
+    {
+      return;
+    }
+
   delete env;
 }
 
-ACE_INLINE CORBA::Exception*
+ACE_INLINE 
+CORBA::Exception *
 CORBA::Environment::exception (void) const
 {
   return this->exception_;
 }
 
-ACE_INLINE CORBA::Environment *
+ACE_INLINE 
+CORBA::Environment *
 CORBA::Environment::_duplicate (CORBA::Environment *x)
 {
   if (x == 0)
-    return 0;
+    {
+      return 0;
+    }
+
   return new CORBA::Environment (*x);
 }
 
-ACE_INLINE CORBA::Environment_ptr
+ACE_INLINE 
+CORBA::Environment_ptr
 CORBA::Environment::_nil (void)
 {
   return (CORBA::Environment_ptr)0;
 }
 
-// Inline operations for class CORBA::Environment_var
-
-ACE_INLINE
-CORBA::Environment_var::Environment_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Environment_var::Environment_var (CORBA::Environment_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::Environment_ptr
-CORBA::Environment_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Environment_var::Environment_var (const CORBA::Environment_var &p)
-  : ptr_ (new CORBA::Environment (*p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::Environment_var::~Environment_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Environment_var::operator const CORBA::Environment_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Environment_var::operator CORBA::Environment_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Environment_ptr
-CORBA::Environment_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Environment_ptr
-CORBA::Environment_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Environment_ptr &
-CORBA::Environment_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Environment_ptr &
-CORBA::Environment_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Environment_ptr
-CORBA::Environment_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::Environment_ptr val = this->ptr_;
-  this->ptr_ = 0;
-  return val;
-}
-
-// Inline operations for class CORBA::Environment_out
-
-ACE_INLINE
-CORBA::Environment_out::Environment_out (CORBA::Environment_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Environment_out::Environment_out (CORBA::Environment_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Environment_out::Environment_out (const CORBA::Environment_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::Environment_out &
-CORBA::Environment_out::operator= (const CORBA::Environment_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Environment_out &
-CORBA::Environment_out::operator= (CORBA::Environment_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Environment_out::operator CORBA::Environment_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Environment_ptr &
-CORBA::Environment_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Environment_ptr
-CORBA::Environment_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index a09e1f2cdbc..efd946270de 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -23,7 +23,10 @@
 //
 // ================================================================
 #pragma prefix "omg.org"
+
 #include "IOP.pidl"
+#include "OctetSeq.pidl"
+
 module GIOP
 {
   typedef short AddressingDisposition;
@@ -44,7 +47,7 @@ module GIOP
 
   union TargetAddress switch (AddressingDisposition)
   {
-    case KeyAddr: sequence <octet> object_key;
+    case KeyAddr: CORBA::OctetSeq object_key;
     case ProfileAddr: IOP::TaggedProfile profile;
     case ReferenceAddr: IORAddressingInfo ior;
   };
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index df2c8fe857d..47703e00f23 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -23,27 +23,17 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   GIOPC.h
-//
-// = DESCRIPTION
-//   Generated from GIOP1_2.pidl, that contains a part of the new data
-//   type definitions for GIOP1.2 module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//   hand crafted by Balachandran Natarajan <bala@cs.wustl.edu>
-// ================================================================
+#include "GIOPC.h"
+#include "tao/Stub.h"
+#include "tao/Invocation.h"
+#include "tao/PortableInterceptor.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo_i.h"
+#include "tao/ClientInterceptorAdapter.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-#include "GIOPC.h"
-#include "tao/Environment.h"
-#include "tao/Any_T.h"
-#include "tao/ORB_Core.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -148,7 +138,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -157,6 +147,25 @@ void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      Version
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      Version \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_GIOP_IORAddressingInfo[] =
@@ -292,7 +301,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -301,7 +310,38 @@ void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:92
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      IORAddressingInfo
+    >;
+
+template class
+  TAO_Out_T<
+      IORAddressingInfo,
+      IORAddressingInfo_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      IORAddressingInfo \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      IORAddressingInfo, \
+      IORAddressingInfo_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:91
 
 GIOP::TargetAddress::TargetAddress (void)
 {
@@ -325,7 +365,7 @@ GIOP::TargetAddress::TargetAddress (const ::GIOP::TargetAddress &u)
         {
           ACE_NEW (
               this->u_.object_key_,
-              TAO::ObjectKey (*u.u_.object_key_)
+              CORBA::OctetSeq (*u.u_.object_key_)
             );
         }
     }
@@ -400,7 +440,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
         {
           ACE_NEW_RETURN (
               this->u_.object_key_,
-              TAO::ObjectKey (*u.u_.object_key_),
+              CORBA::OctetSeq (*u.u_.object_key_),
               *this
             );
         }
@@ -497,12 +537,29 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] =
   ACE_NTOHL (0x6f626a65), 
   ACE_NTOHL (0x63745f6b), 
   ACE_NTOHL (0x65790000),  // name = object_key
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
+    31,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+        9,
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
+    ACE_NTOHL (0x0),  // name = OctetSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_octet,
+
+      0U,
 
-    0U,
 
   ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value)
   8,
@@ -646,6 +703,37 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      TargetAddress
+    >;
+
+template class
+  TAO_Out_T<
+      TargetAddress,
+      TargetAddress_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      TargetAddress \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      TargetAddress, \
+      TargetAddress_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
@@ -841,5 +929,3 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<GIOP::TargetAddress>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-
-
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index 25fc4b2a83d..bceb50c4f4c 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -2,22 +2,6 @@
 //
 // $Id$
 
-//=============================================================================
-/**
- *  @file   GIOPC.h
- *
- *  $Id$
-
- *
- * Generated from GIOP1_2.pidl, that contains a part of the new data
- * type definitions for GIOP1.2 module.
- * The code was generated by the IDL compiler and then hand-crafted
- * to reduce the includes interdependencies.
- * hand crafted by Balachandran Natarajan <bala@cs.wustl.edu>
- *
- */
-//=============================================================================
-
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
 //       Center for Distributed Object Computing
@@ -35,12 +19,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// Readers Note:
-// This file is named GIOPC.h intentionally. Shortly the file GIOP.h
-// in $TAO_ROOT/ta would dissappear giving way to new files once the
-// pluggable messaging stuff is done. So I would assume that there
-// should be no such name clashes.
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
@@ -51,6 +29,8 @@
 #include "tao/corbafwd.h"
 #include "tao/IOPC.h"
 #include "tao/Object_KeyC.h"
+#include "OctetSeqC.h"
+#include "tao/VarOut_T.h"
 
 #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
 #include "ace/streams.h"
@@ -91,7 +71,7 @@ TAO_NAMESPACE  GIOP
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
@@ -117,72 +97,65 @@ TAO_NAMESPACE  GIOP
   const CORBA::Short ReferenceAddr = 2;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class IORAddressingInfo_var;
+  struct Version;
   
-  struct TAO_Export IORAddressingInfo
+  typedef
+    TAO_Fixed_Var_T<
+        Version
+      >
+    Version_var;
+  
+  typedef
+    Version &
+    Version_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  
+  struct TAO_Export Version
   {
-    typedef IORAddressingInfo_var _var_type;
+    typedef Version_var _var_type;
     
     static void _tao_any_destructor (void *);
-    CORBA::ULong selected_profile_index;
-    IOP::IOR ior;
+    CORBA::Octet major;
+    CORBA::Octet minor;
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  class TAO_Export IORAddressingInfo_var
-  {
-  public:
-    IORAddressingInfo_var (void);
-    IORAddressingInfo_var (IORAddressingInfo *);
-    IORAddressingInfo_var (const IORAddressingInfo_var &);
-    ~IORAddressingInfo_var (void);
-    
-    IORAddressingInfo_var &operator= (IORAddressingInfo *);
-    IORAddressingInfo_var &operator= (const IORAddressingInfo_var &);
-    IORAddressingInfo *operator-> (void);
-    const IORAddressingInfo *operator-> (void) const;
-    
-    operator const IORAddressingInfo &() const;
-    operator IORAddressingInfo &();
-    operator IORAddressingInfo &() const;
-    
-    // Variable-size types only.
-    operator IORAddressingInfo *&();
-    
-    // in, inout, out, _retn 
-    const IORAddressingInfo &in (void) const;
-    IORAddressingInfo &inout (void);
-    IORAddressingInfo *&out (void);
-    IORAddressingInfo *_retn (void);
-    IORAddressingInfo *ptr (void) const;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
   
-  private:
-    IORAddressingInfo *ptr_;
-  };
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  struct IORAddressingInfo;
+  
+  typedef
+    TAO_Var_Var_T<
+        IORAddressingInfo
+      >
+    IORAddressingInfo_var;
+  
+  typedef
+    TAO_Out_T<
+        IORAddressingInfo,
+        IORAddressingInfo_var
+      >
+    IORAddressingInfo_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
-  class TAO_Export IORAddressingInfo_out
+  struct TAO_Export IORAddressingInfo
   {
-  public:
-    IORAddressingInfo_out (IORAddressingInfo *&);
-    IORAddressingInfo_out (IORAddressingInfo_var &);
-    IORAddressingInfo_out (const IORAddressingInfo_out &);
-    IORAddressingInfo_out &operator= (const IORAddressingInfo_out &);
-    IORAddressingInfo_out &operator= (IORAddressingInfo *);
-    operator IORAddressingInfo *&();
-    IORAddressingInfo *&ptr (void);
-    IORAddressingInfo *operator-> (void);
+    typedef IORAddressingInfo_var _var_type;
     
-  private:
-    IORAddressingInfo *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const IORAddressingInfo_var &);
+    static void _tao_any_destructor (void *);
+    CORBA::ULong selected_profile_index;
+    IOP::IOR ior;
   };
   
   // TAO_IDL - Generated from
@@ -191,13 +164,26 @@ TAO_NAMESPACE  GIOP
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORAddressingInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:53
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  class TargetAddress;
+  
+  typedef
+    TAO_Var_Var_T<
+        TargetAddress
+      >
+    TargetAddress_var;
+  
+  typedef
+    TAO_Out_T<
+        TargetAddress,
+        TargetAddress_var
+      >
+    TargetAddress_out;
 
 #if !defined (_GIOP_TARGETADDRESS_CH_)
 #define _GIOP_TARGETADDRESS_CH_
   
-  class TargetAddress_var;
-  
   class TAO_Export TargetAddress
   {
   public:
@@ -209,39 +195,39 @@ TAO_NAMESPACE  GIOP
     TargetAddress &operator= (const TargetAddress &);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ch.cpp:115
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ch.cpp:114
     
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:111
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:108
     
     typedef TargetAddress_var _var_type;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:507
     
-    void object_key (const TAO::ObjectKey &);
-    const TAO::ObjectKey &object_key (void) const;
-    TAO::ObjectKey &object_key (void);
+    void object_key (const CORBA::OctetSeq &);
+    const CORBA::OctetSeq &object_key (void) const;
+    CORBA::OctetSeq &object_key (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:616
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:615
     
     void profile (const IOP::TaggedProfile &);
     const IOP::TaggedProfile &profile (void) const;
     IOP::TaggedProfile &profile (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:616
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:615
     
     void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
     const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
     ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:145
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:142
     
     void _default (void);
   private:
@@ -252,7 +238,7 @@ TAO_NAMESPACE  GIOP
     {
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:407
-      TAO::ObjectKey *object_key_;
+      CORBA::OctetSeq *object_key_;
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482
       IOP::TaggedProfile *profile_;
@@ -272,116 +258,6 @@ TAO_NAMESPACE  GIOP
 
 #endif /* end #if !defined */
 
-#if !defined (_GIOP_TARGETADDRESS___VAR_CH_)
-#define _GIOP_TARGETADDRESS___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:85
-  
-  class TAO_Export TargetAddress_var
-  {
-  public:
-    TargetAddress_var (void);
-    TargetAddress_var (TargetAddress *);
-    TargetAddress_var (const TargetAddress_var &);
-    ~TargetAddress_var (void);
-    
-    TargetAddress_var &operator= (TargetAddress *);
-    TargetAddress_var &operator= (const TargetAddress_var &);
-    TargetAddress *operator-> (void);
-    const TargetAddress *operator-> (void) const;
-    
-    operator const TargetAddress &() const;
-    operator TargetAddress &();
-    operator TargetAddress &() const;
-      // Variable size types only.
-    operator TargetAddress *&();
-    
-    // in, inout, out, _retn 
-    const TargetAddress &in (void) const;
-    TargetAddress &inout (void);
-    TargetAddress *&out (void);
-    TargetAddress *_retn (void);
-    TargetAddress *ptr (void) const;
-  
-  private:
-    TargetAddress *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_GIOP_TARGETADDRESS___OUT_CH_)
-#define _GIOP_TARGETADDRESS___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:475
-  
-  class TAO_Export TargetAddress_out
-  {
-  public:
-    TargetAddress_out (TargetAddress *&);
-    TargetAddress_out (TargetAddress_var &);
-    TargetAddress_out (const TargetAddress_out &);
-    TargetAddress_out &operator= (const TargetAddress_out &);
-    TargetAddress_out &operator= (TargetAddress *);
-    operator TargetAddress *&();
-    TargetAddress *&ptr (void);
-    TargetAddress *operator-> (void);
-    
-  private:
-    TargetAddress *&ptr_;
-    // assignment from T_var not allowed.
-    void operator= (const TargetAddress_var &);
-  };
-
-#endif /* end #if !defined */
-
-  // We dont have the _var _out for this struct. If need arises we can
-  // add them later. For the present the Version struct alone should be
-  // sufficient
-  struct TAO_Export Version
-  {
-    static void _tao_any_destructor (void *);
-    CORBA::Octet major;
-    CORBA::Octet minor;
-  };
-
-  class  TAO_Export Version_var
-  {
-  public:
-    Version_var (void);
-    Version_var (Version *);
-    Version_var (const Version_var &);
-    // Fixed-size types only.
-    Version_var (const Version &);
-    ~Version_var (void);
-
-    Version_var &operator= (Version *);
-    Version_var &operator= (const Version_var &);
-    // Fixed-size types only.
-    Version_var &operator= (const Version &);
-    Version *operator-> (void);
-    const Version *operator-> (void) const;
-
-    operator const Version &() const;
-    operator Version &();
-    operator Version &() const;
-
-    // in, inout, out, _retn
-    const Version &in (void) const;
-    Version &inout (void);
-    Version &out (void);
-    Version _retn (void);
-    Version *ptr (void) const;
-
-  private:
-    Version *ptr_;
-  };
-
-  typedef Version &Version_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
@@ -441,7 +317,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "GIOPC.i"
diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i
index 3a36abb053d..531f5d1255b 100644
--- a/TAO/tao/GIOPC.i
+++ b/TAO/tao/GIOPC.i
@@ -21,380 +21,6 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class GIOP::Version_var
-// *************************************************************
-
-ACE_INLINE
-GIOP::Version_var::Version_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-GIOP::Version_var::Version_var (Version *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-GIOP::Version_var::Version_var (const ::GIOP::Version_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::GIOP::Version (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-GIOP::Version_var::Version_var (const ::GIOP::Version &p)
-{
-  ACE_NEW (this->ptr_, ::GIOP::Version (p));
-}
-
-ACE_INLINE
-GIOP::Version_var::~Version_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-GIOP::Version_var &
-GIOP::Version_var::operator= (Version *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::GIOP::Version_var &
-GIOP::Version_var::operator= (const ::GIOP::Version_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Version *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Version (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Version *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE GIOP::Version_var &
-GIOP::Version_var::operator= (const ::GIOP::Version &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::GIOP::Version (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::GIOP::Version *
-GIOP::Version_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version *
-GIOP::Version_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-GIOP::Version_var::operator const ::GIOP::Version &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::Version_var::operator ::GIOP::Version &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::Version_var::operator ::GIOP::Version &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::GIOP::Version &
-GIOP::Version_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version &
-GIOP::Version_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::GIOP::Version &
-GIOP::Version_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version
-GIOP::Version_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::Version *
-GIOP::Version_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class GIOP::IORAddressingInfo_var
-// *************************************************************
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (IORAddressingInfo *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::IORAddressingInfo_var (const ::GIOP::IORAddressingInfo_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::GIOP::IORAddressingInfo (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::~IORAddressingInfo_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var &
-GIOP::IORAddressingInfo_var::operator= (IORAddressingInfo *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::GIOP::IORAddressingInfo_var &
-GIOP::IORAddressingInfo_var::operator= (const ::GIOP::IORAddressingInfo_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          IORAddressingInfo *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              IORAddressingInfo (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              IORAddressingInfo *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::operator const ::GIOP::IORAddressingInfo &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-GIOP::IORAddressingInfo_var::operator ::GIOP::IORAddressingInfo *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::GIOP::IORAddressingInfo &
-GIOP::IORAddressingInfo_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo &
-GIOP::IORAddressingInfo_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::GIOP::IORAddressingInfo *&
-GIOP::IORAddressingInfo_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_var::_retn (void)
-{
-  ::GIOP::IORAddressingInfo *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class GIOP::IORAddressingInfo_out
-// *************************************************************
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (::GIOP::IORAddressingInfo *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (IORAddressingInfo_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out::IORAddressingInfo_out (const ::GIOP::IORAddressingInfo_out &p)
-  : ptr_ (ACE_const_cast (IORAddressingInfo_out&, p).ptr_)
-{}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out &
-GIOP::IORAddressingInfo_out::operator= (const ::GIOP::IORAddressingInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (IORAddressingInfo_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-GIOP::IORAddressingInfo_out &
-GIOP::IORAddressingInfo_out::operator= (IORAddressingInfo *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-GIOP::IORAddressingInfo_out::operator ::GIOP::IORAddressingInfo *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *&
-GIOP::IORAddressingInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::GIOP::IORAddressingInfo *
-GIOP::IORAddressingInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ci.cpp:51
 
 // *************************************************************
@@ -428,25 +54,25 @@ GIOP::TargetAddress::_d (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:899
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:906
 
 // Accessor to set the member.
 ACE_INLINE
 void
-GIOP::TargetAddress::object_key (const TAO::ObjectKey &val)
+GIOP::TargetAddress::object_key (const CORBA::OctetSeq &val)
 {
   // Set the discriminant value.
   this->_reset (0, 0);
   this->disc_ = 0;
   ACE_NEW (
       this->u_.object_key_,
-      TAO::ObjectKey (val)
+      CORBA::OctetSeq (val)
     );
 }
 
 // Readonly get method.
 ACE_INLINE
-const TAO::ObjectKey &
+const CORBA::OctetSeq &
 GIOP::TargetAddress::object_key (void) const
 {
   return *this->u_.object_key_;
@@ -454,14 +80,14 @@ GIOP::TargetAddress::object_key (void) const
 
 // Read/write get method.
 ACE_INLINE
-TAO::ObjectKey &
+CORBA::OctetSeq &
 GIOP::TargetAddress::object_key (void)
 {
   return *this->u_.object_key_;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1209
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1215
 
 // Accessor to set the member.
 ACE_INLINE
@@ -494,7 +120,7 @@ GIOP::TargetAddress::profile (void)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1209
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1215
 
 // Accessor to set the member.
 ACE_INLINE
@@ -526,238 +152,8 @@ GIOP::TargetAddress::ior (void)
   return *this->u_.ior_;
 }
 
-#if !defined (_GIOP_TARGETADDRESS___VAR_CI_)
-#define _GIOP_TARGETADDRESS___VAR_CI_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:211
-
-// *************************************************************
-// Inline operations for class GIOP::TargetAddress_var
-// *************************************************************
-
-ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (TargetAddress *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-GIOP::TargetAddress_var::TargetAddress_var (const ::GIOP::TargetAddress_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::GIOP::TargetAddress (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-GIOP::TargetAddress_var::~TargetAddress_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress_var &
-GIOP::TargetAddress_var::operator= (TargetAddress *_tao_union_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_union_var;
-  return *this;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress_var &
-GIOP::TargetAddress_var::operator= (const ::GIOP::TargetAddress_var &_tao_union_var)
-{
-  if (this != &_tao_union_var)
-    {
-      if (_tao_union_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          TargetAddress *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              TargetAddress (*_tao_union_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              TargetAddress *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::GIOP::TargetAddress *
-GIOP::TargetAddress_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *
-GIOP::TargetAddress_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_var::operator const ::GIOP::TargetAddress &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_var::operator ::GIOP::TargetAddress &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_var::operator ::GIOP::TargetAddress &() const// cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-GIOP::TargetAddress_var::operator ::GIOP::TargetAddress *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-const ::GIOP::TargetAddress &
-GIOP::TargetAddress_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress &
-GIOP::TargetAddress_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE
-::GIOP::TargetAddress *&
-GIOP::TargetAddress_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *
-GIOP::TargetAddress_var::_retn (void)
-{
-  ::GIOP::TargetAddress *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *
-GIOP::TargetAddress_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-#endif /* end #if !defined */
-
-#if !defined (_GIOP_TARGETADDRESS___OUT_CI_)
-#define _GIOP_TARGETADDRESS___OUT_CI_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_union.cpp:556
-
-// *************************************************************
-// Inline operations for class GIOP::TargetAddress_out
-// *************************************************************
-
-ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (TargetAddress *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (TargetAddress_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_out::TargetAddress_out (const ::GIOP::TargetAddress_out &p)
-  : ptr_ (ACE_const_cast (TargetAddress_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::GIOP::TargetAddress_out &
-GIOP::TargetAddress_out::operator= (const ::GIOP::TargetAddress_out &p)
-{
-  this->ptr_ = ACE_const_cast (TargetAddress_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress_out &
-GIOP::TargetAddress_out::operator= (TargetAddress *_tao_union_out)
-{
-  this->ptr_ = _tao_union_out;
-  return *this;
-}
-
-ACE_INLINE
-GIOP::TargetAddress_out::operator ::GIOP::TargetAddress *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *&
-GIOP::TargetAddress_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::GIOP::TargetAddress *
-GIOP::TargetAddress_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -798,7 +194,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -839,24 +235,6 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_
-#define _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    TAO::ObjectKey &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    TAO::ObjectKey &
-  );
-
-#endif /* _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_ */
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ci.cpp:69
 
 ACE_INLINE
@@ -914,7 +292,7 @@ CORBA::Boolean operator>> (
   {
     case 0:
       {
-        TAO::ObjectKey _tao_union_tmp;
+        CORBA::OctetSeq _tao_union_tmp;
         result = strm >> _tao_union_tmp;
         
         if (result)
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 6a9ccf6cf7f..bcd88113aed 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -51,20 +50,20 @@ static const CORBA::Long _oc_CORBA_Identifier[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4964), 
-  ACE_NTOHL (0x656e7469), 
-  ACE_NTOHL (0x66696572), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4964),
+  ACE_NTOHL (0x656e7469),
+  ACE_NTOHL (0x66696572),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
     11,
-  ACE_NTOHL (0x4964656e), 
-  ACE_NTOHL (0x74696669), 
+  ACE_NTOHL (0x4964656e),
+  ACE_NTOHL (0x74696669),
   ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -92,20 +91,20 @@ static const CORBA::Long _oc_CORBA_ScopedName[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5363), 
-  ACE_NTOHL (0x6f706564), 
-  ACE_NTOHL (0x4e616d65), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5363),
+  ACE_NTOHL (0x6f706564),
+  ACE_NTOHL (0x4e616d65),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
     11,
-  ACE_NTOHL (0x53636f70), 
-  ACE_NTOHL (0x65644e61), 
+  ACE_NTOHL (0x53636f70),
+  ACE_NTOHL (0x65644e61),
   ACE_NTOHL (0x6d650000),  // name = ScopedName
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -133,21 +132,21 @@ static const CORBA::Long _oc_CORBA_RepositoryId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x49643a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
     13,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72794964), 
+  ACE_NTOHL (0x5265706f),
+  ACE_NTOHL (0x7369746f),
+  ACE_NTOHL (0x72794964),
   ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -175,174 +174,174 @@ static const CORBA::Long _oc_CORBA_DefinitionKind[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4465), 
-  ACE_NTOHL (0x66696e69), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x4b696e64), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4465),
+  ACE_NTOHL (0x66696e69),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x4b696e64),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
   15,
-  ACE_NTOHL (0x44656669), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x6f6e4b69), 
+  ACE_NTOHL (0x44656669),
+  ACE_NTOHL (0x6e697469),
+  ACE_NTOHL (0x6f6e4b69),
   ACE_NTOHL (0x6e640000),  // name = DefinitionKind
   36, // member count
   8,
-  ACE_NTOHL (0x646b5f6e), 
+  ACE_NTOHL (0x646b5f6e),
   ACE_NTOHL (0x6f6e6500),  // name = dk_none
   7,
-  ACE_NTOHL (0x646b5f61), 
+  ACE_NTOHL (0x646b5f61),
   ACE_NTOHL (0x6c6c0000),  // name = dk_all
   13,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x74747269), 
-  ACE_NTOHL (0x62757465), 
+  ACE_NTOHL (0x646b5f41),
+  ACE_NTOHL (0x74747269),
+  ACE_NTOHL (0x62757465),
   ACE_NTOHL (0x0),  // name = dk_Attribute
   12,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6e7374), 
+  ACE_NTOHL (0x646b5f43),
+  ACE_NTOHL (0x6f6e7374),
   ACE_NTOHL (0x616e7400),  // name = dk_Constant
   13,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x78636570), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x646b5f45),
+  ACE_NTOHL (0x78636570),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = dk_Exception
   13,
-  ACE_NTOHL (0x646b5f49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x646b5f49),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x66616365),
   ACE_NTOHL (0x0),  // name = dk_Interface
   10,
-  ACE_NTOHL (0x646b5f4d), 
-  ACE_NTOHL (0x6f64756c), 
+  ACE_NTOHL (0x646b5f4d),
+  ACE_NTOHL (0x6f64756c),
   ACE_NTOHL (0x65000000),  // name = dk_Module
   13,
-  ACE_NTOHL (0x646b5f4f), 
-  ACE_NTOHL (0x70657261), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x646b5f4f),
+  ACE_NTOHL (0x70657261),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = dk_Operation
   11,
-  ACE_NTOHL (0x646b5f54), 
-  ACE_NTOHL (0x79706564), 
+  ACE_NTOHL (0x646b5f54),
+  ACE_NTOHL (0x79706564),
   ACE_NTOHL (0x65660000),  // name = dk_Typedef
   9,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x6c696173), 
+  ACE_NTOHL (0x646b5f41),
+  ACE_NTOHL (0x6c696173),
   ACE_NTOHL (0x0),  // name = dk_Alias
   10,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x74727563), 
+  ACE_NTOHL (0x646b5f53),
+  ACE_NTOHL (0x74727563),
   ACE_NTOHL (0x74000000),  // name = dk_Struct
   9,
-  ACE_NTOHL (0x646b5f55), 
-  ACE_NTOHL (0x6e696f6e), 
+  ACE_NTOHL (0x646b5f55),
+  ACE_NTOHL (0x6e696f6e),
   ACE_NTOHL (0x0),  // name = dk_Union
   8,
-  ACE_NTOHL (0x646b5f45), 
+  ACE_NTOHL (0x646b5f45),
   ACE_NTOHL (0x6e756d00),  // name = dk_Enum
   13,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x72696d69), 
-  ACE_NTOHL (0x74697665), 
+  ACE_NTOHL (0x646b5f50),
+  ACE_NTOHL (0x72696d69),
+  ACE_NTOHL (0x74697665),
   ACE_NTOHL (0x0),  // name = dk_Primitive
   10,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x7472696e), 
+  ACE_NTOHL (0x646b5f53),
+  ACE_NTOHL (0x7472696e),
   ACE_NTOHL (0x67000000),  // name = dk_String
   12,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x646b5f53),
+  ACE_NTOHL (0x65717565),
   ACE_NTOHL (0x6e636500),  // name = dk_Sequence
   9,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x72726179), 
+  ACE_NTOHL (0x646b5f41),
+  ACE_NTOHL (0x72726179),
   ACE_NTOHL (0x0),  // name = dk_Array
   14,
-  ACE_NTOHL (0x646b5f52), 
-  ACE_NTOHL (0x65706f73), 
-  ACE_NTOHL (0x69746f72), 
+  ACE_NTOHL (0x646b5f52),
+  ACE_NTOHL (0x65706f73),
+  ACE_NTOHL (0x69746f72),
   ACE_NTOHL (0x79000000),  // name = dk_Repository
   11,
-  ACE_NTOHL (0x646b5f57), 
-  ACE_NTOHL (0x73747269), 
+  ACE_NTOHL (0x646b5f57),
+  ACE_NTOHL (0x73747269),
   ACE_NTOHL (0x6e670000),  // name = dk_Wstring
   9,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x69786564), 
+  ACE_NTOHL (0x646b5f46),
+  ACE_NTOHL (0x69786564),
   ACE_NTOHL (0x0),  // name = dk_Fixed
   9,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x646b5f56),
+  ACE_NTOHL (0x616c7565),
   ACE_NTOHL (0x0),  // name = dk_Value
   12,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x646b5f56),
+  ACE_NTOHL (0x616c7565),
   ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
   15,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x4d656d62), 
+  ACE_NTOHL (0x646b5f56),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x4d656d62),
   ACE_NTOHL (0x65720000),  // name = dk_ValueMember
   10,
-  ACE_NTOHL (0x646b5f4e), 
-  ACE_NTOHL (0x61746976), 
+  ACE_NTOHL (0x646b5f4e),
+  ACE_NTOHL (0x61746976),
   ACE_NTOHL (0x65000000),  // name = dk_Native
   21,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x62737472), 
-  ACE_NTOHL (0x61637449), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x646b5f41),
+  ACE_NTOHL (0x62737472),
+  ACE_NTOHL (0x61637449),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x66616365),
   ACE_NTOHL (0x0),  // name = dk_AbstractInterface
   18,
-  ACE_NTOHL (0x646b5f4c), 
-  ACE_NTOHL (0x6f63616c), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
+  ACE_NTOHL (0x646b5f4c),
+  ACE_NTOHL (0x6f63616c),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
   ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
   13,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x646b5f43),
+  ACE_NTOHL (0x6f6d706f),
+  ACE_NTOHL (0x6e656e74),
   ACE_NTOHL (0x0),  // name = dk_Component
   8,
-  ACE_NTOHL (0x646b5f48), 
+  ACE_NTOHL (0x646b5f48),
   ACE_NTOHL (0x6f6d6500),  // name = dk_Home
   11,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x646b5f46),
+  ACE_NTOHL (0x6163746f),
   ACE_NTOHL (0x72790000),  // name = dk_Factory
   10,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x696e6465), 
+  ACE_NTOHL (0x646b5f46),
+  ACE_NTOHL (0x696e6465),
   ACE_NTOHL (0x72000000),  // name = dk_Finder
   9,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x6d697473), 
+  ACE_NTOHL (0x646b5f45),
+  ACE_NTOHL (0x6d697473),
   ACE_NTOHL (0x0),  // name = dk_Emits
   13,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x75626c69), 
-  ACE_NTOHL (0x73686573), 
+  ACE_NTOHL (0x646b5f50),
+  ACE_NTOHL (0x75626c69),
+  ACE_NTOHL (0x73686573),
   ACE_NTOHL (0x0),  // name = dk_Publishes
   12,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6e7375), 
+  ACE_NTOHL (0x646b5f43),
+  ACE_NTOHL (0x6f6e7375),
   ACE_NTOHL (0x6d657300),  // name = dk_Consumes
   12,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x726f7669), 
+  ACE_NTOHL (0x646b5f50),
+  ACE_NTOHL (0x726f7669),
   ACE_NTOHL (0x64657300),  // name = dk_Provides
   8,
-  ACE_NTOHL (0x646b5f55), 
+  ACE_NTOHL (0x646b5f55),
   ACE_NTOHL (0x73657300),  // name = dk_Uses
   9,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x76656e74), 
+  ACE_NTOHL (0x646b5f45),
+  ACE_NTOHL (0x76656e74),
   ACE_NTOHL (0x0),  // name = dk_Event
   };
 
@@ -369,7 +368,7 @@ TAO_NAMESPACE_END
 int CORBA::IRObject::_tao_class_id = 0;
 
 CORBA::IRObject_ptr
-tao_CORBA_IRObject_duplicate (
+CORBA::tao_IRObject_life::tao_duplicate (
     CORBA::IRObject_ptr p
   )
 {
@@ -377,7 +376,7 @@ tao_CORBA_IRObject_duplicate (
 }
 
 void
-tao_CORBA_IRObject_release (
+CORBA::tao_IRObject_life::tao_release (
     CORBA::IRObject_ptr p
   )
 {
@@ -385,228 +384,64 @@ tao_CORBA_IRObject_release (
 }
 
 CORBA::IRObject_ptr
-tao_CORBA_IRObject_nil (
+CORBA::tao_IRObject_life::tao_nil (
     void
   )
 {
   return CORBA::IRObject::_nil ();
 }
 
-CORBA::IRObject_ptr
-tao_CORBA_IRObject_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_IRObject_upcast (
-    void *src
-  )
-{
-  CORBA::IRObject **tmp =
-    ACE_static_cast (CORBA::IRObject **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_IRObject_marshal (
+CORBA::tao_IRObject_life::tao_marshal (
     CORBA::IRObject_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::IRObject_var
-// *************************************************************
-
-CORBA::IRObject_var::IRObject_var (void)
-  : ptr_ (IRObject::_nil ())
-{}
-
-::CORBA::IRObject_ptr
-CORBA::IRObject_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::IRObject_var::IRObject_var (const ::CORBA::IRObject_var &p)
-  : TAO_Base_var (),
-    ptr_ (IRObject::_duplicate (p.ptr ()))
-{}
-
-CORBA::IRObject_var::~IRObject_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::IRObject_var &
-CORBA::IRObject_var::operator= (IRObject_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::IRObject_var &
-CORBA::IRObject_var::operator= (const ::CORBA::IRObject_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::IRObject::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::IRObject_var::operator const ::CORBA::IRObject_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::IRObject_var::operator ::CORBA::IRObject_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::IRObject_ptr
-CORBA::IRObject_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::IRObject_ptr
-CORBA::IRObject_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::IRObject_ptr &
-CORBA::IRObject_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::IRObject_ptr &
-CORBA::IRObject_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::IRObject::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::IRObject_ptr
-CORBA::IRObject_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::IRObject_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::IRObject::_nil ();
-  return val;
-}
-
-::CORBA::IRObject_ptr
-CORBA::IRObject_var::tao_duplicate (IRObject_ptr p)
-{
-  return ::CORBA::IRObject::_duplicate (p);
-}
-
-void
-CORBA::IRObject_var::tao_release (IRObject_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::IRObject_ptr
-CORBA::IRObject_var::tao_nil (void)
-{
-  return ::CORBA::IRObject::_nil ();
-}
-
-::CORBA::IRObject_ptr
-CORBA::IRObject_var::tao_narrow (
+CORBA::IRObject_ptr
+CORBA::tao_IRObject_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::IRObject_var::tao_upcast (void *src)
+CORBA::tao_IRObject_cast::tao_upcast (
+    void *src
+  )
 {
-  IRObject **tmp =
-    ACE_static_cast (IRObject **, src);
+  CORBA::IRObject **tmp =
+    ACE_static_cast (CORBA::IRObject **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::IRObject_out
-// *************************************************************
-
-CORBA::IRObject_out::IRObject_out (IRObject_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::IRObject::_nil ();
-}
-
-CORBA::IRObject_out::IRObject_out (IRObject_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::IRObject::_nil ();
-}
-
-CORBA::IRObject_out::IRObject_out (const ::CORBA::IRObject_out &p)
-  : ptr_ (ACE_const_cast (IRObject_out &, p).ptr_)
-{}
-
-::CORBA::IRObject_out &
-CORBA::IRObject_out::operator= (const ::CORBA::IRObject_out &p)
-{
-  this->ptr_ = ACE_const_cast (IRObject_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::IRObject_out &
-CORBA::IRObject_out::operator= (const ::CORBA::IRObject_var &p)
-{
-  this->ptr_ = ::CORBA::IRObject::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::IRObject_out &
-CORBA::IRObject_out::operator= (IRObject_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::IRObject_out::operator ::CORBA::IRObject_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::IRObject_ptr &
-CORBA::IRObject_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::IRObject_ptr
-CORBA::IRObject_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::IRObject,
+        CORBA::tao_IRObject_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::IRObject,
+        CORBA::tao_IRObject_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::IRObject, \
+        CORBA::tao_IRObject_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::IRObject, \
+        CORBA::tao_IRObject_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -626,29 +461,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::DefinitionKind result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (const TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get &);
-    
+
     ::CORBA::DefinitionKind _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -661,7 +496,7 @@ TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -673,11 +508,11 @@ TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -686,17 +521,17 @@ TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (::CORBA::DefinitionKind result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -713,10 +548,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -724,14 +559,14 @@ public:
     TAO_ClientRequestInfo_CORBA_IRObject_destroy (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
     void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -744,7 +579,7 @@ TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -756,11 +591,11 @@ TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (ACE_ENV_SINGLE_ARG_DEC
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -769,7 +604,7 @@ TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -781,7 +616,7 @@ TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_IRObject_Proxy_Impl::_TAO_IRObject_Proxy_Impl (void)
@@ -805,12 +640,12 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
 {
   CORBA::DefinitionKind _tao_retval = (CORBA::DefinitionKind)0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_def_kind",
@@ -818,22 +653,22 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get _tao_ri (
           &_tao_call,
@@ -841,14 +676,14 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -856,77 +691,84 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::DefinitionKind _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::DefinitionKind _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -936,59 +778,57 @@ CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -1003,12 +843,12 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -1016,22 +856,22 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IRObject_destroy _tao_ri (
           &_tao_call,
@@ -1039,14 +879,14 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1054,58 +894,66 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
+                );
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1115,61 +963,59 @@ void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -1220,8 +1066,8 @@ CORBA::_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::IRObject::IRObject (int collocated)
 {
@@ -1242,7 +1088,7 @@ CORBA::IRObject::CORBA_IRObject_setup_collocation (int collocated)
 CORBA::IRObject::~IRObject (void)
 {}
 
-void 
+void
 CORBA::IRObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   IRObject *tmp = ACE_static_cast (IRObject *, _tao_void_pointer);
@@ -1259,7 +1105,7 @@ CORBA::IRObject::_narrow (
     {
       return IRObject::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -1268,17 +1114,17 @@ CORBA::IRObject::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (IRObject::_nil ());
-      
+
       if (is_a == 0)
         {
           return IRObject::_nil ();
         }
     }
-  
+
   return IRObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::IRObject_ptr 
+CORBA::IRObject_ptr
 CORBA::IRObject::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1288,18 +1134,18 @@ CORBA::IRObject::_unchecked_narrow (
     {
       return IRObject::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       IRObject_ptr default_proxy = IRObject::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -1317,7 +1163,7 @@ CORBA::IRObject::_unchecked_narrow (
               IRObject::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -1330,10 +1176,10 @@ CORBA::IRObject::_unchecked_narrow (
               IRObject::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           IRObject_ptr,
@@ -1353,7 +1199,7 @@ CORBA::IRObject::_duplicate (IRObject_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1388,7 +1234,7 @@ CORBA::IRObject::_is_a (
 void *CORBA::IRObject::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id)
@@ -1407,12 +1253,12 @@ void *CORBA::IRObject::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1421,6 +1267,12 @@ const char* CORBA::IRObject::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/IRObject:1.0";
 }
 
+CORBA::Boolean
+CORBA::IRObject::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -1431,10 +1283,10 @@ const char* CORBA::IRObject::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_IRObject_Proxy_Impl &proxy = 
+  _TAO_IRObject_Proxy_Impl &proxy =
     this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::DefinitionKind)0);
-  
+
   return proxy.def_kind (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1451,10 +1303,10 @@ void CORBA::IRObject::destroy (
     CORBA::SystemException
   ))
 {
-  _TAO_IRObject_Proxy_Impl &proxy = 
+  _TAO_IRObject_Proxy_Impl &proxy =
     this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.destroy (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1468,17 +1320,17 @@ static const CORBA::Long _oc_CORBA_IRObject[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4952), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4952),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/IRObject:1.0
     9,
-  ACE_NTOHL (0x49524f62), 
-  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x49524f62),
+  ACE_NTOHL (0x6a656374),
   ACE_NTOHL (0x0),  // name = IRObject
   };
 
@@ -1506,20 +1358,20 @@ static const CORBA::Long _oc_CORBA_VersionSpec[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5665), 
-  ACE_NTOHL (0x7273696f), 
-  ACE_NTOHL (0x6e537065), 
-  ACE_NTOHL (0x633a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5665),
+  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6e537065),
+  ACE_NTOHL (0x633a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
     12,
-  ACE_NTOHL (0x56657273), 
-  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x56657273),
+  ACE_NTOHL (0x696f6e53),
   ACE_NTOHL (0x70656300),  // name = VersionSpec
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -1546,7 +1398,7 @@ TAO_NAMESPACE_END
 int CORBA::Contained::_tao_class_id = 0;
 
 CORBA::Contained_ptr
-tao_CORBA_Contained_duplicate (
+CORBA::tao_Contained_life::tao_duplicate (
     CORBA::Contained_ptr p
   )
 {
@@ -1554,7 +1406,7 @@ tao_CORBA_Contained_duplicate (
 }
 
 void
-tao_CORBA_Contained_release (
+CORBA::tao_Contained_life::tao_release (
     CORBA::Contained_ptr p
   )
 {
@@ -1562,228 +1414,64 @@ tao_CORBA_Contained_release (
 }
 
 CORBA::Contained_ptr
-tao_CORBA_Contained_nil (
+CORBA::tao_Contained_life::tao_nil (
     void
   )
 {
   return CORBA::Contained::_nil ();
 }
 
-CORBA::Contained_ptr
-tao_CORBA_Contained_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_Contained_upcast (
-    void *src
-  )
-{
-  CORBA::Contained **tmp =
-    ACE_static_cast (CORBA::Contained **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_Contained_marshal (
+CORBA::tao_Contained_life::tao_marshal (
     CORBA::Contained_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::Contained_var
-// *************************************************************
-
-CORBA::Contained_var::Contained_var (void)
-  : ptr_ (Contained::_nil ())
-{}
-
-::CORBA::Contained_ptr
-CORBA::Contained_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::Contained_var::Contained_var (const ::CORBA::Contained_var &p)
-  : TAO_Base_var (),
-    ptr_ (Contained::_duplicate (p.ptr ()))
-{}
-
-CORBA::Contained_var::~Contained_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::Contained_var &
-CORBA::Contained_var::operator= (Contained_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Contained_var &
-CORBA::Contained_var::operator= (const ::CORBA::Contained_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::Contained::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::Contained_var::operator const ::CORBA::Contained_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::Contained_var::operator ::CORBA::Contained_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::Contained_ptr
-CORBA::Contained_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Contained_ptr
-CORBA::Contained_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Contained_ptr &
-CORBA::Contained_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Contained_ptr &
-CORBA::Contained_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Contained::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::Contained_ptr
-CORBA::Contained_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::Contained_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::Contained::_nil ();
-  return val;
-}
-
-::CORBA::Contained_ptr
-CORBA::Contained_var::tao_duplicate (Contained_ptr p)
-{
-  return ::CORBA::Contained::_duplicate (p);
-}
-
-void
-CORBA::Contained_var::tao_release (Contained_ptr p)
-{
-  CORBA::release (p);
+  return p->marshal (cdr);
 }
 
-::CORBA::Contained_ptr
-CORBA::Contained_var::tao_nil (void)
-{
-  return ::CORBA::Contained::_nil ();
-}
-
-::CORBA::Contained_ptr
-CORBA::Contained_var::tao_narrow (
+CORBA::Contained_ptr
+CORBA::tao_Contained_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::Contained_var::tao_upcast (void *src)
+CORBA::tao_Contained_cast::tao_upcast (
+    void *src
+  )
 {
-  Contained **tmp =
-    ACE_static_cast (Contained **, src);
+  CORBA::Contained **tmp =
+    ACE_static_cast (CORBA::Contained **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::Contained_out
-// *************************************************************
-
-CORBA::Contained_out::Contained_out (Contained_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::Contained::_nil ();
-}
-
-CORBA::Contained_out::Contained_out (Contained_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Contained::_nil ();
-}
-
-CORBA::Contained_out::Contained_out (const ::CORBA::Contained_out &p)
-  : ptr_ (ACE_const_cast (Contained_out &, p).ptr_)
-{}
-
-::CORBA::Contained_out &
-CORBA::Contained_out::operator= (const ::CORBA::Contained_out &p)
-{
-  this->ptr_ = ACE_const_cast (Contained_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::Contained_out &
-CORBA::Contained_out::operator= (const ::CORBA::Contained_var &p)
-{
-  this->ptr_ = ::CORBA::Contained::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::Contained_out &
-CORBA::Contained_out::operator= (Contained_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Contained_out::operator ::CORBA::Contained_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::Contained_ptr &
-CORBA::Contained_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Contained_ptr
-CORBA::Contained_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::Contained,
+        CORBA::tao_Contained_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::Contained,
+        CORBA::tao_Contained_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::Contained, \
+        CORBA::tao_Contained_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::Contained, \
+        CORBA::tao_Contained_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -1803,29 +1491,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (char * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Contained_id_get (const TAO_ClientRequestInfo_CORBA_Contained_id_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_id_get &);
-    
+
     char * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_id_get::TAO_ClientRequestInfo_CORBA_Contained_id_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -1838,7 +1526,7 @@ TAO_ClientRequestInfo_CORBA_Contained_id_get::arguments (ACE_ENV_SINGLE_ARG_DECL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -1850,11 +1538,11 @@ TAO_ClientRequestInfo_CORBA_Contained_id_get::exceptions (ACE_ENV_SINGLE_ARG_DEC
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_id_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1863,17 +1551,17 @@ TAO_ClientRequestInfo_CORBA_Contained_id_get::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_id_get::result (char * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -1891,10 +1579,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1903,15 +1591,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_id_set &);
     const char * id_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_id_set::TAO_ClientRequestInfo_CORBA_Contained_id_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id)
@@ -1925,15 +1613,15 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (ACE_ENV_SINGLE_ARG_DECL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1945,11 +1633,11 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::exceptions (ACE_ENV_SINGLE_ARG_DEC
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1958,7 +1646,7 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1977,29 +1665,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (char * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Contained_name_get (const TAO_ClientRequestInfo_CORBA_Contained_name_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_name_get &);
-    
+
     char * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_name_get::TAO_ClientRequestInfo_CORBA_Contained_name_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2012,7 +1700,7 @@ TAO_ClientRequestInfo_CORBA_Contained_name_get::arguments (ACE_ENV_SINGLE_ARG_DE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2024,11 +1712,11 @@ TAO_ClientRequestInfo_CORBA_Contained_name_get::exceptions (ACE_ENV_SINGLE_ARG_D
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2037,17 +1725,17 @@ TAO_ClientRequestInfo_CORBA_Contained_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_name_get::result (char * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2065,10 +1753,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2077,15 +1765,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_name_set &);
     const char * name_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_name_set::TAO_ClientRequestInfo_CORBA_Contained_name_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * name
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       name_ (name)
@@ -2099,15 +1787,15 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (ACE_ENV_SINGLE_ARG_DE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2119,11 +1807,11 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::exceptions (ACE_ENV_SINGLE_ARG_D
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2132,7 +1820,7 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2151,29 +1839,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (char * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Contained_version_get (const TAO_ClientRequestInfo_CORBA_Contained_version_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_version_get &);
-    
+
     char * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_version_get::TAO_ClientRequestInfo_CORBA_Contained_version_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2186,7 +1874,7 @@ TAO_ClientRequestInfo_CORBA_Contained_version_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2198,11 +1886,11 @@ TAO_ClientRequestInfo_CORBA_Contained_version_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_version_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2211,17 +1899,17 @@ TAO_ClientRequestInfo_CORBA_Contained_version_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_version_get::result (char * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2239,10 +1927,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2251,15 +1939,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_version_set &);
     const char * version_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_version_set::TAO_ClientRequestInfo_CORBA_Contained_version_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * version
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       version_ (version)
@@ -2273,15 +1961,15 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2293,11 +1981,11 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2306,7 +1994,7 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2325,29 +2013,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Container_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (const TAO_ClientRequestInfo_CORBA_Contained_defined_in_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_defined_in_get &);
-    
+
     ::CORBA::Container_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2360,7 +2048,7 @@ TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2372,11 +2060,11 @@ TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2385,17 +2073,17 @@ TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (::CORBA::Container_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2412,29 +2100,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (char * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (const TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get &);
-    
+
     char * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2447,7 +2135,7 @@ TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2459,11 +2147,11 @@ TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2472,17 +2160,17 @@ TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (char * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2499,29 +2187,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Repository_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (const TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get &);
-    
+
     ::CORBA::Repository_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2534,7 +2222,7 @@ TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::arguments (ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2546,11 +2234,11 @@ TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2559,17 +2247,17 @@ TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (ACE_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (::CORBA::Repository_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2586,29 +2274,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Contained::Description * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Contained_describe (const TAO_ClientRequestInfo_CORBA_Contained_describe &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Contained_describe &);
-    
+
     ::CORBA::Contained::Description * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_describe::TAO_ClientRequestInfo_CORBA_Contained_describe (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2621,7 +2309,7 @@ TAO_ClientRequestInfo_CORBA_Contained_describe::arguments (ACE_ENV_SINGLE_ARG_DE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2633,11 +2321,11 @@ TAO_ClientRequestInfo_CORBA_Contained_describe::exceptions (ACE_ENV_SINGLE_ARG_D
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_describe::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2646,17 +2334,17 @@ TAO_ClientRequestInfo_CORBA_Contained_describe::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_describe::result (::CORBA::Contained::Description * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2676,10 +2364,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2690,17 +2378,17 @@ public:
     const char * new_name_;
     const char * new_version_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Contained_move (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       new_container_ (new_container),
@@ -2716,23 +2404,23 @@ TAO_ClientRequestInfo_CORBA_Contained_move::arguments (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->new_container_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= new_name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= new_version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2744,11 +2432,11 @@ TAO_ClientRequestInfo_CORBA_Contained_move::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2757,7 +2445,7 @@ TAO_ClientRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2769,7 +2457,7 @@ TAO_ClientRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_Contained_Proxy_Impl::_TAO_Contained_Proxy_Impl (void)
@@ -2793,12 +2481,12 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
 {
   CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_id",
@@ -2806,22 +2494,22 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_id_get _tao_ri (
           &_tao_call,
@@ -2829,14 +2517,14 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -2844,78 +2532,85 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  char * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          char * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -2925,59 +2620,57 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -2993,12 +2686,12 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_id",
@@ -3006,22 +2699,22 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_id_set _tao_ri (
           &_tao_call,
@@ -3030,14 +2723,14 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3045,70 +2738,76 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3118,56 +2817,54 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::id (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -3184,12 +2881,12 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
 {
   CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_name",
@@ -3197,22 +2894,22 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_name_get _tao_ri (
           &_tao_call,
@@ -3220,14 +2917,14 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3235,78 +2932,85 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  char * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          char * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3316,59 +3020,57 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -3384,12 +3086,12 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_name",
@@ -3397,22 +3099,22 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_name_set _tao_ri (
           &_tao_call,
@@ -3421,14 +3123,14 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3436,70 +3138,76 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << name)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << name)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3509,56 +3217,54 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -3575,12 +3281,12 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
 {
   CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_version",
@@ -3588,22 +3294,22 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_version_get _tao_ri (
           &_tao_call,
@@ -3611,14 +3317,14 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3626,78 +3332,85 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  char * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          char * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3707,59 +3420,57 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -3775,12 +3486,12 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_version",
@@ -3788,22 +3499,22 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_version_set _tao_ri (
           &_tao_call,
@@ -3812,14 +3523,14 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3827,70 +3538,76 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << version)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << version)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3900,56 +3617,54 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -3966,12 +3681,12 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
 {
   CORBA::Container_var _tao_retval (CORBA::Container::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_defined_in",
@@ -3979,22 +3694,22 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_defined_in_get _tao_ri (
           &_tao_call,
@@ -4002,14 +3717,14 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4017,78 +3732,85 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Container_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Container_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4098,59 +3820,57 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::version (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -4166,12 +3886,12 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
 {
   CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_absolute_name",
@@ -4179,22 +3899,22 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get _tao_ri (
           &_tao_call,
@@ -4202,14 +3922,14 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4217,78 +3937,85 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  char * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          char * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4298,59 +4025,57 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -4364,14 +4089,17 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
     CORBA::SystemException
   ))
 {
-  CORBA::Repository_var _tao_retval ( tao_CORBA_Repository_nil ());
+  CORBA::Repository_var _tao_retval (
+      CORBA::tao_Repository_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_containing_repository",
@@ -4379,22 +4107,22 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get _tao_ri (
           &_tao_call,
@@ -4402,14 +4130,14 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4417,78 +4145,85 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Repository_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Repository_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4498,59 +4233,57 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -4566,18 +4299,18 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
 {
   CORBA::Contained::Description_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::Contained::Description *tmp;
     ACE_NEW_RETURN (tmp, CORBA::Contained::Description, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe",
@@ -4585,22 +4318,22 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_describe _tao_ri (
           &_tao_call,
@@ -4608,14 +4341,14 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4623,78 +4356,85 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Contained::Description * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Contained::Description * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4704,59 +4444,57 @@ char * CORBA::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -4774,12 +4512,12 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "move",
@@ -4787,22 +4525,22 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
       3,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_move _tao_ri (
           &_tao_call,
@@ -4813,14 +4551,14 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4828,72 +4566,78 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << new_container) &&
-              (_tao_out << new_name) &&
-              (_tao_out << new_version)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK;
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << new_container) &&
+                  (_tao_out << new_name) &&
+                  (_tao_out << new_version)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4903,61 +4647,59 @@ void CORBA::_TAO_Contained_Remote_Proxy_Impl::move (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -5008,8 +4750,8 @@ CORBA::_TAO_Contained_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::Contained::Contained (int collocated)
 {
@@ -5025,14 +4767,14 @@ CORBA::Contained::CORBA_Contained_setup_collocation (int collocated)
   else
     this->the_TAO_Contained_Proxy_Broker_ =
       ::CORBA::_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
 CORBA::Contained::~Contained (void)
 {}
 
-void 
+void
 CORBA::Contained::_tao_any_destructor (void *_tao_void_pointer)
 {
   Contained *tmp = ACE_static_cast (Contained *, _tao_void_pointer);
@@ -5049,7 +4791,7 @@ CORBA::Contained::_narrow (
     {
       return Contained::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -5058,17 +4800,17 @@ CORBA::Contained::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Contained::_nil ());
-      
+
       if (is_a == 0)
         {
           return Contained::_nil ();
         }
     }
-  
+
   return Contained::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Contained_ptr 
+CORBA::Contained_ptr
 CORBA::Contained::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5078,18 +4820,18 @@ CORBA::Contained::_unchecked_narrow (
     {
       return Contained::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       Contained_ptr default_proxy = Contained::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -5107,7 +4849,7 @@ CORBA::Contained::_unchecked_narrow (
               Contained::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -5120,10 +4862,10 @@ CORBA::Contained::_unchecked_narrow (
               Contained::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           Contained_ptr,
@@ -5143,7 +4885,7 @@ CORBA::Contained::_duplicate (Contained_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -5182,7 +4924,7 @@ CORBA::Contained::_is_a (
 void *CORBA::Contained::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, Contained)::_tao_class_id)
@@ -5215,12 +4957,12 @@ void *CORBA::Contained::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -5229,6 +4971,12 @@ const char* CORBA::Contained::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Contained:1.0";
 }
 
+CORBA::Boolean
+CORBA::Contained::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -5239,10 +4987,10 @@ char * CORBA::Contained::id (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.id (
       this
       ACE_ENV_ARG_PARAMETER
@@ -5260,10 +5008,10 @@ void CORBA::Contained::id (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.id (
       this,
       id
@@ -5281,10 +5029,10 @@ char * CORBA::Contained::name (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.name (
       this
       ACE_ENV_ARG_PARAMETER
@@ -5302,10 +5050,10 @@ void CORBA::Contained::name (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.name (
       this,
       name
@@ -5323,10 +5071,10 @@ char * CORBA::Contained::version (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.version (
       this
       ACE_ENV_ARG_PARAMETER
@@ -5344,10 +5092,10 @@ void CORBA::Contained::version (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.version (
       this,
       version
@@ -5365,10 +5113,10 @@ void CORBA::Contained::version (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.defined_in (
       this
       ACE_ENV_ARG_PARAMETER
@@ -5385,10 +5133,10 @@ char * CORBA::Contained::absolute_name (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.absolute_name (
       this
       ACE_ENV_ARG_PARAMETER
@@ -5405,10 +5153,10 @@ char * CORBA::Contained::absolute_name (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.containing_repository (
       this
       ACE_ENV_ARG_PARAMETER
@@ -5422,201 +5170,201 @@ static const CORBA::Long _oc_CORBA_Contained_Description[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65642f), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65642f),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained/Description:1.0
     12,
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = Description
   2, // member count
     5,
-  ACE_NTOHL (0x6b696e64), 
+  ACE_NTOHL (0x6b696e64),
   ACE_NTOHL (0x0),  // name = kind
     CORBA::tk_enum, // typecode kind
   684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4465), 
-    ACE_NTOHL (0x66696e69), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x4b696e64), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4465),
+    ACE_NTOHL (0x66696e69),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x4b696e64),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
     15,
-    ACE_NTOHL (0x44656669), 
-    ACE_NTOHL (0x6e697469), 
-    ACE_NTOHL (0x6f6e4b69), 
+    ACE_NTOHL (0x44656669),
+    ACE_NTOHL (0x6e697469),
+    ACE_NTOHL (0x6f6e4b69),
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
     36, // member count
     8,
-    ACE_NTOHL (0x646b5f6e), 
+    ACE_NTOHL (0x646b5f6e),
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
     7,
-    ACE_NTOHL (0x646b5f61), 
+    ACE_NTOHL (0x646b5f61),
     ACE_NTOHL (0x6c6c0000),  // name = dk_all
     13,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x74747269), 
-    ACE_NTOHL (0x62757465), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x74747269),
+    ACE_NTOHL (0x62757465),
     ACE_NTOHL (0x0),  // name = dk_Attribute
     12,
-    ACE_NTOHL (0x646b5f43), 
-    ACE_NTOHL (0x6f6e7374), 
+    ACE_NTOHL (0x646b5f43),
+    ACE_NTOHL (0x6f6e7374),
     ACE_NTOHL (0x616e7400),  // name = dk_Constant
     13,
-    ACE_NTOHL (0x646b5f45), 
-    ACE_NTOHL (0x78636570), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x78636570),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = dk_Exception
     13,
-    ACE_NTOHL (0x646b5f49), 
-    ACE_NTOHL (0x6e746572), 
-    ACE_NTOHL (0x66616365), 
+    ACE_NTOHL (0x646b5f49),
+    ACE_NTOHL (0x6e746572),
+    ACE_NTOHL (0x66616365),
     ACE_NTOHL (0x0),  // name = dk_Interface
     10,
-    ACE_NTOHL (0x646b5f4d), 
-    ACE_NTOHL (0x6f64756c), 
+    ACE_NTOHL (0x646b5f4d),
+    ACE_NTOHL (0x6f64756c),
     ACE_NTOHL (0x65000000),  // name = dk_Module
     13,
-    ACE_NTOHL (0x646b5f4f), 
-    ACE_NTOHL (0x70657261), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x646b5f4f),
+    ACE_NTOHL (0x70657261),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = dk_Operation
     11,
-    ACE_NTOHL (0x646b5f54), 
-    ACE_NTOHL (0x79706564), 
+    ACE_NTOHL (0x646b5f54),
+    ACE_NTOHL (0x79706564),
     ACE_NTOHL (0x65660000),  // name = dk_Typedef
     9,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x6c696173), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x6c696173),
     ACE_NTOHL (0x0),  // name = dk_Alias
     10,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x74727563), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x74727563),
     ACE_NTOHL (0x74000000),  // name = dk_Struct
     9,
-    ACE_NTOHL (0x646b5f55), 
-    ACE_NTOHL (0x6e696f6e), 
+    ACE_NTOHL (0x646b5f55),
+    ACE_NTOHL (0x6e696f6e),
     ACE_NTOHL (0x0),  // name = dk_Union
     8,
-    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x646b5f45),
     ACE_NTOHL (0x6e756d00),  // name = dk_Enum
     13,
-    ACE_NTOHL (0x646b5f50), 
-    ACE_NTOHL (0x72696d69), 
-    ACE_NTOHL (0x74697665), 
+    ACE_NTOHL (0x646b5f50),
+    ACE_NTOHL (0x72696d69),
+    ACE_NTOHL (0x74697665),
     ACE_NTOHL (0x0),  // name = dk_Primitive
     10,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x7472696e), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x7472696e),
     ACE_NTOHL (0x67000000),  // name = dk_String
     12,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x65717565), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x65717565),
     ACE_NTOHL (0x6e636500),  // name = dk_Sequence
     9,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x72726179), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x72726179),
     ACE_NTOHL (0x0),  // name = dk_Array
     14,
-    ACE_NTOHL (0x646b5f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
+    ACE_NTOHL (0x646b5f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
     ACE_NTOHL (0x79000000),  // name = dk_Repository
     11,
-    ACE_NTOHL (0x646b5f57), 
-    ACE_NTOHL (0x73747269), 
+    ACE_NTOHL (0x646b5f57),
+    ACE_NTOHL (0x73747269),
     ACE_NTOHL (0x6e670000),  // name = dk_Wstring
     9,
-    ACE_NTOHL (0x646b5f46), 
-    ACE_NTOHL (0x69786564), 
+    ACE_NTOHL (0x646b5f46),
+    ACE_NTOHL (0x69786564),
     ACE_NTOHL (0x0),  // name = dk_Fixed
     9,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
     ACE_NTOHL (0x0),  // name = dk_Value
     12,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
     ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
     15,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
-    ACE_NTOHL (0x4d656d62), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
+    ACE_NTOHL (0x4d656d62),
     ACE_NTOHL (0x65720000),  // name = dk_ValueMember
     10,
-    ACE_NTOHL (0x646b5f4e), 
-    ACE_NTOHL (0x61746976), 
+    ACE_NTOHL (0x646b5f4e),
+    ACE_NTOHL (0x61746976),
     ACE_NTOHL (0x65000000),  // name = dk_Native
     21,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x62737472), 
-    ACE_NTOHL (0x61637449), 
-    ACE_NTOHL (0x6e746572), 
-    ACE_NTOHL (0x66616365), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x62737472),
+    ACE_NTOHL (0x61637449),
+    ACE_NTOHL (0x6e746572),
+    ACE_NTOHL (0x66616365),
     ACE_NTOHL (0x0),  // name = dk_AbstractInterface
     18,
-    ACE_NTOHL (0x646b5f4c), 
-    ACE_NTOHL (0x6f63616c), 
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
+    ACE_NTOHL (0x646b5f4c),
+    ACE_NTOHL (0x6f63616c),
+    ACE_NTOHL (0x496e7465),
+    ACE_NTOHL (0x72666163),
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
     13,
-    ACE_NTOHL (0x646b5f43), 
-    ACE_NTOHL (0x6f6d706f), 
-    ACE_NTOHL (0x6e656e74), 
+    ACE_NTOHL (0x646b5f43),
+    ACE_NTOHL (0x6f6d706f),
+    ACE_NTOHL (0x6e656e74),
     ACE_NTOHL (0x0),  // name = dk_Component
     8,
-    ACE_NTOHL (0x646b5f48), 
+    ACE_NTOHL (0x646b5f48),
     ACE_NTOHL (0x6f6d6500),  // name = dk_Home
     11,
-    ACE_NTOHL (0x646b5f46), 
-    ACE_NTOHL (0x6163746f), 
+    ACE_NTOHL (0x646b5f46),
+    ACE_NTOHL (0x6163746f),
     ACE_NTOHL (0x72790000),  // name = dk_Factory
     10,
-    ACE_NTOHL (0x646b5f46), 
-    ACE_NTOHL (0x696e6465), 
+    ACE_NTOHL (0x646b5f46),
+    ACE_NTOHL (0x696e6465),
     ACE_NTOHL (0x72000000),  // name = dk_Finder
     9,
-    ACE_NTOHL (0x646b5f45), 
-    ACE_NTOHL (0x6d697473), 
+    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x6d697473),
     ACE_NTOHL (0x0),  // name = dk_Emits
     13,
-    ACE_NTOHL (0x646b5f50), 
-    ACE_NTOHL (0x75626c69), 
-    ACE_NTOHL (0x73686573), 
+    ACE_NTOHL (0x646b5f50),
+    ACE_NTOHL (0x75626c69),
+    ACE_NTOHL (0x73686573),
     ACE_NTOHL (0x0),  // name = dk_Publishes
     12,
-    ACE_NTOHL (0x646b5f43), 
-    ACE_NTOHL (0x6f6e7375), 
+    ACE_NTOHL (0x646b5f43),
+    ACE_NTOHL (0x6f6e7375),
     ACE_NTOHL (0x6d657300),  // name = dk_Consumes
     12,
-    ACE_NTOHL (0x646b5f50), 
-    ACE_NTOHL (0x726f7669), 
+    ACE_NTOHL (0x646b5f50),
+    ACE_NTOHL (0x726f7669),
     ACE_NTOHL (0x64657300),  // name = dk_Provides
     8,
-    ACE_NTOHL (0x646b5f55), 
+    ACE_NTOHL (0x646b5f55),
     ACE_NTOHL (0x73657300),  // name = dk_Uses
     9,
-    ACE_NTOHL (0x646b5f45), 
-    ACE_NTOHL (0x76656e74), 
+    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x76656e74),
     ACE_NTOHL (0x0),  // name = dk_Event
-    
+
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
     CORBA::tk_any,
 
@@ -5633,7 +5381,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained_Description (
 ::CORBA::TypeCode_ptr CORBA::Contained::_tc_Description =
   &_tc_TAO_tc_CORBA_Contained_Description;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::Contained::Description::_tao_any_destructor (void *_tao_void_pointer)
@@ -5643,6 +5391,37 @@ void CORBA::Contained::Description::_tao_any_destructor (void *_tao_void_pointer
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      Description
+    >;
+
+template class
+  TAO_Out_T<
+      Description,
+      Description_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      Description \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      Description, \
+      Description_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::Contained::Description * CORBA::Contained::describe (
@@ -5652,10 +5431,10 @@ void CORBA::Contained::Description::_tao_any_destructor (void *_tao_void_pointer
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe (
       this
       ACE_ENV_ARG_PARAMETER
@@ -5675,10 +5454,10 @@ void CORBA::Contained::move (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
+  _TAO_Contained_Proxy_Impl &proxy =
     this->the_TAO_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.move (
       this,
       new_container,
@@ -5695,17 +5474,17 @@ static const CORBA::Long _oc_CORBA_Contained[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65643a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65643a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
     10,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x61696e65), 
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x61696e65),
   ACE_NTOHL (0x64000000),  // name = Contained
   };
 
@@ -5727,159 +5506,47 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::InterfaceDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::InterfaceDef **old = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_InterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_InterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_InterfaceDef_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      tao_CORBA_InterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_InterfaceDef_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::InterfaceDef **tmp = ACE_static_cast (CORBA::InterfaceDef**, target);
-  *tmp = tao_CORBA_InterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
-{
-  return tao_CORBA_InterfaceDef_upcast (src);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CS_)
-#define _CORBA_INTERFACEDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::InterfaceDefSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::InterfaceDefSeq::InterfaceDefSeq (void)
 {}
 
 CORBA::InterfaceDefSeq::InterfaceDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::InterfaceDef,
+        CORBA::InterfaceDef,
+        CORBA::tao_InterfaceDef_life,
+        CORBA::tao_InterfaceDef_cast
+      >
+    (max)
 {}
 
 CORBA::InterfaceDefSeq::InterfaceDefSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::InterfaceDef_ptr *buffer,
+    CORBA::InterfaceDef_ptr* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::InterfaceDef,
+        CORBA::InterfaceDef,
+        CORBA::tao_InterfaceDef_life,
+        CORBA::tao_InterfaceDef_cast
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::InterfaceDefSeq::InterfaceDefSeq (const InterfaceDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::InterfaceDef,
+        CORBA::InterfaceDef,
+        CORBA::tao_InterfaceDef_life,
+        CORBA::tao_InterfaceDef_cast
+      >
+    (seq)
 {}
 
-CORBA::InterfaceDefSeq::~InterfaceDefSeq (void) // dtor
+CORBA::InterfaceDefSeq::~InterfaceDefSeq (void)
 {}
 
 void CORBA::InterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -5888,4707 +5555,3977 @@ void CORBA::InterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InterfaceDefSeq:1.0
-    16,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446566), 
-  ACE_NTOHL (0x53657100),  // name = InterfaceDefSeq
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f496e), 
-      ACE_NTOHL (0x74657266), 
-      ACE_NTOHL (0x61636544), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-            13,
-      ACE_NTOHL (0x496e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x65446566), 
-      ACE_NTOHL (0x0),  // name = InterfaceDef
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_InterfaceDefSeq),
-    (char *) &_oc_CORBA_InterfaceDefSeq,
-    0,
-    sizeof (CORBA::InterfaceDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_InterfaceDefSeq,
-    &_tc_TAO_tc_CORBA_InterfaceDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ValueDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ValueDef **old = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_ValueDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_ValueDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ValueDef_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      tao_CORBA_ValueDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ValueDef_nil ();
-    }
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::InterfaceDefSeq,
+      TAO_Object_Manager<
+          CORBA::InterfaceDef,
+          CORBA::InterfaceDef_var,
+          CORBA::tao_InterfaceDef_life
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::InterfaceDefSeq,
+      CORBA::InterfaceDefSeq_var,
+      TAO_Object_Manager<
+          CORBA::InterfaceDef,
+          CORBA::InterfaceDef_var,
+          CORBA::tao_InterfaceDef_life
+        >
+    >;
 
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::ValueDef **tmp = ACE_static_cast (CORBA::ValueDef**, target);
-  *tmp = tao_CORBA_ValueDef_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
-{
-  return tao_CORBA_ValueDef_upcast (src);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEDEFSEQ_CS_)
-#define _CORBA_VALUEDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ValueDefSeq
-// *************************************************************
-
-CORBA::ValueDefSeq::ValueDefSeq (void)
-{}
-
-CORBA::ValueDefSeq::ValueDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ValueDefSeq::ValueDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ValueDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::ValueDefSeq::ValueDefSeq (const ValueDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::ValueDefSeq::~ValueDefSeq (void) // dtor
-{}
-
-void CORBA::ValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ValueDefSeq *tmp = ACE_static_cast (ValueDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c756544), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueDefSeq:1.0
-    12,
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65446566), 
-  ACE_NTOHL (0x53657100),  // name = ValueDefSeq
-    CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5661), 
-      ACE_NTOHL (0x6c756544), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-            9,
-      ACE_NTOHL (0x56616c75), 
-      ACE_NTOHL (0x65446566), 
-      ACE_NTOHL (0x0),  // name = ValueDef
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ValueDefSeq),
-    (char *) &_oc_CORBA_ValueDefSeq,
-    0,
-    sizeof (CORBA::ValueDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ValueDefSeq,
-    &_tc_TAO_tc_CORBA_ValueDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::AbstractInterfaceDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::AbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_AbstractInterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::AbstractInterfaceDef **tmp = ACE_static_cast (CORBA::AbstractInterfaceDef**, target);
-  *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src) const
-{
-  return tao_CORBA_AbstractInterfaceDef_upcast (src);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::AbstractInterfaceDefSeq
-// *************************************************************
-
-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (void)
-{}
-
-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::AbstractInterfaceDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::AbstractInterfaceDefSeq::~AbstractInterfaceDefSeq (void) // dtor
-{}
-
-void CORBA::AbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AbstractInterfaceDefSeq *tmp = ACE_static_cast (AbstractInterfaceDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+    TAO_MngSeq_Var_T< \
+        CORBA::InterfaceDefSeq, \
+        TAO_Object_Manager< \
+            CORBA::InterfaceDef, \
+            CORBA::InterfaceDef_var, \
+            CORBA::tao_InterfaceDef_life \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::InterfaceDefSeq, \
+        CORBA::InterfaceDefSeq_var, \
+        TAO_Object_Manager< \
+            CORBA::InterfaceDef, \
+            CORBA::InterfaceDef_var, \
+            CORBA::tao_InterfaceDef_life \
+          > \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4162), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x6374496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0
-    24,
-  ACE_NTOHL (0x41627374), 
-  ACE_NTOHL (0x72616374), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446566), 
-  ACE_NTOHL (0x53657100),  // name = AbstractInterfaceDefSeq
-    CORBA::tk_sequence, // typecode kind
-  96, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
+  static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
+  {
+        TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f496e),
+    ACE_NTOHL (0x74657266),
+    ACE_NTOHL (0x61636544),
+    ACE_NTOHL (0x65665365),
+    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InterfaceDefSeq:1.0
+        16,
+    ACE_NTOHL (0x496e7465),
+    ACE_NTOHL (0x72666163),
+    ACE_NTOHL (0x65446566),
+    ACE_NTOHL (0x53657100),  // name = InterfaceDefSeq
+        CORBA::tk_sequence, // typecode kind
     80, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4162), 
-      ACE_NTOHL (0x73747261), 
-      ACE_NTOHL (0x6374496e), 
-      ACE_NTOHL (0x74657266), 
-      ACE_NTOHL (0x61636544), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
-            21,
-      ACE_NTOHL (0x41627374), 
-      ACE_NTOHL (0x72616374), 
-      ACE_NTOHL (0x496e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x65446566), 
-      ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_AbstractInterfaceDefSeq),
-    (char *) &_oc_CORBA_AbstractInterfaceDefSeq,
-    0,
-    sizeof (CORBA::AbstractInterfaceDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_AbstractInterfaceDefSeq,
-    &_tc_TAO_tc_CORBA_AbstractInterfaceDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::LocalInterfaceDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::LocalInterfaceDef **old = ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_LocalInterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_LocalInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      tao_CORBA_LocalInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::LocalInterfaceDef **tmp = ACE_static_cast (CORBA::LocalInterfaceDef**, target);
-  *tmp = tao_CORBA_LocalInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) const
-{
-  return tao_CORBA_LocalInterfaceDef_upcast (src);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CS_)
-#define _CORBA_LOCALINTERFACEDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::LocalInterfaceDefSeq
-// *************************************************************
-
-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (void)
-{}
-
-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::LocalInterfaceDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (const LocalInterfaceDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::LocalInterfaceDefSeq::~LocalInterfaceDefSeq (void) // dtor
-{}
-
-void CORBA::LocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  LocalInterfaceDefSeq *tmp = ACE_static_cast (LocalInterfaceDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+      CORBA::tk_objref, // typecode kind
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        35,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f496e),
+        ACE_NTOHL (0x74657266),
+        ACE_NTOHL (0x61636544),
+        ACE_NTOHL (0x65663a31),
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
+                13,
+        ACE_NTOHL (0x496e7465),
+        ACE_NTOHL (0x72666163),
+        ACE_NTOHL (0x65446566),
+        ACE_NTOHL (0x0),  // name = InterfaceDef
 
-static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4c6f), 
-  ACE_NTOHL (0x63616c49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0
-    21,
-  ACE_NTOHL (0x4c6f6361), 
-  ACE_NTOHL (0x6c496e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63654465), 
-  ACE_NTOHL (0x66536571), 
-  ACE_NTOHL (0x0),  // name = LocalInterfaceDefSeq
-    CORBA::tk_sequence, // typecode kind
-  88, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    72, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      40,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4c6f), 
-      ACE_NTOHL (0x63616c49), 
-      ACE_NTOHL (0x6e746572), 
-      ACE_NTOHL (0x66616365), 
-      ACE_NTOHL (0x4465663a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
-            18,
-      ACE_NTOHL (0x4c6f6361), 
-      ACE_NTOHL (0x6c496e74), 
-      ACE_NTOHL (0x65726661), 
-      ACE_NTOHL (0x63654465), 
-      ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
-      
-    0U,
+      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_LocalInterfaceDefSeq),
-    (char *) &_oc_CORBA_LocalInterfaceDefSeq,
-    0,
-    sizeof (CORBA::LocalInterfaceDefSeq)
-  );
+  static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDefSeq (
+      CORBA::tk_alias,
+      sizeof (_oc_CORBA_InterfaceDefSeq),
+      (char *) &_oc_CORBA_InterfaceDefSeq,
+      0,
+      sizeof (CORBA::InterfaceDefSeq)
+    );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_LocalInterfaceDefSeq,
-    &_tc_TAO_tc_CORBA_LocalInterfaceDefSeq
-  )
-TAO_NAMESPACE_END
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (CORBA)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_InterfaceDefSeq,
+      &_tc_TAO_tc_CORBA_InterfaceDefSeq
+    )
+  TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+  CORBA::ValueDefSeq::ValueDefSeq (void)
+  {}
+
+  CORBA::ValueDefSeq::ValueDefSeq (CORBA::ULong max)
+    : TAO_Unbounded_Object_Sequence<
+          CORBA::ValueDef,
+          CORBA::ValueDef,
+          CORBA::tao_ValueDef_life,
+          CORBA::tao_ValueDef_cast
+        >
+      (max)
+  {}
+
+  CORBA::ValueDefSeq::ValueDefSeq (
+      CORBA::ULong max,
+      CORBA::ULong length,
+      CORBA::ValueDef_ptr* buffer,
+      CORBA::Boolean release
+    )
+    : TAO_Unbounded_Object_Sequence<
+          CORBA::ValueDef,
+          CORBA::ValueDef,
+          CORBA::tao_ValueDef_life,
+          CORBA::tao_ValueDef_cast
+        >
+      (max, length, buffer, release)
+  {}
+
+  CORBA::ValueDefSeq::ValueDefSeq (const ValueDefSeq &seq)
+    : TAO_Unbounded_Object_Sequence<
+          CORBA::ValueDef,
+          CORBA::ValueDef,
+          CORBA::tao_ValueDef_life,
+          CORBA::tao_ValueDef_cast
+        >
+      (seq)
+  {}
+
+  CORBA::ValueDefSeq::~ValueDefSeq (void)
+  {}
+
+  void CORBA::ValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+  {
+    ValueDefSeq *tmp = ACE_static_cast (ValueDefSeq*, _tao_void_pointer);
+    delete tmp;
+  }
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO_MngSeq_Var_T<
+        CORBA::ValueDefSeq,
+        TAO_Object_Manager<
+            CORBA::ValueDef,
+            CORBA::ValueDef_var,
+            CORBA::tao_ValueDef_life
+          >
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        CORBA::ValueDefSeq,
+        CORBA::ValueDefSeq_var,
+        TAO_Object_Manager<
+            CORBA::ValueDef,
+            CORBA::ValueDef_var,
+            CORBA::tao_ValueDef_life
+          >
+      >;
 
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CS_
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExtInterfaceDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
+  # pragma instantiate \
+      TAO_MngSeq_Var_T< \
+          CORBA::ValueDefSeq, \
+          TAO_Object_Manager< \
+              CORBA::ValueDef, \
+              CORBA::ValueDef_var, \
+              CORBA::tao_ValueDef_life \
+            > \
+        >
+
+  # pragma instantiate \
+      TAO_Seq_Out_T< \
+          CORBA::ValueDefSeq, \
+          CORBA::ValueDefSeq_var, \
+          TAO_Object_Manager< \
+              CORBA::ValueDef, \
+              CORBA::ValueDef_var, \
+              CORBA::tao_ValueDef_life \
+            > \
+        >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+    static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
     {
-      CORBA::ExtInterfaceDef **old = ACE_reinterpret_cast (CORBA::ExtInterfaceDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_ExtInterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+            TAO_ENCAP_BYTE_ORDER, // byte order
+      34,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f5661),
+      ACE_NTOHL (0x6c756544),
+      ACE_NTOHL (0x65665365),
+      ACE_NTOHL (0x713a312e),
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueDefSeq:1.0
+            12,
+      ACE_NTOHL (0x56616c75),
+      ACE_NTOHL (0x65446566),
+      ACE_NTOHL (0x53657100),  // name = ValueDefSeq
+            CORBA::tk_sequence, // typecode kind
+      72, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        CORBA::tk_objref, // typecode kind
+        56, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          31,
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5661),
+          ACE_NTOHL (0x6c756544),
+          ACE_NTOHL (0x65663a31),
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
+                    9,
+          ACE_NTOHL (0x56616c75),
+          ACE_NTOHL (0x65446566),
+          ACE_NTOHL (0x0),  // name = ValueDef
+
+        0U,
 
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExtInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_ExtInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ExtInterfaceDef_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
+};
 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
+    static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDefSeq (
+        CORBA::tk_alias,
+        sizeof (_oc_CORBA_ValueDefSeq),
+        (char *) &_oc_CORBA_ValueDefSeq,
+        0,
+        sizeof (CORBA::ValueDefSeq)
+      );
 
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::ExtInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
+    TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+    TAO_NAMESPACE_BEGIN (CORBA)
+    TAO_NAMESPACE_DEFINE (
+        ::CORBA::TypeCode_ptr,
+        _tc_ValueDefSeq,
+        &_tc_TAO_tc_CORBA_ValueDefSeq
+      )
+    TAO_NAMESPACE_END
+
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+    CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (void)
+    {}
+
+    CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (CORBA::ULong max)
+      : TAO_Unbounded_Object_Sequence<
+            CORBA::AbstractInterfaceDef,
+            CORBA::AbstractInterfaceDef,
+            CORBA::tao_AbstractInterfaceDef_life,
+            CORBA::tao_AbstractInterfaceDef_cast
+          >
+        (max)
+    {}
+
+    CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::AbstractInterfaceDef_ptr* buffer,
+        CORBA::Boolean release
+      )
+      : TAO_Unbounded_Object_Sequence<
+            CORBA::AbstractInterfaceDef,
+            CORBA::AbstractInterfaceDef,
+            CORBA::tao_AbstractInterfaceDef_life,
+            CORBA::tao_AbstractInterfaceDef_cast
+          >
+        (max, length, buffer, release)
+    {}
+
+    CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &seq)
+      : TAO_Unbounded_Object_Sequence<
+            CORBA::AbstractInterfaceDef,
+            CORBA::AbstractInterfaceDef,
+            CORBA::tao_AbstractInterfaceDef_life,
+            CORBA::tao_AbstractInterfaceDef_cast
+          >
+        (seq)
+    {}
+
+    CORBA::AbstractInterfaceDefSeq::~AbstractInterfaceDefSeq (void)
+    {}
+
+    void CORBA::AbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
     {
-      tao_CORBA_ExtInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ExtInterfaceDef_nil ();
+      AbstractInterfaceDefSeq *tmp = ACE_static_cast (AbstractInterfaceDefSeq*, _tao_void_pointer);
+      delete tmp;
     }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::ExtInterfaceDef **tmp = ACE_static_cast (CORBA::ExtInterfaceDef**, target);
-  *tmp = tao_CORBA_ExtInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_upcast (void *src) const
-{
-  return tao_CORBA_ExtInterfaceDef_upcast (src);
-}
-
-#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class
+      TAO_MngSeq_Var_T<
+          CORBA::AbstractInterfaceDefSeq,
+          TAO_Object_Manager<
+              CORBA::AbstractInterfaceDef,
+              CORBA::AbstractInterfaceDef_var,
+              CORBA::tao_AbstractInterfaceDef_life
+            >
+        >;
+
+    template class
+      TAO_Seq_Out_T<
+          CORBA::AbstractInterfaceDefSeq,
+          CORBA::AbstractInterfaceDefSeq_var,
+          TAO_Object_Manager<
+              CORBA::AbstractInterfaceDef,
+              CORBA::AbstractInterfaceDef_var,
+              CORBA::tao_AbstractInterfaceDef_life
+            >
+        >;
 
-#if !defined (_CORBA_EXTINTERFACEDEFSEQ_CS_)
-#define _CORBA_EXTINTERFACEDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ExtInterfaceDefSeq
-// *************************************************************
-
-CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (void)
-{}
-
-CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtInterfaceDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (const ExtInterfaceDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::ExtInterfaceDefSeq::~ExtInterfaceDefSeq (void) // dtor
-{}
-
-void CORBA::ExtInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtInterfaceDefSeq *tmp = ACE_static_cast (ExtInterfaceDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+    # pragma instantiate \
+        TAO_MngSeq_Var_T< \
+            CORBA::AbstractInterfaceDefSeq, \
+            TAO_Object_Manager< \
+                CORBA::AbstractInterfaceDef, \
+                CORBA::AbstractInterfaceDef_var, \
+                CORBA::tao_AbstractInterfaceDef_life \
+              > \
+          >
+
+    # pragma instantiate \
+        TAO_Seq_Out_T< \
+            CORBA::AbstractInterfaceDefSeq, \
+            CORBA::AbstractInterfaceDefSeq_var, \
+            TAO_Object_Manager< \
+                CORBA::AbstractInterfaceDef, \
+                CORBA::AbstractInterfaceDef_var, \
+                CORBA::tao_AbstractInterfaceDef_life \
+              > \
+          >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+      static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
+      {
+                TAO_ENCAP_BYTE_ORDER, // byte order
+        46,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4162),
+        ACE_NTOHL (0x73747261),
+        ACE_NTOHL (0x6374496e),
+        ACE_NTOHL (0x74657266),
+        ACE_NTOHL (0x61636544),
+        ACE_NTOHL (0x65665365),
+        ACE_NTOHL (0x713a312e),
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0
+                24,
+        ACE_NTOHL (0x41627374),
+        ACE_NTOHL (0x72616374),
+        ACE_NTOHL (0x496e7465),
+        ACE_NTOHL (0x72666163),
+        ACE_NTOHL (0x65446566),
+        ACE_NTOHL (0x53657100),  // name = AbstractInterfaceDefSeq
+                CORBA::tk_sequence, // typecode kind
+        96, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          CORBA::tk_objref, // typecode kind
+          80, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            43,
+            ACE_NTOHL (0x49444c3a),
+            ACE_NTOHL (0x6f6d672e),
+            ACE_NTOHL (0x6f72672f),
+            ACE_NTOHL (0x434f5242),
+            ACE_NTOHL (0x412f4162),
+            ACE_NTOHL (0x73747261),
+            ACE_NTOHL (0x6374496e),
+            ACE_NTOHL (0x74657266),
+            ACE_NTOHL (0x61636544),
+            ACE_NTOHL (0x65663a31),
+            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
+                        21,
+            ACE_NTOHL (0x41627374),
+            ACE_NTOHL (0x72616374),
+            ACE_NTOHL (0x496e7465),
+            ACE_NTOHL (0x72666163),
+            ACE_NTOHL (0x65446566),
+            ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
 
-static const CORBA::Long _oc_CORBA_ExtInterfaceDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63654465), 
-  ACE_NTOHL (0x66536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0
-    19,
-  ACE_NTOHL (0x45787449), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65710000),  // name = ExtInterfaceDefSeq
-    CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      38,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x74496e74), 
-      ACE_NTOHL (0x65726661), 
-      ACE_NTOHL (0x63654465), 
-      ACE_NTOHL (0x663a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDef:1.0
-            16,
-      ACE_NTOHL (0x45787449), 
-      ACE_NTOHL (0x6e746572), 
-      ACE_NTOHL (0x66616365), 
-      ACE_NTOHL (0x44656600),  // name = ExtInterfaceDef
-      
-    0U,
+          0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExtInterfaceDefSeq),
-    (char *) &_oc_CORBA_ExtInterfaceDefSeq,
-    0,
-    sizeof (CORBA::ExtInterfaceDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExtInterfaceDefSeq,
-    &_tc_TAO_tc_CORBA_ExtInterfaceDefSeq
-  )
-TAO_NAMESPACE_END
+      static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDefSeq (
+          CORBA::tk_alias,
+          sizeof (_oc_CORBA_AbstractInterfaceDefSeq),
+          (char *) &_oc_CORBA_AbstractInterfaceDefSeq,
+          0,
+          sizeof (CORBA::AbstractInterfaceDefSeq)
+        );
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
+      TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+      TAO_NAMESPACE_BEGIN (CORBA)
+      TAO_NAMESPACE_DEFINE (
+          ::CORBA::TypeCode_ptr,
+          _tc_AbstractInterfaceDefSeq,
+          &_tc_TAO_tc_CORBA_AbstractInterfaceDefSeq
+        )
+      TAO_NAMESPACE_END
+
+      // TAO_IDL - Generated from
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+      CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (void)
+      {}
+
+      CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (CORBA::ULong max)
+        : TAO_Unbounded_Object_Sequence<
+              CORBA::LocalInterfaceDef,
+              CORBA::LocalInterfaceDef,
+              CORBA::tao_LocalInterfaceDef_life,
+              CORBA::tao_LocalInterfaceDef_cast
+            >
+          (max)
+      {}
+
+      CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA::LocalInterfaceDef_ptr* buffer,
+          CORBA::Boolean release
+        )
+        : TAO_Unbounded_Object_Sequence<
+              CORBA::LocalInterfaceDef,
+              CORBA::LocalInterfaceDef,
+              CORBA::tao_LocalInterfaceDef_life,
+              CORBA::tao_LocalInterfaceDef_cast
+            >
+          (max, length, buffer, release)
+      {}
+
+      CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (const LocalInterfaceDefSeq &seq)
+        : TAO_Unbounded_Object_Sequence<
+              CORBA::LocalInterfaceDef,
+              CORBA::LocalInterfaceDef,
+              CORBA::tao_LocalInterfaceDef_life,
+              CORBA::tao_LocalInterfaceDef_cast
+            >
+          (seq)
+      {}
+
+      CORBA::LocalInterfaceDefSeq::~LocalInterfaceDefSeq (void)
+      {}
+
+      void CORBA::LocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+      {
+        LocalInterfaceDefSeq *tmp = ACE_static_cast (LocalInterfaceDefSeq*, _tao_void_pointer);
+        delete tmp;
+      }
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+      template class
+        TAO_MngSeq_Var_T<
+            CORBA::LocalInterfaceDefSeq,
+            TAO_Object_Manager<
+                CORBA::LocalInterfaceDef,
+                CORBA::LocalInterfaceDef_var,
+                CORBA::tao_LocalInterfaceDef_life
+              >
+          >;
+
+      template class
+        TAO_Seq_Out_T<
+            CORBA::LocalInterfaceDefSeq,
+            CORBA::LocalInterfaceDefSeq_var,
+            TAO_Object_Manager<
+                CORBA::LocalInterfaceDef,
+                CORBA::LocalInterfaceDef_var,
+                CORBA::tao_LocalInterfaceDef_life
+              >
+          >;
 
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CS_
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExtValueDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ExtValueDef **old = ACE_reinterpret_cast (CORBA::ExtValueDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
+      # pragma instantiate \
+          TAO_MngSeq_Var_T< \
+              CORBA::LocalInterfaceDefSeq, \
+              TAO_Object_Manager< \
+                  CORBA::LocalInterfaceDef, \
+                  CORBA::LocalInterfaceDef_var, \
+                  CORBA::tao_LocalInterfaceDef_life \
+                > \
+            >
+
+      # pragma instantiate \
+          TAO_Seq_Out_T< \
+              CORBA::LocalInterfaceDefSeq, \
+              CORBA::LocalInterfaceDefSeq_var, \
+              TAO_Object_Manager< \
+                  CORBA::LocalInterfaceDef, \
+                  CORBA::LocalInterfaceDef_var, \
+                  CORBA::tao_LocalInterfaceDef_life \
+                > \
+            >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+        // TAO_IDL - Generated from
+        // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+        static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
         {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_ExtValueDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExtValueDef **tmp = ACE_reinterpret_cast (CORBA::ExtValueDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_ExtValueDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ExtValueDef_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::ExtValueDef **tmp = ACE_reinterpret_cast (CORBA::ExtValueDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      tao_CORBA_ExtValueDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ExtValueDef_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::ExtValueDef **tmp = ACE_static_cast (CORBA::ExtValueDef**, target);
-  *tmp = tao_CORBA_ExtValueDef_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_upcast (void *src) const
-{
-  return tao_CORBA_ExtValueDef_upcast (src);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTVALUEDEFSEQ_CS_)
-#define _CORBA_EXTVALUEDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ExtValueDefSeq
-// *************************************************************
-
-CORBA::ExtValueDefSeq::ExtValueDefSeq (void)
-{}
-
-CORBA::ExtValueDefSeq::ExtValueDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtValueDef,CORBA::ExtValueDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ExtValueDefSeq::ExtValueDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtValueDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtValueDef,CORBA::ExtValueDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::ExtValueDefSeq::ExtValueDefSeq (const ExtValueDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtValueDef,CORBA::ExtValueDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::ExtValueDefSeq::~ExtValueDefSeq (void) // dtor
-{}
-
-void CORBA::ExtValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtValueDefSeq *tmp = ACE_static_cast (ExtValueDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ExtValueDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x7456616c), 
-  ACE_NTOHL (0x75654465), 
-  ACE_NTOHL (0x66536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtValueDefSeq:1.0
-    15,
-  ACE_NTOHL (0x45787456), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65710000),  // name = ExtValueDefSeq
-    CORBA::tk_sequence, // typecode kind
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x7456616c), 
-      ACE_NTOHL (0x75654465), 
-      ACE_NTOHL (0x663a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef:1.0
-            12,
-      ACE_NTOHL (0x45787456), 
-      ACE_NTOHL (0x616c7565), 
-      ACE_NTOHL (0x44656600),  // name = ExtValueDef
-      
-    0U,
+                    TAO_ENCAP_BYTE_ORDER, // byte order
+          43,
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4c6f),
+          ACE_NTOHL (0x63616c49),
+          ACE_NTOHL (0x6e746572),
+          ACE_NTOHL (0x66616365),
+          ACE_NTOHL (0x44656653),
+          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0
+                    21,
+          ACE_NTOHL (0x4c6f6361),
+          ACE_NTOHL (0x6c496e74),
+          ACE_NTOHL (0x65726661),
+          ACE_NTOHL (0x63654465),
+          ACE_NTOHL (0x66536571),
+          ACE_NTOHL (0x0),  // name = LocalInterfaceDefSeq
+                    CORBA::tk_sequence, // typecode kind
+          88, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_objref, // typecode kind
+            72, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              40,
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4c6f),
+              ACE_NTOHL (0x63616c49),
+              ACE_NTOHL (0x6e746572),
+              ACE_NTOHL (0x66616365),
+              ACE_NTOHL (0x4465663a),
+              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
+                            18,
+              ACE_NTOHL (0x4c6f6361),
+              ACE_NTOHL (0x6c496e74),
+              ACE_NTOHL (0x65726661),
+              ACE_NTOHL (0x63654465),
+              ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
+
+            0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExtValueDefSeq),
-    (char *) &_oc_CORBA_ExtValueDefSeq,
-    0,
-    sizeof (CORBA::ExtValueDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExtValueDefSeq,
-    &_tc_TAO_tc_CORBA_ExtValueDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_
+        static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDefSeq (
+            CORBA::tk_alias,
+            sizeof (_oc_CORBA_LocalInterfaceDefSeq),
+            (char *) &_oc_CORBA_LocalInterfaceDefSeq,
+            0,
+            sizeof (CORBA::LocalInterfaceDefSeq)
+          );
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExtAbstractInterfaceDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ExtAbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_ExtAbstractInterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
+        TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+        TAO_NAMESPACE_BEGIN (CORBA)
+        TAO_NAMESPACE_DEFINE (
+            ::CORBA::TypeCode_ptr,
+            _tc_LocalInterfaceDefSeq,
+            &_tc_TAO_tc_CORBA_LocalInterfaceDefSeq
+          )
+        TAO_NAMESPACE_END
+
+        // TAO_IDL - Generated from
+        // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+        CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (void)
+        {}
+
+        CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (CORBA::ULong max)
+          : TAO_Unbounded_Object_Sequence<
+                CORBA::ExtInterfaceDef,
+                CORBA::ExtInterfaceDef,
+                CORBA::tao_ExtInterfaceDef_life,
+                CORBA::tao_ExtInterfaceDef_cast
+              >
+            (max)
+        {}
+
+        CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
+            CORBA::ULong max,
+            CORBA::ULong length,
+            CORBA::ExtInterfaceDef_ptr* buffer,
+            CORBA::Boolean release
+          )
+          : TAO_Unbounded_Object_Sequence<
+                CORBA::ExtInterfaceDef,
+                CORBA::ExtInterfaceDef,
+                CORBA::tao_ExtInterfaceDef_life,
+                CORBA::tao_ExtInterfaceDef_cast
+              >
+            (max, length, buffer, release)
+        {}
+
+        CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (const ExtInterfaceDefSeq &seq)
+          : TAO_Unbounded_Object_Sequence<
+                CORBA::ExtInterfaceDef,
+                CORBA::ExtInterfaceDef,
+                CORBA::tao_ExtInterfaceDef_life,
+                CORBA::tao_ExtInterfaceDef_cast
+              >
+            (seq)
+        {}
+
+        CORBA::ExtInterfaceDefSeq::~ExtInterfaceDefSeq (void)
+        {}
+
+        void CORBA::ExtInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
         {
-          delete [] old;
+          ExtInterfaceDefSeq *tmp = ACE_static_cast (ExtInterfaceDefSeq*, _tao_void_pointer);
+          delete tmp;
         }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExtAbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_ExtAbstractInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ExtAbstractInterfaceDef_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::ExtAbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      tao_CORBA_ExtAbstractInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ExtAbstractInterfaceDef_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::ExtAbstractInterfaceDef **tmp = ACE_static_cast (CORBA::ExtAbstractInterfaceDef**, target);
-  *tmp = tao_CORBA_ExtAbstractInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_upcast (void *src) const
-{
-  return tao_CORBA_ExtAbstractInterfaceDef_upcast (src);
-}
-
-#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+        template class
+          TAO_MngSeq_Var_T<
+              CORBA::ExtInterfaceDefSeq,
+              TAO_Object_Manager<
+                  CORBA::ExtInterfaceDef,
+                  CORBA::ExtInterfaceDef_var,
+                  CORBA::tao_ExtInterfaceDef_life
+                >
+            >;
+
+        template class
+          TAO_Seq_Out_T<
+              CORBA::ExtInterfaceDefSeq,
+              CORBA::ExtInterfaceDefSeq_var,
+              TAO_Object_Manager<
+                  CORBA::ExtInterfaceDef,
+                  CORBA::ExtInterfaceDef_var,
+                  CORBA::tao_ExtInterfaceDef_life
+                >
+            >;
 
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_)
-#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ExtAbstractInterfaceDefSeq
-// *************************************************************
-
-CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (void)
-{}
-
-CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtAbstractInterfaceDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::ExtAbstractInterfaceDefSeq::~ExtAbstractInterfaceDefSeq (void) // dtor
-{}
-
-void CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtAbstractInterfaceDefSeq *tmp = ACE_static_cast (ExtAbstractInterfaceDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_CORBA_ExtAbstractInterfaceDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74416273), 
-  ACE_NTOHL (0x74726163), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63654465), 
-  ACE_NTOHL (0x66536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0
-    27,
-  ACE_NTOHL (0x45787441), 
-  ACE_NTOHL (0x62737472), 
-  ACE_NTOHL (0x61637449), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x44656653), 
-  ACE_NTOHL (0x65710000),  // name = ExtAbstractInterfaceDefSeq
-    CORBA::tk_sequence, // typecode kind
-  100, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      46,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x74416273), 
-      ACE_NTOHL (0x74726163), 
-      ACE_NTOHL (0x74496e74), 
-      ACE_NTOHL (0x65726661), 
-      ACE_NTOHL (0x63654465), 
-      ACE_NTOHL (0x663a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0
-            24,
-      ACE_NTOHL (0x45787441), 
-      ACE_NTOHL (0x62737472), 
-      ACE_NTOHL (0x61637449), 
-      ACE_NTOHL (0x6e746572), 
-      ACE_NTOHL (0x66616365), 
-      ACE_NTOHL (0x44656600),  // name = ExtAbstractInterfaceDef
-      
-    0U,
+        # pragma instantiate \
+            TAO_MngSeq_Var_T< \
+                CORBA::ExtInterfaceDefSeq, \
+                TAO_Object_Manager< \
+                    CORBA::ExtInterfaceDef, \
+                    CORBA::ExtInterfaceDef_var, \
+                    CORBA::tao_ExtInterfaceDef_life \
+                  > \
+              >
+
+        # pragma instantiate \
+            TAO_Seq_Out_T< \
+                CORBA::ExtInterfaceDefSeq, \
+                CORBA::ExtInterfaceDefSeq_var, \
+                TAO_Object_Manager< \
+                    CORBA::ExtInterfaceDef, \
+                    CORBA::ExtInterfaceDef_var, \
+                    CORBA::tao_ExtInterfaceDef_life \
+                  > \
+              >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+          // TAO_IDL - Generated from
+          // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+          static const CORBA::Long _oc_CORBA_ExtInterfaceDefSeq[] =
+          {
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+            41,
+            ACE_NTOHL (0x49444c3a),
+            ACE_NTOHL (0x6f6d672e),
+            ACE_NTOHL (0x6f72672f),
+            ACE_NTOHL (0x434f5242),
+            ACE_NTOHL (0x412f4578),
+            ACE_NTOHL (0x74496e74),
+            ACE_NTOHL (0x65726661),
+            ACE_NTOHL (0x63654465),
+            ACE_NTOHL (0x66536571),
+            ACE_NTOHL (0x3a312e30),
+            ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0
+                        19,
+            ACE_NTOHL (0x45787449),
+            ACE_NTOHL (0x6e746572),
+            ACE_NTOHL (0x66616365),
+            ACE_NTOHL (0x44656653),
+            ACE_NTOHL (0x65710000),  // name = ExtInterfaceDefSeq
+                        CORBA::tk_sequence, // typecode kind
+            84, // encapsulation length
+              TAO_ENCAP_BYTE_ORDER, // byte order
+              CORBA::tk_objref, // typecode kind
+              68, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                38,
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4578),
+                ACE_NTOHL (0x74496e74),
+                ACE_NTOHL (0x65726661),
+                ACE_NTOHL (0x63654465),
+                ACE_NTOHL (0x663a312e),
+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDef:1.0
+                                16,
+                ACE_NTOHL (0x45787449),
+                ACE_NTOHL (0x6e746572),
+                ACE_NTOHL (0x66616365),
+                ACE_NTOHL (0x44656600),  // name = ExtInterfaceDef
+
+              0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExtAbstractInterfaceDefSeq),
-    (char *) &_oc_CORBA_ExtAbstractInterfaceDefSeq,
-    0,
-    sizeof (CORBA::ExtAbstractInterfaceDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExtAbstractInterfaceDefSeq,
-    &_tc_TAO_tc_CORBA_ExtAbstractInterfaceDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
+          static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInterfaceDefSeq (
+              CORBA::tk_alias,
+              sizeof (_oc_CORBA_ExtInterfaceDefSeq),
+              (char *) &_oc_CORBA_ExtInterfaceDefSeq,
+              0,
+              sizeof (CORBA::ExtInterfaceDefSeq)
+            );
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+          TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+          TAO_NAMESPACE_BEGIN (CORBA)
+          TAO_NAMESPACE_DEFINE (
+              ::CORBA::TypeCode_ptr,
+              _tc_ExtInterfaceDefSeq,
+              &_tc_TAO_tc_CORBA_ExtInterfaceDefSeq
+            )
+          TAO_NAMESPACE_END
+
+          // TAO_IDL - Generated from
+          // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+          CORBA::ExtValueDefSeq::ExtValueDefSeq (void)
+          {}
+
+          CORBA::ExtValueDefSeq::ExtValueDefSeq (CORBA::ULong max)
+            : TAO_Unbounded_Object_Sequence<
+                  CORBA::ExtValueDef,
+                  CORBA::ExtValueDef,
+                  CORBA::tao_ExtValueDef_life,
+                  CORBA::tao_ExtValueDef_cast
+                >
+              (max)
+          {}
+
+          CORBA::ExtValueDefSeq::ExtValueDefSeq (
+              CORBA::ULong max,
+              CORBA::ULong length,
+              CORBA::ExtValueDef_ptr* buffer,
+              CORBA::Boolean release
+            )
+            : TAO_Unbounded_Object_Sequence<
+                  CORBA::ExtValueDef,
+                  CORBA::ExtValueDef,
+                  CORBA::tao_ExtValueDef_life,
+                  CORBA::tao_ExtValueDef_cast
+                >
+              (max, length, buffer, release)
+          {}
+
+          CORBA::ExtValueDefSeq::ExtValueDefSeq (const ExtValueDefSeq &seq)
+            : TAO_Unbounded_Object_Sequence<
+                  CORBA::ExtValueDef,
+                  CORBA::ExtValueDef,
+                  CORBA::tao_ExtValueDef_life,
+                  CORBA::tao_ExtValueDef_cast
+                >
+              (seq)
+          {}
+
+          CORBA::ExtValueDefSeq::~ExtValueDefSeq (void)
+          {}
+
+          void CORBA::ExtValueDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+          {
+            ExtValueDefSeq *tmp = ACE_static_cast (ExtValueDefSeq*, _tao_void_pointer);
+            delete tmp;
+          }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+          template class
+            TAO_MngSeq_Var_T<
+                CORBA::ExtValueDefSeq,
+                TAO_Object_Manager<
+                    CORBA::ExtValueDef,
+                    CORBA::ExtValueDef_var,
+                    CORBA::tao_ExtValueDef_life
+                  >
+              >;
+
+          template class
+            TAO_Seq_Out_T<
+                CORBA::ExtValueDefSeq,
+                CORBA::ExtValueDefSeq_var,
+                TAO_Object_Manager<
+                    CORBA::ExtValueDef,
+                    CORBA::ExtValueDef_var,
+                    CORBA::tao_ExtValueDef_life
+                  >
+              >;
 
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExtLocalInterfaceDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ExtLocalInterfaceDef **old = ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
+          # pragma instantiate \
+              TAO_MngSeq_Var_T< \
+                  CORBA::ExtValueDefSeq, \
+                  TAO_Object_Manager< \
+                      CORBA::ExtValueDef, \
+                      CORBA::ExtValueDef_var, \
+                      CORBA::tao_ExtValueDef_life \
+                    > \
+                >
+
+          # pragma instantiate \
+              TAO_Seq_Out_T< \
+                  CORBA::ExtValueDefSeq, \
+                  CORBA::ExtValueDefSeq_var, \
+                  TAO_Object_Manager< \
+                      CORBA::ExtValueDef, \
+                      CORBA::ExtValueDef_var, \
+                      CORBA::tao_ExtValueDef_life \
+                    > \
+                >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+            // TAO_IDL - Generated from
+            // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+            static const CORBA::Long _oc_CORBA_ExtValueDefSeq[] =
             {
-              tmp[i] = tao_CORBA_ExtLocalInterfaceDef_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExtLocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_ExtLocalInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ExtLocalInterfaceDef_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::ExtLocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      tao_CORBA_ExtLocalInterfaceDef_release (tmp[i]);
-      tmp[i] = tao_CORBA_ExtLocalInterfaceDef_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::ExtLocalInterfaceDef **tmp = ACE_static_cast (CORBA::ExtLocalInterfaceDef**, target);
-  *tmp = tao_CORBA_ExtLocalInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_upcast (void *src) const
-{
-  return tao_CORBA_ExtLocalInterfaceDef_upcast (src);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_)
-#define _CORBA_EXTLOCALINTERFACEDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ExtLocalInterfaceDefSeq
-// *************************************************************
-
-CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (void)
-{}
-
-CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtLocalInterfaceDef_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::ExtLocalInterfaceDefSeq::~ExtLocalInterfaceDefSeq (void) // dtor
-{}
-
-void CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtLocalInterfaceDefSeq *tmp = ACE_static_cast (ExtLocalInterfaceDefSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ExtLocalInterfaceDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x744c6f63), 
-  ACE_NTOHL (0x616c496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0
-    24,
-  ACE_NTOHL (0x4578744c), 
-  ACE_NTOHL (0x6f63616c), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446566), 
-  ACE_NTOHL (0x53657100),  // name = ExtLocalInterfaceDefSeq
-    CORBA::tk_sequence, // typecode kind
-  96, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    80, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x744c6f63), 
-      ACE_NTOHL (0x616c496e), 
-      ACE_NTOHL (0x74657266), 
-      ACE_NTOHL (0x61636544), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0
-            21,
-      ACE_NTOHL (0x4578744c), 
-      ACE_NTOHL (0x6f63616c), 
-      ACE_NTOHL (0x496e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x65446566), 
-      ACE_NTOHL (0x0),  // name = ExtLocalInterfaceDef
-      
-    0U,
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+              37,
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x7456616c),
+              ACE_NTOHL (0x75654465),
+              ACE_NTOHL (0x66536571),
+              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtValueDefSeq:1.0
+                            15,
+              ACE_NTOHL (0x45787456),
+              ACE_NTOHL (0x616c7565),
+              ACE_NTOHL (0x44656653),
+              ACE_NTOHL (0x65710000),  // name = ExtValueDefSeq
+                            CORBA::tk_sequence, // typecode kind
+              76, // encapsulation length
+                TAO_ENCAP_BYTE_ORDER, // byte order
+                CORBA::tk_objref, // typecode kind
+                60, // encapsulation length
+                  TAO_ENCAP_BYTE_ORDER, // byte order
+                  34,
+                  ACE_NTOHL (0x49444c3a),
+                  ACE_NTOHL (0x6f6d672e),
+                  ACE_NTOHL (0x6f72672f),
+                  ACE_NTOHL (0x434f5242),
+                  ACE_NTOHL (0x412f4578),
+                  ACE_NTOHL (0x7456616c),
+                  ACE_NTOHL (0x75654465),
+                  ACE_NTOHL (0x663a312e),
+                  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef:1.0
+                                    12,
+                  ACE_NTOHL (0x45787456),
+                  ACE_NTOHL (0x616c7565),
+                  ACE_NTOHL (0x44656600),  // name = ExtValueDef
+
+                0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtLocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExtLocalInterfaceDefSeq),
-    (char *) &_oc_CORBA_ExtLocalInterfaceDefSeq,
-    0,
-    sizeof (CORBA::ExtLocalInterfaceDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExtLocalInterfaceDefSeq,
-    &_tc_TAO_tc_CORBA_ExtLocalInterfaceDefSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Contained **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::Contained **old = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA::Contained::_duplicate (old[i]);
-            }
-          else
+            static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDefSeq (
+                CORBA::tk_alias,
+                sizeof (_oc_CORBA_ExtValueDefSeq),
+                (char *) &_oc_CORBA_ExtValueDefSeq,
+                0,
+                sizeof (CORBA::ExtValueDefSeq)
+              );
+
+            TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+            TAO_NAMESPACE_BEGIN (CORBA)
+            TAO_NAMESPACE_DEFINE (
+                ::CORBA::TypeCode_ptr,
+                _tc_ExtValueDefSeq,
+                &_tc_TAO_tc_CORBA_ExtValueDefSeq
+              )
+            TAO_NAMESPACE_END
+
+            // TAO_IDL - Generated from
+            // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+            CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (void)
+            {}
+
+            CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (CORBA::ULong max)
+              : TAO_Unbounded_Object_Sequence<
+                    CORBA::ExtAbstractInterfaceDef,
+                    CORBA::ExtAbstractInterfaceDef,
+                    CORBA::tao_ExtAbstractInterfaceDef_life,
+                    CORBA::tao_ExtAbstractInterfaceDef_cast
+                  >
+                (max)
+            {}
+
+            CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
+                CORBA::ULong max,
+                CORBA::ULong length,
+                CORBA::ExtAbstractInterfaceDef_ptr* buffer,
+                CORBA::Boolean release
+              )
+              : TAO_Unbounded_Object_Sequence<
+                    CORBA::ExtAbstractInterfaceDef,
+                    CORBA::ExtAbstractInterfaceDef,
+                    CORBA::tao_ExtAbstractInterfaceDef_life,
+                    CORBA::tao_ExtAbstractInterfaceDef_cast
+                  >
+                (max, length, buffer, release)
+            {}
+
+            CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &seq)
+              : TAO_Unbounded_Object_Sequence<
+                    CORBA::ExtAbstractInterfaceDef,
+                    CORBA::ExtAbstractInterfaceDef,
+                    CORBA::tao_ExtAbstractInterfaceDef_life,
+                    CORBA::tao_ExtAbstractInterfaceDef_cast
+                  >
+                (seq)
+            {}
+
+            CORBA::ExtAbstractInterfaceDefSeq::~ExtAbstractInterfaceDefSeq (void)
+            {}
+
+            void CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
             {
-              tmp[i] = old[i];
+              ExtAbstractInterfaceDefSeq *tmp = ACE_static_cast (ExtAbstractInterfaceDefSeq*, _tao_void_pointer);
+              delete tmp;
             }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Contained::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::Contained **tmp = ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Contained::_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, target);
-  *tmp = CORBA::Contained::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
 
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
-{
-  CORBA::Contained **tmp = ACE_static_cast (CORBA::Contained**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+            template class
+              TAO_MngSeq_Var_T<
+                  CORBA::ExtAbstractInterfaceDefSeq,
+                  TAO_Object_Manager<
+                      CORBA::ExtAbstractInterfaceDef,
+                      CORBA::ExtAbstractInterfaceDef_var,
+                      CORBA::tao_ExtAbstractInterfaceDef_life
+                    >
+                >;
+
+            template class
+              TAO_Seq_Out_T<
+                  CORBA::ExtAbstractInterfaceDefSeq,
+                  CORBA::ExtAbstractInterfaceDefSeq_var,
+                  TAO_Object_Manager<
+                      CORBA::ExtAbstractInterfaceDef,
+                      CORBA::ExtAbstractInterfaceDef_var,
+                      CORBA::tao_ExtAbstractInterfaceDef_life
+                    >
+                >;
 
-#if !defined (_CORBA_CONTAINEDSEQ_CS_)
-#define _CORBA_CONTAINEDSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ContainedSeq
-// *************************************************************
-
-CORBA::ContainedSeq::ContainedSeq (void)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Contained_ptr *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::ContainedSeq::ContainedSeq (const ContainedSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::ContainedSeq::~ContainedSeq (void) // dtor
-{}
-
-void CORBA::ContainedSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ContainedSeq *tmp = ACE_static_cast (ContainedSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_CORBA_ContainedSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e656453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContainedSeq:1.0
-    13,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x61696e65), 
-  ACE_NTOHL (0x64536571), 
-  ACE_NTOHL (0x0),  // name = ContainedSeq
-    CORBA::tk_sequence, // typecode kind
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f436f), 
-      ACE_NTOHL (0x6e746169), 
-      ACE_NTOHL (0x6e65643a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
-            10,
-      ACE_NTOHL (0x436f6e74), 
-      ACE_NTOHL (0x61696e65), 
-      ACE_NTOHL (0x64000000),  // name = Contained
-      
-    0U,
+            # pragma instantiate \
+                TAO_MngSeq_Var_T< \
+                    CORBA::ExtAbstractInterfaceDefSeq, \
+                    TAO_Object_Manager< \
+                        CORBA::ExtAbstractInterfaceDef, \
+                        CORBA::ExtAbstractInterfaceDef_var, \
+                        CORBA::tao_ExtAbstractInterfaceDef_life \
+                      > \
+                  >
+
+            # pragma instantiate \
+                TAO_Seq_Out_T< \
+                    CORBA::ExtAbstractInterfaceDefSeq, \
+                    CORBA::ExtAbstractInterfaceDefSeq_var, \
+                    TAO_Object_Manager< \
+                        CORBA::ExtAbstractInterfaceDef, \
+                        CORBA::ExtAbstractInterfaceDef_var, \
+                        CORBA::tao_ExtAbstractInterfaceDef_life \
+                      > \
+                  >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+              // TAO_IDL - Generated from
+              // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+              static const CORBA::Long _oc_CORBA_ExtAbstractInterfaceDefSeq[] =
+              {
+                                TAO_ENCAP_BYTE_ORDER, // byte order
+                49,
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4578),
+                ACE_NTOHL (0x74416273),
+                ACE_NTOHL (0x74726163),
+                ACE_NTOHL (0x74496e74),
+                ACE_NTOHL (0x65726661),
+                ACE_NTOHL (0x63654465),
+                ACE_NTOHL (0x66536571),
+                ACE_NTOHL (0x3a312e30),
+                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0
+                                27,
+                ACE_NTOHL (0x45787441),
+                ACE_NTOHL (0x62737472),
+                ACE_NTOHL (0x61637449),
+                ACE_NTOHL (0x6e746572),
+                ACE_NTOHL (0x66616365),
+                ACE_NTOHL (0x44656653),
+                ACE_NTOHL (0x65710000),  // name = ExtAbstractInterfaceDefSeq
+                                CORBA::tk_sequence, // typecode kind
+                100, // encapsulation length
+                  TAO_ENCAP_BYTE_ORDER, // byte order
+                  CORBA::tk_objref, // typecode kind
+                  84, // encapsulation length
+                    TAO_ENCAP_BYTE_ORDER, // byte order
+                    46,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f4578),
+                    ACE_NTOHL (0x74416273),
+                    ACE_NTOHL (0x74726163),
+                    ACE_NTOHL (0x74496e74),
+                    ACE_NTOHL (0x65726661),
+                    ACE_NTOHL (0x63654465),
+                    ACE_NTOHL (0x663a312e),
+                    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0
+                                        24,
+                    ACE_NTOHL (0x45787441),
+                    ACE_NTOHL (0x62737472),
+                    ACE_NTOHL (0x61637449),
+                    ACE_NTOHL (0x6e746572),
+                    ACE_NTOHL (0x66616365),
+                    ACE_NTOHL (0x44656600),  // name = ExtAbstractInterfaceDef
+
+                  0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContainedSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ContainedSeq),
-    (char *) &_oc_CORBA_ContainedSeq,
-    0,
-    sizeof (CORBA::ContainedSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ContainedSeq,
-    &_tc_TAO_tc_CORBA_ContainedSeq
-  )
-TAO_NAMESPACE_END
+              static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtAbstractInterfaceDefSeq (
+                  CORBA::tk_alias,
+                  sizeof (_oc_CORBA_ExtAbstractInterfaceDefSeq),
+                  (char *) &_oc_CORBA_ExtAbstractInterfaceDefSeq,
+                  0,
+                  sizeof (CORBA::ExtAbstractInterfaceDefSeq)
+                );
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+              TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+              TAO_NAMESPACE_BEGIN (CORBA)
+              TAO_NAMESPACE_DEFINE (
+                  ::CORBA::TypeCode_ptr,
+                  _tc_ExtAbstractInterfaceDefSeq,
+                  &_tc_TAO_tc_CORBA_ExtAbstractInterfaceDefSeq
+                )
+              TAO_NAMESPACE_END
+
+              // TAO_IDL - Generated from
+              // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+              CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (void)
+              {}
+
+              CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (CORBA::ULong max)
+                : TAO_Unbounded_Object_Sequence<
+                      CORBA::ExtLocalInterfaceDef,
+                      CORBA::ExtLocalInterfaceDef,
+                      CORBA::tao_ExtLocalInterfaceDef_life,
+                      CORBA::tao_ExtLocalInterfaceDef_cast
+                    >
+                  (max)
+              {}
+
+              CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
+                  CORBA::ULong max,
+                  CORBA::ULong length,
+                  CORBA::ExtLocalInterfaceDef_ptr* buffer,
+                  CORBA::Boolean release
+                )
+                : TAO_Unbounded_Object_Sequence<
+                      CORBA::ExtLocalInterfaceDef,
+                      CORBA::ExtLocalInterfaceDef,
+                      CORBA::tao_ExtLocalInterfaceDef_life,
+                      CORBA::tao_ExtLocalInterfaceDef_cast
+                    >
+                  (max, length, buffer, release)
+              {}
+
+              CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &seq)
+                : TAO_Unbounded_Object_Sequence<
+                      CORBA::ExtLocalInterfaceDef,
+                      CORBA::ExtLocalInterfaceDef,
+                      CORBA::tao_ExtLocalInterfaceDef_life,
+                      CORBA::tao_ExtLocalInterfaceDef_cast
+                    >
+                  (seq)
+              {}
+
+              CORBA::ExtLocalInterfaceDefSeq::~ExtLocalInterfaceDefSeq (void)
+              {}
+
+              void CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor (void *_tao_void_pointer)
+              {
+                ExtLocalInterfaceDefSeq *tmp = ACE_static_cast (ExtLocalInterfaceDefSeq*, _tao_void_pointer);
+                delete tmp;
+              }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+              template class
+                TAO_MngSeq_Var_T<
+                    CORBA::ExtLocalInterfaceDefSeq,
+                    TAO_Object_Manager<
+                        CORBA::ExtLocalInterfaceDef,
+                        CORBA::ExtLocalInterfaceDef_var,
+                        CORBA::tao_ExtLocalInterfaceDef_life
+                      >
+                  >;
+
+              template class
+                TAO_Seq_Out_T<
+                    CORBA::ExtLocalInterfaceDefSeq,
+                    CORBA::ExtLocalInterfaceDefSeq_var,
+                    TAO_Object_Manager<
+                        CORBA::ExtLocalInterfaceDef,
+                        CORBA::ExtLocalInterfaceDef_var,
+                        CORBA::tao_ExtLocalInterfaceDef_life
+                      >
+                  >;
 
-static const CORBA::Long _oc_CORBA_StructMember[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5374), 
-  ACE_NTOHL (0x72756374), 
-  ACE_NTOHL (0x4d656d62), 
-  ACE_NTOHL (0x65723a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-    13,
-  ACE_NTOHL (0x53747275), 
-  ACE_NTOHL (0x63744d65), 
-  ACE_NTOHL (0x6d626572), 
-  ACE_NTOHL (0x0),  // name = StructMember
-  3, // member count
-    5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
-    ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-    0U, // string length
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-  5,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x0),  // name = type
-    CORBA::tk_TypeCode,
+              # pragma instantiate \
+                  TAO_MngSeq_Var_T< \
+                      CORBA::ExtLocalInterfaceDefSeq, \
+                      TAO_Object_Manager< \
+                          CORBA::ExtLocalInterfaceDef, \
+                          CORBA::ExtLocalInterfaceDef_var, \
+                          CORBA::tao_ExtLocalInterfaceDef_life \
+                        > \
+                    >
+
+              # pragma instantiate \
+                  TAO_Seq_Out_T< \
+                      CORBA::ExtLocalInterfaceDefSeq, \
+                      CORBA::ExtLocalInterfaceDefSeq_var, \
+                      TAO_Object_Manager< \
+                          CORBA::ExtLocalInterfaceDef, \
+                          CORBA::ExtLocalInterfaceDef_var, \
+                          CORBA::tao_ExtLocalInterfaceDef_life \
+                        > \
+                    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                // TAO_IDL - Generated from
+                // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                static const CORBA::Long _oc_CORBA_ExtLocalInterfaceDefSeq[] =
+                {
+                                    TAO_ENCAP_BYTE_ORDER, // byte order
+                  46,
+                  ACE_NTOHL (0x49444c3a),
+                  ACE_NTOHL (0x6f6d672e),
+                  ACE_NTOHL (0x6f72672f),
+                  ACE_NTOHL (0x434f5242),
+                  ACE_NTOHL (0x412f4578),
+                  ACE_NTOHL (0x744c6f63),
+                  ACE_NTOHL (0x616c496e),
+                  ACE_NTOHL (0x74657266),
+                  ACE_NTOHL (0x61636544),
+                  ACE_NTOHL (0x65665365),
+                  ACE_NTOHL (0x713a312e),
+                  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0
+                                    24,
+                  ACE_NTOHL (0x4578744c),
+                  ACE_NTOHL (0x6f63616c),
+                  ACE_NTOHL (0x496e7465),
+                  ACE_NTOHL (0x72666163),
+                  ACE_NTOHL (0x65446566),
+                  ACE_NTOHL (0x53657100),  // name = ExtLocalInterfaceDefSeq
+                                    CORBA::tk_sequence, // typecode kind
+                  96, // encapsulation length
+                    TAO_ENCAP_BYTE_ORDER, // byte order
+                    CORBA::tk_objref, // typecode kind
+                    80, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      43,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f4578),
+                      ACE_NTOHL (0x744c6f63),
+                      ACE_NTOHL (0x616c496e),
+                      ACE_NTOHL (0x74657266),
+                      ACE_NTOHL (0x61636544),
+                      ACE_NTOHL (0x65663a31),
+                      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0
+                                            21,
+                      ACE_NTOHL (0x4578744c),
+                      ACE_NTOHL (0x6f63616c),
+                      ACE_NTOHL (0x496e7465),
+                      ACE_NTOHL (0x72666163),
+                      ACE_NTOHL (0x65446566),
+                      ACE_NTOHL (0x0),  // name = ExtLocalInterfaceDef
+
+                    0U,
 
-  9,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x5f646566), 
-  ACE_NTOHL (0x0),  // name = type_def
-    CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4944), 
-    ACE_NTOHL (0x4c547970), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
-    ACE_NTOHL (0x49444c54), 
-    ACE_NTOHL (0x79706500),  // name = IDLType
-    
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMember (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_StructMember),
-    (char *) &_oc_CORBA_StructMember,
-    0,
-    sizeof (CORBA::StructMember)
-  );
+                static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtLocalInterfaceDefSeq (
+                    CORBA::tk_alias,
+                    sizeof (_oc_CORBA_ExtLocalInterfaceDefSeq),
+                    (char *) &_oc_CORBA_ExtLocalInterfaceDefSeq,
+                    0,
+                    sizeof (CORBA::ExtLocalInterfaceDefSeq)
+                  );
+
+                TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                TAO_NAMESPACE_BEGIN (CORBA)
+                TAO_NAMESPACE_DEFINE (
+                    ::CORBA::TypeCode_ptr,
+                    _tc_ExtLocalInterfaceDefSeq,
+                    &_tc_TAO_tc_CORBA_ExtLocalInterfaceDefSeq
+                  )
+                TAO_NAMESPACE_END
+
+                // TAO_IDL - Generated from
+                // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+                CORBA::ContainedSeq::ContainedSeq (void)
+                {}
+
+                CORBA::ContainedSeq::ContainedSeq (CORBA::ULong max)
+                  : TAO_Unbounded_Object_Sequence<
+                        CORBA::Contained,
+                        CORBA::Contained,
+                        CORBA::tao_Contained_life,
+                        CORBA::tao_Contained_cast
+                      >
+                    (max)
+                {}
+
+                CORBA::ContainedSeq::ContainedSeq (
+                    CORBA::ULong max,
+                    CORBA::ULong length,
+                    CORBA::Contained_ptr* buffer,
+                    CORBA::Boolean release
+                  )
+                  : TAO_Unbounded_Object_Sequence<
+                        CORBA::Contained,
+                        CORBA::Contained,
+                        CORBA::tao_Contained_life,
+                        CORBA::tao_Contained_cast
+                      >
+                    (max, length, buffer, release)
+                {}
+
+                CORBA::ContainedSeq::ContainedSeq (const ContainedSeq &seq)
+                  : TAO_Unbounded_Object_Sequence<
+                        CORBA::Contained,
+                        CORBA::Contained,
+                        CORBA::tao_Contained_life,
+                        CORBA::tao_Contained_cast
+                      >
+                    (seq)
+                {}
+
+                CORBA::ContainedSeq::~ContainedSeq (void)
+                {}
+
+                void CORBA::ContainedSeq::_tao_any_destructor (void *_tao_void_pointer)
+                {
+                  ContainedSeq *tmp = ACE_static_cast (ContainedSeq*, _tao_void_pointer);
+                  delete tmp;
+                }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+                template class
+                  TAO_MngSeq_Var_T<
+                      CORBA::ContainedSeq,
+                      TAO_Object_Manager<
+                          CORBA::Contained,
+                          CORBA::Contained_var,
+                          CORBA::tao_Contained_life
+                        >
+                    >;
+
+                template class
+                  TAO_Seq_Out_T<
+                      CORBA::ContainedSeq,
+                      CORBA::ContainedSeq_var,
+                      TAO_Object_Manager<
+                          CORBA::Contained,
+                          CORBA::Contained_var,
+                          CORBA::tao_Contained_life
+                        >
+                    >;
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_StructMember,
-    &_tc_TAO_tc_CORBA_StructMember
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
-
-void CORBA::StructMember::_tao_any_destructor (void *_tao_void_pointer)
-{
-  StructMember *tmp = ACE_static_cast (StructMember*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::StructMember* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::StructMember *old =
-        ACE_reinterpret_cast (CORBA::StructMember *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::StructMember *tmp =
-    ACE_reinterpret_cast (CORBA::StructMember *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ_CS_)
-#define _CORBA_STRUCTMEMBERSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::StructMemberSeq
-// *************************************************************
-
-CORBA::StructMemberSeq::StructMemberSeq (void)
-{}
-
-CORBA::StructMemberSeq::StructMemberSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::StructMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::StructMemberSeq::StructMemberSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::StructMember *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::StructMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::StructMemberSeq::StructMemberSeq (const StructMemberSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::StructMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::StructMemberSeq::~StructMemberSeq (void) // dtor
-{}
-
-void CORBA::StructMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  StructMemberSeq *tmp = ACE_static_cast (StructMemberSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5374), 
-  ACE_NTOHL (0x72756374), 
-  ACE_NTOHL (0x4d656d62), 
-  ACE_NTOHL (0x65725365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-    16,
-  ACE_NTOHL (0x53747275), 
-  ACE_NTOHL (0x63744d65), 
-  ACE_NTOHL (0x6d626572), 
-  ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-    CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5374), 
-      ACE_NTOHL (0x72756374), 
-      ACE_NTOHL (0x4d656d62), 
-      ACE_NTOHL (0x65723a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-            13,
-      ACE_NTOHL (0x53747275), 
-      ACE_NTOHL (0x63744d65), 
-      ACE_NTOHL (0x6d626572), 
-      ACE_NTOHL (0x0),  // name = StructMember
-      3, // member count
-            5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
-        ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-        0U, // string length
-
-      5,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
-
-      9,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x5f646566), 
-      ACE_NTOHL (0x0),  // name = type_def
-            CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4944), 
-        ACE_NTOHL (0x4c547970), 
-        ACE_NTOHL (0x653a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8,
-        ACE_NTOHL (0x49444c54), 
-        ACE_NTOHL (0x79706500),  // name = IDLType
-        
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-    0U,
+                # pragma instantiate \
+                    TAO_MngSeq_Var_T< \
+                        CORBA::ContainedSeq, \
+                        TAO_Object_Manager< \
+                            CORBA::Contained, \
+                            CORBA::Contained_var, \
+                            CORBA::tao_Contained_life \
+                          > \
+                      >
+
+                # pragma instantiate \
+                    TAO_Seq_Out_T< \
+                        CORBA::ContainedSeq, \
+                        CORBA::ContainedSeq_var, \
+                        TAO_Object_Manager< \
+                            CORBA::Contained, \
+                            CORBA::Contained_var, \
+                            CORBA::tao_Contained_life \
+                          > \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_ContainedSeq[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    35,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f436f),
+                    ACE_NTOHL (0x6e746169),
+                    ACE_NTOHL (0x6e656453),
+                    ACE_NTOHL (0x65713a31),
+                    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContainedSeq:1.0
+                                        13,
+                    ACE_NTOHL (0x436f6e74),
+                    ACE_NTOHL (0x61696e65),
+                    ACE_NTOHL (0x64536571),
+                    ACE_NTOHL (0x0),  // name = ContainedSeq
+                                        CORBA::tk_sequence, // typecode kind
+                    72, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      CORBA::tk_objref, // typecode kind
+                      56, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        32,
+                        ACE_NTOHL (0x49444c3a),
+                        ACE_NTOHL (0x6f6d672e),
+                        ACE_NTOHL (0x6f72672f),
+                        ACE_NTOHL (0x434f5242),
+                        ACE_NTOHL (0x412f436f),
+                        ACE_NTOHL (0x6e746169),
+                        ACE_NTOHL (0x6e65643a),
+                        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
+                                                10,
+                        ACE_NTOHL (0x436f6e74),
+                        ACE_NTOHL (0x61696e65),
+                        ACE_NTOHL (0x64000000),  // name = Contained
+
+                      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMemberSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_StructMemberSeq),
-    (char *) &_oc_CORBA_StructMemberSeq,
-    0,
-    sizeof (CORBA::StructMemberSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_StructMemberSeq,
-    &_tc_TAO_tc_CORBA_StructMemberSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_Initializer[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x69746961), 
-  ACE_NTOHL (0x6c697a65), 
-  ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-    12,
-  ACE_NTOHL (0x496e6974), 
-  ACE_NTOHL (0x69616c69), 
-  ACE_NTOHL (0x7a657200),  // name = Initializer
-  2, // member count
-    8,
-  ACE_NTOHL (0x6d656d62), 
-  ACE_NTOHL (0x65727300),  // name = members
-    CORBA::tk_alias, // typecode kind for typedefs
-  340, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72756374), 
-    ACE_NTOHL (0x4d656d62), 
-    ACE_NTOHL (0x65725365), 
-    ACE_NTOHL (0x713a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-        16,
-    ACE_NTOHL (0x53747275), 
-    ACE_NTOHL (0x63744d65), 
-    ACE_NTOHL (0x6d626572), 
-    ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-        CORBA::tk_sequence, // typecode kind
-    264, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      248, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5374), 
-        ACE_NTOHL (0x72756374), 
-        ACE_NTOHL (0x4d656d62), 
-        ACE_NTOHL (0x65723a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-                13,
-        ACE_NTOHL (0x53747275), 
-        ACE_NTOHL (0x63744d65), 
-        ACE_NTOHL (0x6d626572), 
-        ACE_NTOHL (0x0),  // name = StructMember
-        3, // member count
-                5,
-        ACE_NTOHL (0x6e616d65), 
-        ACE_NTOHL (0x0),  // name = name
-                CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                    11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
-          ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string, 
-          0U, // string length
-
-        5,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x0),  // name = type
-                CORBA::tk_TypeCode,
-
-        9,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x5f646566), 
-        ACE_NTOHL (0x0),  // name = type_def
-                CORBA::tk_objref, // typecode kind
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          30,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4944), 
-          ACE_NTOHL (0x4c547970), 
-          ACE_NTOHL (0x653a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                    8,
-          ACE_NTOHL (0x49444c54), 
-          ACE_NTOHL (0x79706500),  // name = IDLType
-          
-
-      0U,
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_ContainedSeq (
+                      CORBA::tk_alias,
+                      sizeof (_oc_CORBA_ContainedSeq),
+                      (char *) &_oc_CORBA_ContainedSeq,
+                      0,
+                      sizeof (CORBA::ContainedSeq)
+                    );
 
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_ContainedSeq,
+                      &_tc_TAO_tc_CORBA_ContainedSeq
+                    )
+                  TAO_NAMESPACE_END
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_StructMember[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    35,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f5374),
+                    ACE_NTOHL (0x72756374),
+                    ACE_NTOHL (0x4d656d62),
+                    ACE_NTOHL (0x65723a31),
+                    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                                        13,
+                    ACE_NTOHL (0x53747275),
+                    ACE_NTOHL (0x63744d65),
+                    ACE_NTOHL (0x6d626572),
+                    ACE_NTOHL (0x0),  // name = StructMember
+                    3, // member count
+                                        5,
+                    ACE_NTOHL (0x6e616d65),
+                    ACE_NTOHL (0x0),  // name = name
+                                        CORBA::tk_alias, // typecode kind for typedefs
+                    68, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      33,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f4964),
+                      ACE_NTOHL (0x656e7469),
+                      ACE_NTOHL (0x66696572),
+                      ACE_NTOHL (0x3a312e30),
+                      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                            11,
+                      ACE_NTOHL (0x4964656e),
+                      ACE_NTOHL (0x74696669),
+                      ACE_NTOHL (0x65720000),  // name = Identifier
+                                            CORBA::tk_string,
+                      0U, // string length
+
+                    5,
+                    ACE_NTOHL (0x74797065),
+                    ACE_NTOHL (0x0),  // name = type
+                                        CORBA::tk_TypeCode,
+
+                    9,
+                    ACE_NTOHL (0x74797065),
+                    ACE_NTOHL (0x5f646566),
+                    ACE_NTOHL (0x0),  // name = type_def
+                                        CORBA::tk_objref, // typecode kind
+                    52, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      30,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f4944),
+                      ACE_NTOHL (0x4c547970),
+                      ACE_NTOHL (0x653a312e),
+                      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                            8,
+                      ACE_NTOHL (0x49444c54),
+                      ACE_NTOHL (0x79706500),  // name = IDLType
 
-  5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-    0xffffffff, // indirection
-  0xffffff44, // negative offset (-188)
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Initializer (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_Initializer),
-    (char *) &_oc_CORBA_Initializer,
-    0,
-    sizeof (CORBA::Initializer)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Initializer,
-    &_tc_TAO_tc_CORBA_Initializer
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
-
-void CORBA::Initializer::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Initializer *tmp = ACE_static_cast (Initializer*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Initializer* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::Initializer *old =
-        ACE_reinterpret_cast (CORBA::Initializer *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::Initializer *tmp =
-    ACE_reinterpret_cast (CORBA::Initializer *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INITIALIZERSEQ_CS_)
-#define _CORBA_INITIALIZERSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::InitializerSeq
-// *************************************************************
-
-CORBA::InitializerSeq::InitializerSeq (void)
-{}
-
-CORBA::InitializerSeq::InitializerSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_InitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Initializer>
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMember (
+                      CORBA::tk_struct,
+                      sizeof (_oc_CORBA_StructMember),
+                      (char *) &_oc_CORBA_StructMember,
+                      0,
+                      sizeof (CORBA::StructMember)
+                    );
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_StructMember,
+                      &_tc_TAO_tc_CORBA_StructMember
+                    )
+                  TAO_NAMESPACE_END
 
-CORBA::InitializerSeq::InitializerSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Initializer *buffer,
-    CORBA::Boolean release
-  )
-  : 
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_InitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Initializer>
+                  void CORBA::StructMember::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    StructMember *tmp = ACE_static_cast (StructMember*, _tao_void_pointer);
+                    delete tmp;
+                  }
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-CORBA::InitializerSeq::InitializerSeq (const InitializerSeq &seq)
-  : 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_InitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Initializer>
+                  template class
+                    TAO_Var_Var_T<
+                        StructMember
+                      >;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+                  template class
+                    TAO_Out_T<
+                        StructMember,
+                        StructMember_var
+                      >;
 
-CORBA::InitializerSeq::~InitializerSeq (void) // dtor
-{}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-void CORBA::InitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InitializerSeq *tmp = ACE_static_cast (InitializerSeq*, _tao_void_pointer);
-  delete tmp;
-}
+                  # pragma instantiate \
+                    TAO_Var_Var_T< \
+                        StructMember \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Out_T< \
+                        StructMember, \
+                        StructMember_var \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+                  CORBA::StructMemberSeq::StructMemberSeq (void)
+                  {}
+
+                  CORBA::StructMemberSeq::StructMemberSeq (CORBA::ULong max)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::StructMember
+                        >
+                      (max)
+                  {}
+
+                  CORBA::StructMemberSeq::StructMemberSeq (
+                      CORBA::ULong max,
+                      CORBA::ULong length,
+                      CORBA::StructMember* buffer,
+                      CORBA::Boolean release
+                    )
+                    : TAO_Unbounded_Sequence<
+                          CORBA::StructMember
+                        >
+                      (max, length, buffer, release)
+                  {}
+
+                  CORBA::StructMemberSeq::StructMemberSeq (const StructMemberSeq &seq)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::StructMember
+                        >
+                      (seq)
+                  {}
+
+                  CORBA::StructMemberSeq::~StructMemberSeq (void)
+                  {}
+
+                  void CORBA::StructMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    StructMemberSeq *tmp = ACE_static_cast (StructMemberSeq*, _tao_void_pointer);
+                    delete tmp;
+                  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+                  template class
+                    TAO_VarSeq_Var_T<
+                        StructMemberSeq,
+                        CORBA::StructMember
+                      >;
+
+                  template class
+                    TAO_Seq_Out_T<
+                        StructMemberSeq,
+                        StructMemberSeq_var,
+                        CORBA::StructMember
+                      >;
 
-#endif /* end #if !defined */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+                  # pragma instantiate \
+                    TAO_VarSeq_Var_T< \
+                        StructMemberSeq, \
+                        CORBA::StructMember \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Seq_Out_T< \
+                        StructMemberSeq, \
+                        StructMemberSeq_var, \
+                        CORBA::StructMember \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    38,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f5374),
+                    ACE_NTOHL (0x72756374),
+                    ACE_NTOHL (0x4d656d62),
+                    ACE_NTOHL (0x65725365),
+                    ACE_NTOHL (0x713a312e),
+                    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
+                                        16,
+                    ACE_NTOHL (0x53747275),
+                    ACE_NTOHL (0x63744d65),
+                    ACE_NTOHL (0x6d626572),
+                    ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+                                        CORBA::tk_sequence, // typecode kind
+                    264, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      CORBA::tk_struct, // typecode kind
+                      248, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        35,
+                        ACE_NTOHL (0x49444c3a),
+                        ACE_NTOHL (0x6f6d672e),
+                        ACE_NTOHL (0x6f72672f),
+                        ACE_NTOHL (0x434f5242),
+                        ACE_NTOHL (0x412f5374),
+                        ACE_NTOHL (0x72756374),
+                        ACE_NTOHL (0x4d656d62),
+                        ACE_NTOHL (0x65723a31),
+                        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                                                13,
+                        ACE_NTOHL (0x53747275),
+                        ACE_NTOHL (0x63744d65),
+                        ACE_NTOHL (0x6d626572),
+                        ACE_NTOHL (0x0),  // name = StructMember
+                        3, // member count
+                                                5,
+                        ACE_NTOHL (0x6e616d65),
+                        ACE_NTOHL (0x0),  // name = name
+                                                CORBA::tk_alias, // typecode kind for typedefs
+                        68, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          33,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f4964),
+                          ACE_NTOHL (0x656e7469),
+                          ACE_NTOHL (0x66696572),
+                          ACE_NTOHL (0x3a312e30),
+                          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                                    11,
+                          ACE_NTOHL (0x4964656e),
+                          ACE_NTOHL (0x74696669),
+                          ACE_NTOHL (0x65720000),  // name = Identifier
+                                                    CORBA::tk_string,
+                          0U, // string length
 
-static const CORBA::Long _oc_CORBA_InitializerSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x69746961), 
-  ACE_NTOHL (0x6c697a65), 
-  ACE_NTOHL (0x72536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
-    15,
-  ACE_NTOHL (0x496e6974), 
-  ACE_NTOHL (0x69616c69), 
-  ACE_NTOHL (0x7a657253), 
-  ACE_NTOHL (0x65710000),  // name = InitializerSeq
-    CORBA::tk_sequence, // typecode kind
-  460, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    444, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f496e), 
-      ACE_NTOHL (0x69746961), 
-      ACE_NTOHL (0x6c697a65), 
-      ACE_NTOHL (0x723a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
-            12,
-      ACE_NTOHL (0x496e6974), 
-      ACE_NTOHL (0x69616c69), 
-      ACE_NTOHL (0x7a657200),  // name = Initializer
-      2, // member count
-            8,
-      ACE_NTOHL (0x6d656d62), 
-      ACE_NTOHL (0x65727300),  // name = members
-            CORBA::tk_alias, // typecode kind for typedefs
-      340, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        38,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5374), 
-        ACE_NTOHL (0x72756374), 
-        ACE_NTOHL (0x4d656d62), 
-        ACE_NTOHL (0x65725365), 
-        ACE_NTOHL (0x713a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-                16,
-        ACE_NTOHL (0x53747275), 
-        ACE_NTOHL (0x63744d65), 
-        ACE_NTOHL (0x6d626572), 
-        ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-                CORBA::tk_sequence, // typecode kind
-        264, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          248, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            35,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x434f5242), 
-            ACE_NTOHL (0x412f5374), 
-            ACE_NTOHL (0x72756374), 
-            ACE_NTOHL (0x4d656d62), 
-            ACE_NTOHL (0x65723a31), 
-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-                        13,
-            ACE_NTOHL (0x53747275), 
-            ACE_NTOHL (0x63744d65), 
-            ACE_NTOHL (0x6d626572), 
-            ACE_NTOHL (0x0),  // name = StructMember
-            3, // member count
                         5,
-            ACE_NTOHL (0x6e616d65), 
-            ACE_NTOHL (0x0),  // name = name
-                        CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4964), 
-              ACE_NTOHL (0x656e7469), 
-              ACE_NTOHL (0x66696572), 
-              ACE_NTOHL (0x3a312e30), 
-              ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                            11,
-              ACE_NTOHL (0x4964656e), 
-              ACE_NTOHL (0x74696669), 
-              ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string, 
-              0U, // string length
-
-            5,
-            ACE_NTOHL (0x74797065), 
-            ACE_NTOHL (0x0),  // name = type
-                        CORBA::tk_TypeCode,
-
-            9,
-            ACE_NTOHL (0x74797065), 
-            ACE_NTOHL (0x5f646566), 
-            ACE_NTOHL (0x0),  // name = type_def
-                        CORBA::tk_objref, // typecode kind
-            52, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              30,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4944), 
-              ACE_NTOHL (0x4c547970), 
-              ACE_NTOHL (0x653a312e), 
-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                            8,
-              ACE_NTOHL (0x49444c54), 
-              ACE_NTOHL (0x79706500),  // name = IDLType
-              
-
-          0U,
-
-
-      5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-            0xffffffff, // indirection
-      0xffffff44, // negative offset (-188)
-
-    0U,
+                        ACE_NTOHL (0x74797065),
+                        ACE_NTOHL (0x0),  // name = type
+                                                CORBA::tk_TypeCode,
+
+                        9,
+                        ACE_NTOHL (0x74797065),
+                        ACE_NTOHL (0x5f646566),
+                        ACE_NTOHL (0x0),  // name = type_def
+                                                CORBA::tk_objref, // typecode kind
+                        52, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          30,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f4944),
+                          ACE_NTOHL (0x4c547970),
+                          ACE_NTOHL (0x653a312e),
+                          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                                    8,
+                          ACE_NTOHL (0x49444c54),
+                          ACE_NTOHL (0x79706500),  // name = IDLType
+
+
+                      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InitializerSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_InitializerSeq),
-    (char *) &_oc_CORBA_InitializerSeq,
-    0,
-    sizeof (CORBA::InitializerSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_InitializerSeq,
-    &_tc_TAO_tc_CORBA_InitializerSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x696f6e44), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-    21,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = ExceptionDescription
-  5, // member count
-    5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
-    ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-    0U, // string length
-
-  3,
-  ACE_NTOHL (0x69640000),  // name = id
-    CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-        13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
-    ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
-    0U, // string length
-
-  11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
-  ACE_NTOHL (0x696e0000),  // name = defined_in
-    0xffffffff, // indirection
-  0xffffff9c, // negative offset (-100)
-  8,
-  ACE_NTOHL (0x76657273), 
-  ACE_NTOHL (0x696f6e00),  // name = version
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-        12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
-    0U, // string length
-
-  5,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x0),  // name = type
-    CORBA::tk_TypeCode,
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMemberSeq (
+                      CORBA::tk_alias,
+                      sizeof (_oc_CORBA_StructMemberSeq),
+                      (char *) &_oc_CORBA_StructMemberSeq,
+                      0,
+                      sizeof (CORBA::StructMemberSeq)
+                    );
 
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_StructMemberSeq,
+                      &_tc_TAO_tc_CORBA_StructMemberSeq
+                    )
+                  TAO_NAMESPACE_END
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_Initializer[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    34,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f496e),
+                    ACE_NTOHL (0x69746961),
+                    ACE_NTOHL (0x6c697a65),
+                    ACE_NTOHL (0x723a312e),
+                    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
+                                        12,
+                    ACE_NTOHL (0x496e6974),
+                    ACE_NTOHL (0x69616c69),
+                    ACE_NTOHL (0x7a657200),  // name = Initializer
+                    2, // member count
+                                        8,
+                    ACE_NTOHL (0x6d656d62),
+                    ACE_NTOHL (0x65727300),  // name = members
+                                        CORBA::tk_alias, // typecode kind for typedefs
+                    340, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      38,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f5374),
+                      ACE_NTOHL (0x72756374),
+                      ACE_NTOHL (0x4d656d62),
+                      ACE_NTOHL (0x65725365),
+                      ACE_NTOHL (0x713a312e),
+                      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
+                                            16,
+                      ACE_NTOHL (0x53747275),
+                      ACE_NTOHL (0x63744d65),
+                      ACE_NTOHL (0x6d626572),
+                      ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+                                            CORBA::tk_sequence, // typecode kind
+                      264, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        CORBA::tk_struct, // typecode kind
+                        248, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          35,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f5374),
+                          ACE_NTOHL (0x72756374),
+                          ACE_NTOHL (0x4d656d62),
+                          ACE_NTOHL (0x65723a31),
+                          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                                                    13,
+                          ACE_NTOHL (0x53747275),
+                          ACE_NTOHL (0x63744d65),
+                          ACE_NTOHL (0x6d626572),
+                          ACE_NTOHL (0x0),  // name = StructMember
+                          3, // member count
+                                                    5,
+                          ACE_NTOHL (0x6e616d65),
+                          ACE_NTOHL (0x0),  // name = name
+                                                    CORBA::tk_alias, // typecode kind for typedefs
+                          68, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            33,
+                            ACE_NTOHL (0x49444c3a),
+                            ACE_NTOHL (0x6f6d672e),
+                            ACE_NTOHL (0x6f72672f),
+                            ACE_NTOHL (0x434f5242),
+                            ACE_NTOHL (0x412f4964),
+                            ACE_NTOHL (0x656e7469),
+                            ACE_NTOHL (0x66696572),
+                            ACE_NTOHL (0x3a312e30),
+                            ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                                        11,
+                            ACE_NTOHL (0x4964656e),
+                            ACE_NTOHL (0x74696669),
+                            ACE_NTOHL (0x65720000),  // name = Identifier
+                                                        CORBA::tk_string,
+                            0U, // string length
+
+                          5,
+                          ACE_NTOHL (0x74797065),
+                          ACE_NTOHL (0x0),  // name = type
+                                                    CORBA::tk_TypeCode,
+
+                          9,
+                          ACE_NTOHL (0x74797065),
+                          ACE_NTOHL (0x5f646566),
+                          ACE_NTOHL (0x0),  // name = type_def
+                                                    CORBA::tk_objref, // typecode kind
+                          52, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            30,
+                            ACE_NTOHL (0x49444c3a),
+                            ACE_NTOHL (0x6f6d672e),
+                            ACE_NTOHL (0x6f72672f),
+                            ACE_NTOHL (0x434f5242),
+                            ACE_NTOHL (0x412f4944),
+                            ACE_NTOHL (0x4c547970),
+                            ACE_NTOHL (0x653a312e),
+                            ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                                        8,
+                            ACE_NTOHL (0x49444c54),
+                            ACE_NTOHL (0x79706500),  // name = IDLType
+
+
+                        0U,
+
+
+                    5,
+                    ACE_NTOHL (0x6e616d65),
+                    ACE_NTOHL (0x0),  // name = name
+                                        0xffffffff, // indirection
+                    0xffffff44, // negative offset (-188)
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDescription (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ExceptionDescription),
-    (char *) &_oc_CORBA_ExceptionDescription,
-    0,
-    sizeof (CORBA::ExceptionDescription)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExceptionDescription,
-    &_tc_TAO_tc_CORBA_ExceptionDescription
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
-
-void CORBA::ExceptionDescription::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExceptionDescription *tmp = ACE_static_cast (ExceptionDescription*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExceptionDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ExceptionDescription *old =
-        ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExceptionDescription *tmp =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CS_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ExcDescriptionSeq
-// *************************************************************
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (void)
-{}
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExceptionDescription *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_Initializer (
+                      CORBA::tk_struct,
+                      sizeof (_oc_CORBA_Initializer),
+                      (char *) &_oc_CORBA_Initializer,
+                      0,
+                      sizeof (CORBA::Initializer)
+                    );
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_Initializer,
+                      &_tc_TAO_tc_CORBA_Initializer
+                    )
+                  TAO_NAMESPACE_END
 
-CORBA::ExcDescriptionSeq::ExcDescriptionSeq (const ExcDescriptionSeq &seq)
-  : 
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
+                  void CORBA::Initializer::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    Initializer *tmp = ACE_static_cast (Initializer*, _tao_void_pointer);
+                    delete tmp;
+                  }
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-CORBA::ExcDescriptionSeq::~ExcDescriptionSeq (void) // dtor
-{}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-void CORBA::ExcDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExcDescriptionSeq *tmp = ACE_static_cast (ExcDescriptionSeq*, _tao_void_pointer);
-  delete tmp;
-}
+                  template class
+                    TAO_Var_Var_T<
+                        Initializer
+                      >;
 
-#endif /* end #if !defined */
+                  template class
+                    TAO_Out_T<
+                        Initializer,
+                        Initializer_var
+                      >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x63446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-    18,
-  ACE_NTOHL (0x45786344), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e5365), 
-  ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-    CORBA::tk_sequence, // typecode kind
-  404, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    388, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      43,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x63657074), 
-      ACE_NTOHL (0x696f6e44), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-            21,
-      ACE_NTOHL (0x45786365), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e446573), 
-      ACE_NTOHL (0x63726970), 
-      ACE_NTOHL (0x74696f6e), 
-      ACE_NTOHL (0x0),  // name = ExceptionDescription
-      5, // member count
-            5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
-        ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-        0U, // string length
+                  # pragma instantiate \
+                    TAO_Var_Var_T< \
+                        Initializer \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Out_T< \
+                        Initializer, \
+                        Initializer_var \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+                  CORBA::InitializerSeq::InitializerSeq (void)
+                  {}
+
+                  CORBA::InitializerSeq::InitializerSeq (CORBA::ULong max)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::Initializer
+                        >
+                      (max)
+                  {}
+
+                  CORBA::InitializerSeq::InitializerSeq (
+                      CORBA::ULong max,
+                      CORBA::ULong length,
+                      CORBA::Initializer* buffer,
+                      CORBA::Boolean release
+                    )
+                    : TAO_Unbounded_Sequence<
+                          CORBA::Initializer
+                        >
+                      (max, length, buffer, release)
+                  {}
+
+                  CORBA::InitializerSeq::InitializerSeq (const InitializerSeq &seq)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::Initializer
+                        >
+                      (seq)
+                  {}
+
+                  CORBA::InitializerSeq::~InitializerSeq (void)
+                  {}
+
+                  void CORBA::InitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    InitializerSeq *tmp = ACE_static_cast (InitializerSeq*, _tao_void_pointer);
+                    delete tmp;
+                  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+                  template class
+                    TAO_VarSeq_Var_T<
+                        InitializerSeq,
+                        CORBA::Initializer
+                      >;
+
+                  template class
+                    TAO_Seq_Out_T<
+                        InitializerSeq,
+                        InitializerSeq_var,
+                        CORBA::Initializer
+                      >;
 
-      3,
-      ACE_NTOHL (0x69640000),  // name = id
-            CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
-        ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-        0U, // string length
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-      11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
-      ACE_NTOHL (0x696e0000),  // name = defined_in
-            0xffffffff, // indirection
-      0xffffff9c, // negative offset (-100)
-      8,
-      ACE_NTOHL (0x76657273), 
-      ACE_NTOHL (0x696f6e00),  // name = version
-            CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-                12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
-        ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
-        0U, // string length
+                  # pragma instantiate \
+                    TAO_VarSeq_Var_T< \
+                        InitializerSeq, \
+                        CORBA::Initializer \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Seq_Out_T< \
+                        InitializerSeq, \
+                        InitializerSeq_var, \
+                        CORBA::Initializer \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_InitializerSeq[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    37,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f496e),
+                    ACE_NTOHL (0x69746961),
+                    ACE_NTOHL (0x6c697a65),
+                    ACE_NTOHL (0x72536571),
+                    ACE_NTOHL (0x3a312e30),
+                    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
+                                        15,
+                    ACE_NTOHL (0x496e6974),
+                    ACE_NTOHL (0x69616c69),
+                    ACE_NTOHL (0x7a657253),
+                    ACE_NTOHL (0x65710000),  // name = InitializerSeq
+                                        CORBA::tk_sequence, // typecode kind
+                    460, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      CORBA::tk_struct, // typecode kind
+                      444, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        34,
+                        ACE_NTOHL (0x49444c3a),
+                        ACE_NTOHL (0x6f6d672e),
+                        ACE_NTOHL (0x6f72672f),
+                        ACE_NTOHL (0x434f5242),
+                        ACE_NTOHL (0x412f496e),
+                        ACE_NTOHL (0x69746961),
+                        ACE_NTOHL (0x6c697a65),
+                        ACE_NTOHL (0x723a312e),
+                        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
+                                                12,
+                        ACE_NTOHL (0x496e6974),
+                        ACE_NTOHL (0x69616c69),
+                        ACE_NTOHL (0x7a657200),  // name = Initializer
+                        2, // member count
+                                                8,
+                        ACE_NTOHL (0x6d656d62),
+                        ACE_NTOHL (0x65727300),  // name = members
+                                                CORBA::tk_alias, // typecode kind for typedefs
+                        340, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          38,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f5374),
+                          ACE_NTOHL (0x72756374),
+                          ACE_NTOHL (0x4d656d62),
+                          ACE_NTOHL (0x65725365),
+                          ACE_NTOHL (0x713a312e),
+                          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
+                                                    16,
+                          ACE_NTOHL (0x53747275),
+                          ACE_NTOHL (0x63744d65),
+                          ACE_NTOHL (0x6d626572),
+                          ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+                                                    CORBA::tk_sequence, // typecode kind
+                          264, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            CORBA::tk_struct, // typecode kind
+                            248, // encapsulation length
+                              TAO_ENCAP_BYTE_ORDER, // byte order
+                              35,
+                              ACE_NTOHL (0x49444c3a),
+                              ACE_NTOHL (0x6f6d672e),
+                              ACE_NTOHL (0x6f72672f),
+                              ACE_NTOHL (0x434f5242),
+                              ACE_NTOHL (0x412f5374),
+                              ACE_NTOHL (0x72756374),
+                              ACE_NTOHL (0x4d656d62),
+                              ACE_NTOHL (0x65723a31),
+                              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                                                            13,
+                              ACE_NTOHL (0x53747275),
+                              ACE_NTOHL (0x63744d65),
+                              ACE_NTOHL (0x6d626572),
+                              ACE_NTOHL (0x0),  // name = StructMember
+                              3, // member count
+                                                            5,
+                              ACE_NTOHL (0x6e616d65),
+                              ACE_NTOHL (0x0),  // name = name
+                                                            CORBA::tk_alias, // typecode kind for typedefs
+                              68, // encapsulation length
+                                TAO_ENCAP_BYTE_ORDER, // byte order
+                                33,
+                                ACE_NTOHL (0x49444c3a),
+                                ACE_NTOHL (0x6f6d672e),
+                                ACE_NTOHL (0x6f72672f),
+                                ACE_NTOHL (0x434f5242),
+                                ACE_NTOHL (0x412f4964),
+                                ACE_NTOHL (0x656e7469),
+                                ACE_NTOHL (0x66696572),
+                                ACE_NTOHL (0x3a312e30),
+                                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                                                11,
+                                ACE_NTOHL (0x4964656e),
+                                ACE_NTOHL (0x74696669),
+                                ACE_NTOHL (0x65720000),  // name = Identifier
+                                                                CORBA::tk_string,
+                                0U, // string length
+
+                              5,
+                              ACE_NTOHL (0x74797065),
+                              ACE_NTOHL (0x0),  // name = type
+                                                            CORBA::tk_TypeCode,
+
+                              9,
+                              ACE_NTOHL (0x74797065),
+                              ACE_NTOHL (0x5f646566),
+                              ACE_NTOHL (0x0),  // name = type_def
+                                                            CORBA::tk_objref, // typecode kind
+                              52, // encapsulation length
+                                TAO_ENCAP_BYTE_ORDER, // byte order
+                                30,
+                                ACE_NTOHL (0x49444c3a),
+                                ACE_NTOHL (0x6f6d672e),
+                                ACE_NTOHL (0x6f72672f),
+                                ACE_NTOHL (0x434f5242),
+                                ACE_NTOHL (0x412f4944),
+                                ACE_NTOHL (0x4c547970),
+                                ACE_NTOHL (0x653a312e),
+                                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                                                8,
+                                ACE_NTOHL (0x49444c54),
+                                ACE_NTOHL (0x79706500),  // name = IDLType
+
+
+                            0U,
 
-      5,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
 
+                        5,
+                        ACE_NTOHL (0x6e616d65),
+                        ACE_NTOHL (0x0),  // name = name
+                                                0xffffffff, // indirection
+                        0xffffff44, // negative offset (-188)
 
-    0U,
+                      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExcDescriptionSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExcDescriptionSeq),
-    (char *) &_oc_CORBA_ExcDescriptionSeq,
-    0,
-    sizeof (CORBA::ExcDescriptionSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExcDescriptionSeq,
-    &_tc_TAO_tc_CORBA_ExcDescriptionSeq
-  )
-TAO_NAMESPACE_END
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_InitializerSeq (
+                      CORBA::tk_alias,
+                      sizeof (_oc_CORBA_InitializerSeq),
+                      (char *) &_oc_CORBA_InitializerSeq,
+                      0,
+                      sizeof (CORBA::InitializerSeq)
+                    );
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_InitializerSeq,
+                      &_tc_TAO_tc_CORBA_InitializerSeq
+                    )
+                  TAO_NAMESPACE_END
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    43,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f4578),
+                    ACE_NTOHL (0x63657074),
+                    ACE_NTOHL (0x696f6e44),
+                    ACE_NTOHL (0x65736372),
+                    ACE_NTOHL (0x69707469),
+                    ACE_NTOHL (0x6f6e3a31),
+                    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                                        21,
+                    ACE_NTOHL (0x45786365),
+                    ACE_NTOHL (0x7074696f),
+                    ACE_NTOHL (0x6e446573),
+                    ACE_NTOHL (0x63726970),
+                    ACE_NTOHL (0x74696f6e),
+                    ACE_NTOHL (0x0),  // name = ExceptionDescription
+                    5, // member count
+                                        5,
+                    ACE_NTOHL (0x6e616d65),
+                    ACE_NTOHL (0x0),  // name = name
+                                        CORBA::tk_alias, // typecode kind for typedefs
+                    68, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      33,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f4964),
+                      ACE_NTOHL (0x656e7469),
+                      ACE_NTOHL (0x66696572),
+                      ACE_NTOHL (0x3a312e30),
+                      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                            11,
+                      ACE_NTOHL (0x4964656e),
+                      ACE_NTOHL (0x74696669),
+                      ACE_NTOHL (0x65720000),  // name = Identifier
+                                            CORBA::tk_string,
+                      0U, // string length
+
+                    3,
+                    ACE_NTOHL (0x69640000),  // name = id
+                                        CORBA::tk_alias, // typecode kind for typedefs
+                    72, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      35,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f5265),
+                      ACE_NTOHL (0x706f7369),
+                      ACE_NTOHL (0x746f7279),
+                      ACE_NTOHL (0x49643a31),
+                      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                                            13,
+                      ACE_NTOHL (0x5265706f),
+                      ACE_NTOHL (0x7369746f),
+                      ACE_NTOHL (0x72794964),
+                      ACE_NTOHL (0x0),  // name = RepositoryId
+                                            CORBA::tk_string,
+                      0U, // string length
 
-static const CORBA::Long _oc_CORBA_ExtInitializer[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74496e69), 
-  ACE_NTOHL (0x7469616c), 
-  ACE_NTOHL (0x697a6572), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
-    15,
-  ACE_NTOHL (0x45787449), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x616c697a), 
-  ACE_NTOHL (0x65720000),  // name = ExtInitializer
-  3, // member count
-    8,
-  ACE_NTOHL (0x6d656d62), 
-  ACE_NTOHL (0x65727300),  // name = members
-    CORBA::tk_alias, // typecode kind for typedefs
-  340, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72756374), 
-    ACE_NTOHL (0x4d656d62), 
-    ACE_NTOHL (0x65725365), 
-    ACE_NTOHL (0x713a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-        16,
-    ACE_NTOHL (0x53747275), 
-    ACE_NTOHL (0x63744d65), 
-    ACE_NTOHL (0x6d626572), 
-    ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-        CORBA::tk_sequence, // typecode kind
-    264, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      248, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5374), 
-        ACE_NTOHL (0x72756374), 
-        ACE_NTOHL (0x4d656d62), 
-        ACE_NTOHL (0x65723a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-                13,
-        ACE_NTOHL (0x53747275), 
-        ACE_NTOHL (0x63744d65), 
-        ACE_NTOHL (0x6d626572), 
-        ACE_NTOHL (0x0),  // name = StructMember
-        3, // member count
-                5,
-        ACE_NTOHL (0x6e616d65), 
-        ACE_NTOHL (0x0),  // name = name
-                CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                     11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
-          ACE_NTOHL (0x65720000),  // name = Identifier
-                    CORBA::tk_string, 
-          0U, // string length
-
-        5,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x0),  // name = type
-                CORBA::tk_TypeCode,
-
-        9,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x5f646566), 
-        ACE_NTOHL (0x0),  // name = type_def
-                CORBA::tk_objref, // typecode kind
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          30,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4944), 
-          ACE_NTOHL (0x4c547970), 
-          ACE_NTOHL (0x653a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                    ACE_NTOHL (0x64656669),
+                    ACE_NTOHL (0x6e65645f),
+                    ACE_NTOHL (0x696e0000),  // name = defined_in
+                                        0xffffffff, // indirection
+                    0xffffff9c, // negative offset (-100)
                     8,
-          ACE_NTOHL (0x49444c54), 
-          ACE_NTOHL (0x79706500),  // name = IDLType
-          
-
-      0U,
-
-
-  11,
-  ACE_NTOHL (0x65786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e730000),  // name = exceptions
-    CORBA::tk_alias, // typecode kind for typedefs
-  416, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4578), 
-    ACE_NTOHL (0x63446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x5365713a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-        18,
-    ACE_NTOHL (0x45786344), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
-    ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-        CORBA::tk_sequence, // typecode kind
-    336, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      320, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x63657074), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-                21,
-        ACE_NTOHL (0x45786365), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x0),  // name = ExceptionDescription
-        5, // member count
-                5,
-        ACE_NTOHL (0x6e616d65), 
-        ACE_NTOHL (0x0),  // name = name
-                0xffffffff, // indirection
-        0xfffffe7c, // negative offset (-388)
-        3,
-        ACE_NTOHL (0x69640000),  // name = id
-                CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                    13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-                    CORBA::tk_string, 
-          0U, // string length
-
-        11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
-        ACE_NTOHL (0x696e0000),  // name = defined_in
-                0xffffffff, // indirection
-        0xffffff9c, // negative offset (-100)
-        8,
-        ACE_NTOHL (0x76657273), 
-        ACE_NTOHL (0x696f6e00),  // name = version
-                CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-                    12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
-          ACE_NTOHL (0x70656300),  // name = VersionSpec
-                    CORBA::tk_string, 
-          0U, // string length
-
-        5,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x0),  // name = type
-                CORBA::tk_TypeCode,
+                    ACE_NTOHL (0x76657273),
+                    ACE_NTOHL (0x696f6e00),  // name = version
+                                        CORBA::tk_alias, // typecode kind for typedefs
+                    68, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      34,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f5665),
+                      ACE_NTOHL (0x7273696f),
+                      ACE_NTOHL (0x6e537065),
+                      ACE_NTOHL (0x633a312e),
+                      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                                            12,
+                      ACE_NTOHL (0x56657273),
+                      ACE_NTOHL (0x696f6e53),
+                      ACE_NTOHL (0x70656300),  // name = VersionSpec
+                                            CORBA::tk_string,
+                      0U, // string length
+
+                    5,
+                    ACE_NTOHL (0x74797065),
+                    ACE_NTOHL (0x0),  // name = type
+                                        CORBA::tk_TypeCode,
 
-
-      0U,
-
-
-  5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-    0xffffffff, // indirection
-  0xfffffd8c, // negative offset (-628)
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInitializer (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ExtInitializer),
-    (char *) &_oc_CORBA_ExtInitializer,
-    0,
-    sizeof (CORBA::ExtInitializer)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExtInitializer,
-    &_tc_TAO_tc_CORBA_ExtInitializer
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
-
-void CORBA::ExtInitializer::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtInitializer *tmp = ACE_static_cast (ExtInitializer*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExtInitializer* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ExtInitializer *old =
-        ACE_reinterpret_cast (CORBA::ExtInitializer *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExtInitializer *tmp =
-    ACE_reinterpret_cast (CORBA::ExtInitializer *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::~_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ_CS_)
-#define _CORBA_EXTINITIALIZERSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ExtInitializerSeq
-// *************************************************************
-
-CORBA::ExtInitializerSeq::ExtInitializerSeq (void)
-{}
-
-CORBA::ExtInitializerSeq::ExtInitializerSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExtInitializer>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDescription (
+                      CORBA::tk_struct,
+                      sizeof (_oc_CORBA_ExceptionDescription),
+                      (char *) &_oc_CORBA_ExceptionDescription,
+                      0,
+                      sizeof (CORBA::ExceptionDescription)
+                    );
 
-CORBA::ExtInitializerSeq::ExtInitializerSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtInitializer *buffer,
-    CORBA::Boolean release
-  )
-  : 
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_ExceptionDescription,
+                      &_tc_TAO_tc_CORBA_ExceptionDescription
+                    )
+                  TAO_NAMESPACE_END
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExtInitializer>
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
+                  void CORBA::ExceptionDescription::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    ExceptionDescription *tmp = ACE_static_cast (ExceptionDescription*, _tao_void_pointer);
+                    delete tmp;
+                  }
 
-CORBA::ExtInitializerSeq::ExtInitializerSeq (const ExtInitializerSeq &seq)
-  : 
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExtInitializer>
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+                  template class
+                    TAO_Var_Var_T<
+                        ExceptionDescription
+                      >;
 
-CORBA::ExtInitializerSeq::~ExtInitializerSeq (void) // dtor
-{}
+                  template class
+                    TAO_Out_T<
+                        ExceptionDescription,
+                        ExceptionDescription_var
+                      >;
 
-void CORBA::ExtInitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExtInitializerSeq *tmp = ACE_static_cast (ExtInitializerSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74496e69), 
-  ACE_NTOHL (0x7469616c), 
-  ACE_NTOHL (0x697a6572), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtInitializerSeq:1.0
-    18,
-  ACE_NTOHL (0x45787449), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x616c697a), 
-  ACE_NTOHL (0x65725365), 
-  ACE_NTOHL (0x71000000),  // name = ExtInitializerSeq
-    CORBA::tk_sequence, // typecode kind
-  908, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    892, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x74496e69), 
-      ACE_NTOHL (0x7469616c), 
-      ACE_NTOHL (0x697a6572), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
-            15,
-      ACE_NTOHL (0x45787449), 
-      ACE_NTOHL (0x6e697469), 
-      ACE_NTOHL (0x616c697a), 
-      ACE_NTOHL (0x65720000),  // name = ExtInitializer
-      3, // member count
-            8,
-      ACE_NTOHL (0x6d656d62), 
-      ACE_NTOHL (0x65727300),  // name = members
-            CORBA::tk_alias, // typecode kind for typedefs
-      340, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        38,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5374), 
-        ACE_NTOHL (0x72756374), 
-        ACE_NTOHL (0x4d656d62), 
-        ACE_NTOHL (0x65725365), 
-        ACE_NTOHL (0x713a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
-                16,
-        ACE_NTOHL (0x53747275), 
-        ACE_NTOHL (0x63744d65), 
-        ACE_NTOHL (0x6d626572), 
-        ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-                CORBA::tk_sequence, // typecode kind
-        264, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          248, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            35,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x434f5242), 
-            ACE_NTOHL (0x412f5374), 
-            ACE_NTOHL (0x72756374), 
-            ACE_NTOHL (0x4d656d62), 
-            ACE_NTOHL (0x65723a31), 
-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
-                        13,
-            ACE_NTOHL (0x53747275), 
-            ACE_NTOHL (0x63744d65), 
-            ACE_NTOHL (0x6d626572), 
-            ACE_NTOHL (0x0),  // name = StructMember
-            3, // member count
-                        5,
-            ACE_NTOHL (0x6e616d65), 
-            ACE_NTOHL (0x0),  // name = name
-                        CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              33,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4964), 
-              ACE_NTOHL (0x656e7469), 
-              ACE_NTOHL (0x66696572), 
-              ACE_NTOHL (0x3a312e30), 
-              ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                            11,
-              ACE_NTOHL (0x4964656e), 
-              ACE_NTOHL (0x74696669), 
-              ACE_NTOHL (0x65720000),  // name = Identifier
-                            CORBA::tk_string, 
-              0U, // string length
-
-            5,
-            ACE_NTOHL (0x74797065), 
-            ACE_NTOHL (0x0),  // name = type
-                        CORBA::tk_TypeCode,
-
-            9,
-            ACE_NTOHL (0x74797065), 
-            ACE_NTOHL (0x5f646566), 
-            ACE_NTOHL (0x0),  // name = type_def
-                        CORBA::tk_objref, // typecode kind
-            52, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              30,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4944), 
-              ACE_NTOHL (0x4c547970), 
-              ACE_NTOHL (0x653a312e), 
-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                            8,
-              ACE_NTOHL (0x49444c54), 
-              ACE_NTOHL (0x79706500),  // name = IDLType
-              
+                  # pragma instantiate \
+                    TAO_Var_Var_T< \
+                        ExceptionDescription \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Out_T< \
+                        ExceptionDescription, \
+                        ExceptionDescription_var \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+                  CORBA::ExcDescriptionSeq::ExcDescriptionSeq (void)
+                  {}
+
+                  CORBA::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::ExceptionDescription
+                        >
+                      (max)
+                  {}
+
+                  CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
+                      CORBA::ULong max,
+                      CORBA::ULong length,
+                      CORBA::ExceptionDescription* buffer,
+                      CORBA::Boolean release
+                    )
+                    : TAO_Unbounded_Sequence<
+                          CORBA::ExceptionDescription
+                        >
+                      (max, length, buffer, release)
+                  {}
+
+                  CORBA::ExcDescriptionSeq::ExcDescriptionSeq (const ExcDescriptionSeq &seq)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::ExceptionDescription
+                        >
+                      (seq)
+                  {}
+
+                  CORBA::ExcDescriptionSeq::~ExcDescriptionSeq (void)
+                  {}
+
+                  void CORBA::ExcDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    ExcDescriptionSeq *tmp = ACE_static_cast (ExcDescriptionSeq*, _tao_void_pointer);
+                    delete tmp;
+                  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+                  template class
+                    TAO_VarSeq_Var_T<
+                        ExcDescriptionSeq,
+                        CORBA::ExceptionDescription
+                      >;
+
+                  template class
+                    TAO_Seq_Out_T<
+                        ExcDescriptionSeq,
+                        ExcDescriptionSeq_var,
+                        CORBA::ExceptionDescription
+                      >;
 
-          0U,
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+                  # pragma instantiate \
+                    TAO_VarSeq_Var_T< \
+                        ExcDescriptionSeq, \
+                        CORBA::ExceptionDescription \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Seq_Out_T< \
+                        ExcDescriptionSeq, \
+                        ExcDescriptionSeq_var, \
+                        CORBA::ExceptionDescription \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    40,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f4578),
+                    ACE_NTOHL (0x63446573),
+                    ACE_NTOHL (0x63726970),
+                    ACE_NTOHL (0x74696f6e),
+                    ACE_NTOHL (0x5365713a),
+                    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                                        18,
+                    ACE_NTOHL (0x45786344),
+                    ACE_NTOHL (0x65736372),
+                    ACE_NTOHL (0x69707469),
+                    ACE_NTOHL (0x6f6e5365),
+                    ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                                        CORBA::tk_sequence, // typecode kind
+                    404, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      CORBA::tk_struct, // typecode kind
+                      388, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        43,
+                        ACE_NTOHL (0x49444c3a),
+                        ACE_NTOHL (0x6f6d672e),
+                        ACE_NTOHL (0x6f72672f),
+                        ACE_NTOHL (0x434f5242),
+                        ACE_NTOHL (0x412f4578),
+                        ACE_NTOHL (0x63657074),
+                        ACE_NTOHL (0x696f6e44),
+                        ACE_NTOHL (0x65736372),
+                        ACE_NTOHL (0x69707469),
+                        ACE_NTOHL (0x6f6e3a31),
+                        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                                                21,
+                        ACE_NTOHL (0x45786365),
+                        ACE_NTOHL (0x7074696f),
+                        ACE_NTOHL (0x6e446573),
+                        ACE_NTOHL (0x63726970),
+                        ACE_NTOHL (0x74696f6e),
+                        ACE_NTOHL (0x0),  // name = ExceptionDescription
+                        5, // member count
+                                                5,
+                        ACE_NTOHL (0x6e616d65),
+                        ACE_NTOHL (0x0),  // name = name
+                                                CORBA::tk_alias, // typecode kind for typedefs
+                        68, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          33,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f4964),
+                          ACE_NTOHL (0x656e7469),
+                          ACE_NTOHL (0x66696572),
+                          ACE_NTOHL (0x3a312e30),
+                          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                                    11,
+                          ACE_NTOHL (0x4964656e),
+                          ACE_NTOHL (0x74696669),
+                          ACE_NTOHL (0x65720000),  // name = Identifier
+                                                    CORBA::tk_string,
+                          0U, // string length
+
+                        3,
+                        ACE_NTOHL (0x69640000),  // name = id
+                                                CORBA::tk_alias, // typecode kind for typedefs
+                        72, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          35,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f5265),
+                          ACE_NTOHL (0x706f7369),
+                          ACE_NTOHL (0x746f7279),
+                          ACE_NTOHL (0x49643a31),
+                          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                                                    13,
+                          ACE_NTOHL (0x5265706f),
+                          ACE_NTOHL (0x7369746f),
+                          ACE_NTOHL (0x72794964),
+                          ACE_NTOHL (0x0),  // name = RepositoryId
+                                                    CORBA::tk_string,
+                          0U, // string length
+
+                        11,
+                        ACE_NTOHL (0x64656669),
+                        ACE_NTOHL (0x6e65645f),
+                        ACE_NTOHL (0x696e0000),  // name = defined_in
+                                                0xffffffff, // indirection
+                        0xffffff9c, // negative offset (-100)
+                        8,
+                        ACE_NTOHL (0x76657273),
+                        ACE_NTOHL (0x696f6e00),  // name = version
+                                                CORBA::tk_alias, // typecode kind for typedefs
+                        68, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          34,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f5665),
+                          ACE_NTOHL (0x7273696f),
+                          ACE_NTOHL (0x6e537065),
+                          ACE_NTOHL (0x633a312e),
+                          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                                                    12,
+                          ACE_NTOHL (0x56657273),
+                          ACE_NTOHL (0x696f6e53),
+                          ACE_NTOHL (0x70656300),  // name = VersionSpec
+                                                    CORBA::tk_string,
+                          0U, // string length
 
-      11,
-      ACE_NTOHL (0x65786365), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e730000),  // name = exceptions
-            CORBA::tk_alias, // typecode kind for typedefs
-      416, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x63446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x5365713a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-                18,
-        ACE_NTOHL (0x45786344), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e5365), 
-        ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
-                CORBA::tk_sequence, // typecode kind
-        336, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_struct, // typecode kind
-          320, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            43,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x434f5242), 
-            ACE_NTOHL (0x412f4578), 
-            ACE_NTOHL (0x63657074), 
-            ACE_NTOHL (0x696f6e44), 
-            ACE_NTOHL (0x65736372), 
-            ACE_NTOHL (0x69707469), 
-            ACE_NTOHL (0x6f6e3a31), 
-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-                        21,
-            ACE_NTOHL (0x45786365), 
-            ACE_NTOHL (0x7074696f), 
-            ACE_NTOHL (0x6e446573), 
-            ACE_NTOHL (0x63726970), 
-            ACE_NTOHL (0x74696f6e), 
-            ACE_NTOHL (0x0),  // name = ExceptionDescription
-            5, // member count
                         5,
-            ACE_NTOHL (0x6e616d65), 
-            ACE_NTOHL (0x0),  // name = name
-                        0xffffffff, // indirection
-            0xfffffe7c, // negative offset (-388)
-            3,
-            ACE_NTOHL (0x69640000),  // name = id
-                        CORBA::tk_alias, // typecode kind for typedefs
-            72, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              35,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5265), 
-              ACE_NTOHL (0x706f7369), 
-              ACE_NTOHL (0x746f7279), 
-              ACE_NTOHL (0x49643a31), 
-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                            13,
-              ACE_NTOHL (0x5265706f), 
-              ACE_NTOHL (0x7369746f), 
-              ACE_NTOHL (0x72794964), 
-              ACE_NTOHL (0x0),  // name = RepositoryId
-                            CORBA::tk_string, 
-              0U, // string length
-
-            11,
-            ACE_NTOHL (0x64656669), 
-            ACE_NTOHL (0x6e65645f), 
-            ACE_NTOHL (0x696e0000),  // name = defined_in
-                        0xffffffff, // indirection
-            0xffffff9c, // negative offset (-100)
-            8,
-            ACE_NTOHL (0x76657273), 
-            ACE_NTOHL (0x696f6e00),  // name = version
-                        CORBA::tk_alias, // typecode kind for typedefs
-            68, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              34,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5665), 
-              ACE_NTOHL (0x7273696f), 
-              ACE_NTOHL (0x6e537065), 
-              ACE_NTOHL (0x633a312e), 
-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-                            12,
-              ACE_NTOHL (0x56657273), 
-              ACE_NTOHL (0x696f6e53), 
-              ACE_NTOHL (0x70656300),  // name = VersionSpec
-                            CORBA::tk_string, 
-              0U, // string length
-
-            5,
-            ACE_NTOHL (0x74797065), 
-            ACE_NTOHL (0x0),  // name = type
-                        CORBA::tk_TypeCode,
+                        ACE_NTOHL (0x74797065),
+                        ACE_NTOHL (0x0),  // name = type
+                                                CORBA::tk_TypeCode,
 
 
-          0U,
-
-
-      5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-            0xffffffff, // indirection
-      0xfffffd8c, // negative offset (-628)
-
-    0U,
+                      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInitializerSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExtInitializerSeq),
-    (char *) &_oc_CORBA_ExtInitializerSeq,
-    0,
-    sizeof (CORBA::ExtInitializerSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExtInitializerSeq,
-    &_tc_TAO_tc_CORBA_ExtInitializerSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_UnionMember[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f556e), 
-  ACE_NTOHL (0x696f6e4d), 
-  ACE_NTOHL (0x656d6265), 
-  ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
-    12,
-  ACE_NTOHL (0x556e696f), 
-  ACE_NTOHL (0x6e4d656d), 
-  ACE_NTOHL (0x62657200),  // name = UnionMember
-  4, // member count
-    5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-        11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
-    ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
-    0U, // string length
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_ExcDescriptionSeq (
+                      CORBA::tk_alias,
+                      sizeof (_oc_CORBA_ExcDescriptionSeq),
+                      (char *) &_oc_CORBA_ExcDescriptionSeq,
+                      0,
+                      sizeof (CORBA::ExcDescriptionSeq)
+                    );
 
-  6,
-  ACE_NTOHL (0x6c616265), 
-  ACE_NTOHL (0x6c000000),  // name = label
-    CORBA::tk_any,
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_ExcDescriptionSeq,
+                      &_tc_TAO_tc_CORBA_ExcDescriptionSeq
+                    )
+                  TAO_NAMESPACE_END
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_ExtInitializer[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    37,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f4578),
+                    ACE_NTOHL (0x74496e69),
+                    ACE_NTOHL (0x7469616c),
+                    ACE_NTOHL (0x697a6572),
+                    ACE_NTOHL (0x3a312e30),
+                    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
+                                        15,
+                    ACE_NTOHL (0x45787449),
+                    ACE_NTOHL (0x6e697469),
+                    ACE_NTOHL (0x616c697a),
+                    ACE_NTOHL (0x65720000),  // name = ExtInitializer
+                    3, // member count
+                                        8,
+                    ACE_NTOHL (0x6d656d62),
+                    ACE_NTOHL (0x65727300),  // name = members
+                                        CORBA::tk_alias, // typecode kind for typedefs
+                    340, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      38,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f5374),
+                      ACE_NTOHL (0x72756374),
+                      ACE_NTOHL (0x4d656d62),
+                      ACE_NTOHL (0x65725365),
+                      ACE_NTOHL (0x713a312e),
+                      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
+                                            16,
+                      ACE_NTOHL (0x53747275),
+                      ACE_NTOHL (0x63744d65),
+                      ACE_NTOHL (0x6d626572),
+                      ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+                                            CORBA::tk_sequence, // typecode kind
+                      264, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        CORBA::tk_struct, // typecode kind
+                        248, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          35,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f5374),
+                          ACE_NTOHL (0x72756374),
+                          ACE_NTOHL (0x4d656d62),
+                          ACE_NTOHL (0x65723a31),
+                          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                                                    13,
+                          ACE_NTOHL (0x53747275),
+                          ACE_NTOHL (0x63744d65),
+                          ACE_NTOHL (0x6d626572),
+                          ACE_NTOHL (0x0),  // name = StructMember
+                          3, // member count
+                                                    5,
+                          ACE_NTOHL (0x6e616d65),
+                          ACE_NTOHL (0x0),  // name = name
+                                                    CORBA::tk_alias, // typecode kind for typedefs
+                          68, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            33,
+                            ACE_NTOHL (0x49444c3a),
+                            ACE_NTOHL (0x6f6d672e),
+                            ACE_NTOHL (0x6f72672f),
+                            ACE_NTOHL (0x434f5242),
+                            ACE_NTOHL (0x412f4964),
+                            ACE_NTOHL (0x656e7469),
+                            ACE_NTOHL (0x66696572),
+                            ACE_NTOHL (0x3a312e30),
+                            ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                                        11,
+                            ACE_NTOHL (0x4964656e),
+                            ACE_NTOHL (0x74696669),
+                            ACE_NTOHL (0x65720000),  // name = Identifier
+                                                        CORBA::tk_string,
+                            0U, // string length
+
+                          5,
+                          ACE_NTOHL (0x74797065),
+                          ACE_NTOHL (0x0),  // name = type
+                                                    CORBA::tk_TypeCode,
+
+                          9,
+                          ACE_NTOHL (0x74797065),
+                          ACE_NTOHL (0x5f646566),
+                          ACE_NTOHL (0x0),  // name = type_def
+                                                    CORBA::tk_objref, // typecode kind
+                          52, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            30,
+                            ACE_NTOHL (0x49444c3a),
+                            ACE_NTOHL (0x6f6d672e),
+                            ACE_NTOHL (0x6f72672f),
+                            ACE_NTOHL (0x434f5242),
+                            ACE_NTOHL (0x412f4944),
+                            ACE_NTOHL (0x4c547970),
+                            ACE_NTOHL (0x653a312e),
+                            ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                                        8,
+                            ACE_NTOHL (0x49444c54),
+                            ACE_NTOHL (0x79706500),  // name = IDLType
+
+
+                        0U,
 
-  5,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x0),  // name = type
-    CORBA::tk_TypeCode,
 
-  9,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x5f646566), 
-  ACE_NTOHL (0x0),  // name = type_def
-    CORBA::tk_objref, // typecode kind
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4944), 
-    ACE_NTOHL (0x4c547970), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-        8,
-    ACE_NTOHL (0x49444c54), 
-    ACE_NTOHL (0x79706500),  // name = IDLType
-    
+                    11,
+                    ACE_NTOHL (0x65786365),
+                    ACE_NTOHL (0x7074696f),
+                    ACE_NTOHL (0x6e730000),  // name = exceptions
+                                        CORBA::tk_alias, // typecode kind for typedefs
+                    416, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      40,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f4578),
+                      ACE_NTOHL (0x63446573),
+                      ACE_NTOHL (0x63726970),
+                      ACE_NTOHL (0x74696f6e),
+                      ACE_NTOHL (0x5365713a),
+                      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                                            18,
+                      ACE_NTOHL (0x45786344),
+                      ACE_NTOHL (0x65736372),
+                      ACE_NTOHL (0x69707469),
+                      ACE_NTOHL (0x6f6e5365),
+                      ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                                            CORBA::tk_sequence, // typecode kind
+                      336, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        CORBA::tk_struct, // typecode kind
+                        320, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          43,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f4578),
+                          ACE_NTOHL (0x63657074),
+                          ACE_NTOHL (0x696f6e44),
+                          ACE_NTOHL (0x65736372),
+                          ACE_NTOHL (0x69707469),
+                          ACE_NTOHL (0x6f6e3a31),
+                          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                                                    21,
+                          ACE_NTOHL (0x45786365),
+                          ACE_NTOHL (0x7074696f),
+                          ACE_NTOHL (0x6e446573),
+                          ACE_NTOHL (0x63726970),
+                          ACE_NTOHL (0x74696f6e),
+                          ACE_NTOHL (0x0),  // name = ExceptionDescription
+                          5, // member count
+                                                    5,
+                          ACE_NTOHL (0x6e616d65),
+                          ACE_NTOHL (0x0),  // name = name
+                                                    0xffffffff, // indirection
+                          0xfffffe7c, // negative offset (-388)
+                          3,
+                          ACE_NTOHL (0x69640000),  // name = id
+                                                    CORBA::tk_alias, // typecode kind for typedefs
+                          72, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            35,
+                            ACE_NTOHL (0x49444c3a),
+                            ACE_NTOHL (0x6f6d672e),
+                            ACE_NTOHL (0x6f72672f),
+                            ACE_NTOHL (0x434f5242),
+                            ACE_NTOHL (0x412f5265),
+                            ACE_NTOHL (0x706f7369),
+                            ACE_NTOHL (0x746f7279),
+                            ACE_NTOHL (0x49643a31),
+                            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                                                        13,
+                            ACE_NTOHL (0x5265706f),
+                            ACE_NTOHL (0x7369746f),
+                            ACE_NTOHL (0x72794964),
+                            ACE_NTOHL (0x0),  // name = RepositoryId
+                                                        CORBA::tk_string,
+                            0U, // string length
+
+                          11,
+                          ACE_NTOHL (0x64656669),
+                          ACE_NTOHL (0x6e65645f),
+                          ACE_NTOHL (0x696e0000),  // name = defined_in
+                                                    0xffffffff, // indirection
+                          0xffffff9c, // negative offset (-100)
+                          8,
+                          ACE_NTOHL (0x76657273),
+                          ACE_NTOHL (0x696f6e00),  // name = version
+                                                    CORBA::tk_alias, // typecode kind for typedefs
+                          68, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            34,
+                            ACE_NTOHL (0x49444c3a),
+                            ACE_NTOHL (0x6f6d672e),
+                            ACE_NTOHL (0x6f72672f),
+                            ACE_NTOHL (0x434f5242),
+                            ACE_NTOHL (0x412f5665),
+                            ACE_NTOHL (0x7273696f),
+                            ACE_NTOHL (0x6e537065),
+                            ACE_NTOHL (0x633a312e),
+                            ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                                                        12,
+                            ACE_NTOHL (0x56657273),
+                            ACE_NTOHL (0x696f6e53),
+                            ACE_NTOHL (0x70656300),  // name = VersionSpec
+                                                        CORBA::tk_string,
+                            0U, // string length
+
+                          5,
+                          ACE_NTOHL (0x74797065),
+                          ACE_NTOHL (0x0),  // name = type
+                                                    CORBA::tk_TypeCode,
+
+
+                        0U,
+
+
+                    5,
+                    ACE_NTOHL (0x6e616d65),
+                    ACE_NTOHL (0x0),  // name = name
+                                        0xffffffff, // indirection
+                    0xfffffd8c, // negative offset (-628)
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMember (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_UnionMember),
-    (char *) &_oc_CORBA_UnionMember,
-    0,
-    sizeof (CORBA::UnionMember)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_UnionMember,
-    &_tc_TAO_tc_CORBA_UnionMember
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
-
-void CORBA::UnionMember::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UnionMember *tmp = ACE_static_cast (UnionMember*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::UnionMember* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::UnionMember *old =
-        ACE_reinterpret_cast (CORBA::UnionMember *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::UnionMember *tmp =
-    ACE_reinterpret_cast (CORBA::UnionMember *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_UNIONMEMBERSEQ_CS_)
-#define _CORBA_UNIONMEMBERSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::UnionMemberSeq
-// *************************************************************
-
-CORBA::UnionMemberSeq::UnionMemberSeq (void)
-{}
-
-CORBA::UnionMemberSeq::UnionMemberSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::UnionMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInitializer (
+                      CORBA::tk_struct,
+                      sizeof (_oc_CORBA_ExtInitializer),
+                      (char *) &_oc_CORBA_ExtInitializer,
+                      0,
+                      sizeof (CORBA::ExtInitializer)
+                    );
 
-CORBA::UnionMemberSeq::UnionMemberSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::UnionMember *buffer,
-    CORBA::Boolean release
-  )
-  : 
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_ExtInitializer,
+                      &_tc_TAO_tc_CORBA_ExtInitializer
+                    )
+                  TAO_NAMESPACE_END
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::UnionMember>
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
+                  void CORBA::ExtInitializer::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    ExtInitializer *tmp = ACE_static_cast (ExtInitializer*, _tao_void_pointer);
+                    delete tmp;
+                  }
 
-CORBA::UnionMemberSeq::UnionMemberSeq (const UnionMemberSeq &seq)
-  : 
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::UnionMember>
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+                  template class
+                    TAO_Var_Var_T<
+                        ExtInitializer
+                      >;
 
-CORBA::UnionMemberSeq::~UnionMemberSeq (void) // dtor
-{}
+                  template class
+                    TAO_Out_T<
+                        ExtInitializer,
+                        ExtInitializer_var
+                      >;
 
-void CORBA::UnionMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  UnionMemberSeq *tmp = ACE_static_cast (UnionMemberSeq*, _tao_void_pointer);
-  delete tmp;
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+                  # pragma instantiate \
+                    TAO_Var_Var_T< \
+                        ExtInitializer \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Out_T< \
+                        ExtInitializer, \
+                        ExtInitializer_var \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+                  CORBA::ExtInitializerSeq::ExtInitializerSeq (void)
+                  {}
+
+                  CORBA::ExtInitializerSeq::ExtInitializerSeq (CORBA::ULong max)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::ExtInitializer
+                        >
+                      (max)
+                  {}
+
+                  CORBA::ExtInitializerSeq::ExtInitializerSeq (
+                      CORBA::ULong max,
+                      CORBA::ULong length,
+                      CORBA::ExtInitializer* buffer,
+                      CORBA::Boolean release
+                    )
+                    : TAO_Unbounded_Sequence<
+                          CORBA::ExtInitializer
+                        >
+                      (max, length, buffer, release)
+                  {}
+
+                  CORBA::ExtInitializerSeq::ExtInitializerSeq (const ExtInitializerSeq &seq)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::ExtInitializer
+                        >
+                      (seq)
+                  {}
+
+                  CORBA::ExtInitializerSeq::~ExtInitializerSeq (void)
+                  {}
+
+                  void CORBA::ExtInitializerSeq::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    ExtInitializerSeq *tmp = ACE_static_cast (ExtInitializerSeq*, _tao_void_pointer);
+                    delete tmp;
+                  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+                  template class
+                    TAO_VarSeq_Var_T<
+                        ExtInitializerSeq,
+                        CORBA::ExtInitializer
+                      >;
+
+                  template class
+                    TAO_Seq_Out_T<
+                        ExtInitializerSeq,
+                        ExtInitializerSeq_var,
+                        CORBA::ExtInitializer
+                      >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f556e), 
-  ACE_NTOHL (0x696f6e4d), 
-  ACE_NTOHL (0x656d6265), 
-  ACE_NTOHL (0x72536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/UnionMemberSeq:1.0
-    15,
-  ACE_NTOHL (0x556e696f), 
-  ACE_NTOHL (0x6e4d656d), 
-  ACE_NTOHL (0x62657253), 
-  ACE_NTOHL (0x65710000),  // name = UnionMemberSeq
-    CORBA::tk_sequence, // typecode kind
-  276, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    260, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f556e), 
-      ACE_NTOHL (0x696f6e4d), 
-      ACE_NTOHL (0x656d6265), 
-      ACE_NTOHL (0x723a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
-            12,
-      ACE_NTOHL (0x556e696f), 
-      ACE_NTOHL (0x6e4d656d), 
-      ACE_NTOHL (0x62657200),  // name = UnionMember
-      4, // member count
-            5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
-        ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-        0U, // string length
+                  # pragma instantiate \
+                    TAO_VarSeq_Var_T< \
+                        ExtInitializerSeq, \
+                        CORBA::ExtInitializer \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Seq_Out_T< \
+                        ExtInitializerSeq, \
+                        ExtInitializerSeq_var, \
+                        CORBA::ExtInitializer \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_ExtInitializerSeq[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    40,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f4578),
+                    ACE_NTOHL (0x74496e69),
+                    ACE_NTOHL (0x7469616c),
+                    ACE_NTOHL (0x697a6572),
+                    ACE_NTOHL (0x5365713a),
+                    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtInitializerSeq:1.0
+                                        18,
+                    ACE_NTOHL (0x45787449),
+                    ACE_NTOHL (0x6e697469),
+                    ACE_NTOHL (0x616c697a),
+                    ACE_NTOHL (0x65725365),
+                    ACE_NTOHL (0x71000000),  // name = ExtInitializerSeq
+                                        CORBA::tk_sequence, // typecode kind
+                    908, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      CORBA::tk_struct, // typecode kind
+                      892, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        37,
+                        ACE_NTOHL (0x49444c3a),
+                        ACE_NTOHL (0x6f6d672e),
+                        ACE_NTOHL (0x6f72672f),
+                        ACE_NTOHL (0x434f5242),
+                        ACE_NTOHL (0x412f4578),
+                        ACE_NTOHL (0x74496e69),
+                        ACE_NTOHL (0x7469616c),
+                        ACE_NTOHL (0x697a6572),
+                        ACE_NTOHL (0x3a312e30),
+                        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
+                                                15,
+                        ACE_NTOHL (0x45787449),
+                        ACE_NTOHL (0x6e697469),
+                        ACE_NTOHL (0x616c697a),
+                        ACE_NTOHL (0x65720000),  // name = ExtInitializer
+                        3, // member count
+                                                8,
+                        ACE_NTOHL (0x6d656d62),
+                        ACE_NTOHL (0x65727300),  // name = members
+                                                CORBA::tk_alias, // typecode kind for typedefs
+                        340, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          38,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f5374),
+                          ACE_NTOHL (0x72756374),
+                          ACE_NTOHL (0x4d656d62),
+                          ACE_NTOHL (0x65725365),
+                          ACE_NTOHL (0x713a312e),
+                          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
+                                                    16,
+                          ACE_NTOHL (0x53747275),
+                          ACE_NTOHL (0x63744d65),
+                          ACE_NTOHL (0x6d626572),
+                          ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+                                                    CORBA::tk_sequence, // typecode kind
+                          264, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            CORBA::tk_struct, // typecode kind
+                            248, // encapsulation length
+                              TAO_ENCAP_BYTE_ORDER, // byte order
+                              35,
+                              ACE_NTOHL (0x49444c3a),
+                              ACE_NTOHL (0x6f6d672e),
+                              ACE_NTOHL (0x6f72672f),
+                              ACE_NTOHL (0x434f5242),
+                              ACE_NTOHL (0x412f5374),
+                              ACE_NTOHL (0x72756374),
+                              ACE_NTOHL (0x4d656d62),
+                              ACE_NTOHL (0x65723a31),
+                              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
+                                                            13,
+                              ACE_NTOHL (0x53747275),
+                              ACE_NTOHL (0x63744d65),
+                              ACE_NTOHL (0x6d626572),
+                              ACE_NTOHL (0x0),  // name = StructMember
+                              3, // member count
+                                                            5,
+                              ACE_NTOHL (0x6e616d65),
+                              ACE_NTOHL (0x0),  // name = name
+                                                            CORBA::tk_alias, // typecode kind for typedefs
+                              68, // encapsulation length
+                                TAO_ENCAP_BYTE_ORDER, // byte order
+                                33,
+                                ACE_NTOHL (0x49444c3a),
+                                ACE_NTOHL (0x6f6d672e),
+                                ACE_NTOHL (0x6f72672f),
+                                ACE_NTOHL (0x434f5242),
+                                ACE_NTOHL (0x412f4964),
+                                ACE_NTOHL (0x656e7469),
+                                ACE_NTOHL (0x66696572),
+                                ACE_NTOHL (0x3a312e30),
+                                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                                                11,
+                                ACE_NTOHL (0x4964656e),
+                                ACE_NTOHL (0x74696669),
+                                ACE_NTOHL (0x65720000),  // name = Identifier
+                                                                CORBA::tk_string,
+                                0U, // string length
+
+                              5,
+                              ACE_NTOHL (0x74797065),
+                              ACE_NTOHL (0x0),  // name = type
+                                                            CORBA::tk_TypeCode,
+
+                              9,
+                              ACE_NTOHL (0x74797065),
+                              ACE_NTOHL (0x5f646566),
+                              ACE_NTOHL (0x0),  // name = type_def
+                                                            CORBA::tk_objref, // typecode kind
+                              52, // encapsulation length
+                                TAO_ENCAP_BYTE_ORDER, // byte order
+                                30,
+                                ACE_NTOHL (0x49444c3a),
+                                ACE_NTOHL (0x6f6d672e),
+                                ACE_NTOHL (0x6f72672f),
+                                ACE_NTOHL (0x434f5242),
+                                ACE_NTOHL (0x412f4944),
+                                ACE_NTOHL (0x4c547970),
+                                ACE_NTOHL (0x653a312e),
+                                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                                                8,
+                                ACE_NTOHL (0x49444c54),
+                                ACE_NTOHL (0x79706500),  // name = IDLType
+
+
+                            0U,
+
+
+                        11,
+                        ACE_NTOHL (0x65786365),
+                        ACE_NTOHL (0x7074696f),
+                        ACE_NTOHL (0x6e730000),  // name = exceptions
+                                                CORBA::tk_alias, // typecode kind for typedefs
+                        416, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          40,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f4578),
+                          ACE_NTOHL (0x63446573),
+                          ACE_NTOHL (0x63726970),
+                          ACE_NTOHL (0x74696f6e),
+                          ACE_NTOHL (0x5365713a),
+                          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
+                                                    18,
+                          ACE_NTOHL (0x45786344),
+                          ACE_NTOHL (0x65736372),
+                          ACE_NTOHL (0x69707469),
+                          ACE_NTOHL (0x6f6e5365),
+                          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+                                                    CORBA::tk_sequence, // typecode kind
+                          336, // encapsulation length
+                            TAO_ENCAP_BYTE_ORDER, // byte order
+                            CORBA::tk_struct, // typecode kind
+                            320, // encapsulation length
+                              TAO_ENCAP_BYTE_ORDER, // byte order
+                              43,
+                              ACE_NTOHL (0x49444c3a),
+                              ACE_NTOHL (0x6f6d672e),
+                              ACE_NTOHL (0x6f72672f),
+                              ACE_NTOHL (0x434f5242),
+                              ACE_NTOHL (0x412f4578),
+                              ACE_NTOHL (0x63657074),
+                              ACE_NTOHL (0x696f6e44),
+                              ACE_NTOHL (0x65736372),
+                              ACE_NTOHL (0x69707469),
+                              ACE_NTOHL (0x6f6e3a31),
+                              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
+                                                            21,
+                              ACE_NTOHL (0x45786365),
+                              ACE_NTOHL (0x7074696f),
+                              ACE_NTOHL (0x6e446573),
+                              ACE_NTOHL (0x63726970),
+                              ACE_NTOHL (0x74696f6e),
+                              ACE_NTOHL (0x0),  // name = ExceptionDescription
+                              5, // member count
+                                                            5,
+                              ACE_NTOHL (0x6e616d65),
+                              ACE_NTOHL (0x0),  // name = name
+                                                            0xffffffff, // indirection
+                              0xfffffe7c, // negative offset (-388)
+                              3,
+                              ACE_NTOHL (0x69640000),  // name = id
+                                                            CORBA::tk_alias, // typecode kind for typedefs
+                              72, // encapsulation length
+                                TAO_ENCAP_BYTE_ORDER, // byte order
+                                35,
+                                ACE_NTOHL (0x49444c3a),
+                                ACE_NTOHL (0x6f6d672e),
+                                ACE_NTOHL (0x6f72672f),
+                                ACE_NTOHL (0x434f5242),
+                                ACE_NTOHL (0x412f5265),
+                                ACE_NTOHL (0x706f7369),
+                                ACE_NTOHL (0x746f7279),
+                                ACE_NTOHL (0x49643a31),
+                                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+                                                                13,
+                                ACE_NTOHL (0x5265706f),
+                                ACE_NTOHL (0x7369746f),
+                                ACE_NTOHL (0x72794964),
+                                ACE_NTOHL (0x0),  // name = RepositoryId
+                                                                CORBA::tk_string,
+                                0U, // string length
+
+                              11,
+                              ACE_NTOHL (0x64656669),
+                              ACE_NTOHL (0x6e65645f),
+                              ACE_NTOHL (0x696e0000),  // name = defined_in
+                                                            0xffffffff, // indirection
+                              0xffffff9c, // negative offset (-100)
+                              8,
+                              ACE_NTOHL (0x76657273),
+                              ACE_NTOHL (0x696f6e00),  // name = version
+                                                            CORBA::tk_alias, // typecode kind for typedefs
+                              68, // encapsulation length
+                                TAO_ENCAP_BYTE_ORDER, // byte order
+                                34,
+                                ACE_NTOHL (0x49444c3a),
+                                ACE_NTOHL (0x6f6d672e),
+                                ACE_NTOHL (0x6f72672f),
+                                ACE_NTOHL (0x434f5242),
+                                ACE_NTOHL (0x412f5665),
+                                ACE_NTOHL (0x7273696f),
+                                ACE_NTOHL (0x6e537065),
+                                ACE_NTOHL (0x633a312e),
+                                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                                                                12,
+                                ACE_NTOHL (0x56657273),
+                                ACE_NTOHL (0x696f6e53),
+                                ACE_NTOHL (0x70656300),  // name = VersionSpec
+                                                                CORBA::tk_string,
+                                0U, // string length
+
+                              5,
+                              ACE_NTOHL (0x74797065),
+                              ACE_NTOHL (0x0),  // name = type
+                                                            CORBA::tk_TypeCode,
+
+
+                            0U,
 
-      6,
-      ACE_NTOHL (0x6c616265), 
-      ACE_NTOHL (0x6c000000),  // name = label
-            CORBA::tk_any,
 
-      5,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x0),  // name = type
-            CORBA::tk_TypeCode,
-
-      9,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x5f646566), 
-      ACE_NTOHL (0x0),  // name = type_def
-            CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4944), 
-        ACE_NTOHL (0x4c547970), 
-        ACE_NTOHL (0x653a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8,
-        ACE_NTOHL (0x49444c54), 
-        ACE_NTOHL (0x79706500),  // name = IDLType
-        
+                        5,
+                        ACE_NTOHL (0x6e616d65),
+                        ACE_NTOHL (0x0),  // name = name
+                                                0xffffffff, // indirection
+                        0xfffffd8c, // negative offset (-628)
 
-    0U,
+                      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMemberSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_UnionMemberSeq),
-    (char *) &_oc_CORBA_UnionMemberSeq,
-    0,
-    sizeof (CORBA::UnionMemberSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_UnionMemberSeq,
-    &_tc_TAO_tc_CORBA_UnionMemberSeq
-  )
-TAO_NAMESPACE_END
-
-#if !defined (_CORBA_ENUMMEMBERSEQ_CS_)
-#define _CORBA_ENUMMEMBERSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::EnumMemberSeq
-// *************************************************************
-
-CORBA::EnumMemberSeq::EnumMemberSeq (void)
-{}
-
-CORBA::EnumMemberSeq::EnumMemberSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::EnumMemberSeq::EnumMemberSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    char * *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::EnumMemberSeq::EnumMemberSeq (const EnumMemberSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::EnumMemberSeq::~EnumMemberSeq (void) // dtor
-{}
-
-void CORBA::EnumMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  EnumMemberSeq *tmp = ACE_static_cast (EnumMemberSeq*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f456e), 
-  ACE_NTOHL (0x756d4d65), 
-  ACE_NTOHL (0x6d626572), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/EnumMemberSeq:1.0
-    14,
-  ACE_NTOHL (0x456e756d), 
-  ACE_NTOHL (0x4d656d62), 
-  ACE_NTOHL (0x65725365), 
-  ACE_NTOHL (0x71000000),  // name = EnumMemberSeq
-    CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4964), 
-      ACE_NTOHL (0x656e7469), 
-      ACE_NTOHL (0x66696572), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-            11,
-      ACE_NTOHL (0x4964656e), 
-      ACE_NTOHL (0x74696669), 
-      ACE_NTOHL (0x65720000),  // name = Identifier
-            CORBA::tk_string, 
-      0U, // string length
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtInitializerSeq (
+                      CORBA::tk_alias,
+                      sizeof (_oc_CORBA_ExtInitializerSeq),
+                      (char *) &_oc_CORBA_ExtInitializerSeq,
+                      0,
+                      sizeof (CORBA::ExtInitializerSeq)
+                    );
 
-    0U,
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_ExtInitializerSeq,
+                      &_tc_TAO_tc_CORBA_ExtInitializerSeq
+                    )
+                  TAO_NAMESPACE_END
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_UnionMember[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    34,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f556e),
+                    ACE_NTOHL (0x696f6e4d),
+                    ACE_NTOHL (0x656d6265),
+                    ACE_NTOHL (0x723a312e),
+                    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
+                                        12,
+                    ACE_NTOHL (0x556e696f),
+                    ACE_NTOHL (0x6e4d656d),
+                    ACE_NTOHL (0x62657200),  // name = UnionMember
+                    4, // member count
+                                        5,
+                    ACE_NTOHL (0x6e616d65),
+                    ACE_NTOHL (0x0),  // name = name
+                                        CORBA::tk_alias, // typecode kind for typedefs
+                    68, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      33,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f4964),
+                      ACE_NTOHL (0x656e7469),
+                      ACE_NTOHL (0x66696572),
+                      ACE_NTOHL (0x3a312e30),
+                      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                            11,
+                      ACE_NTOHL (0x4964656e),
+                      ACE_NTOHL (0x74696669),
+                      ACE_NTOHL (0x65720000),  // name = Identifier
+                                            CORBA::tk_string,
+                      0U, // string length
+
+                    6,
+                    ACE_NTOHL (0x6c616265),
+                    ACE_NTOHL (0x6c000000),  // name = label
+                                        CORBA::tk_any,
+
+                    5,
+                    ACE_NTOHL (0x74797065),
+                    ACE_NTOHL (0x0),  // name = type
+                                        CORBA::tk_TypeCode,
+
+                    9,
+                    ACE_NTOHL (0x74797065),
+                    ACE_NTOHL (0x5f646566),
+                    ACE_NTOHL (0x0),  // name = type_def
+                                        CORBA::tk_objref, // typecode kind
+                    52, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      30,
+                      ACE_NTOHL (0x49444c3a),
+                      ACE_NTOHL (0x6f6d672e),
+                      ACE_NTOHL (0x6f72672f),
+                      ACE_NTOHL (0x434f5242),
+                      ACE_NTOHL (0x412f4944),
+                      ACE_NTOHL (0x4c547970),
+                      ACE_NTOHL (0x653a312e),
+                      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                            8,
+                      ACE_NTOHL (0x49444c54),
+                      ACE_NTOHL (0x79706500),  // name = IDLType
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumMemberSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_EnumMemberSeq),
-    (char *) &_oc_CORBA_EnumMemberSeq,
-    0,
-    sizeof (CORBA::EnumMemberSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_EnumMemberSeq,
-    &_tc_TAO_tc_CORBA_EnumMemberSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMember (
+                      CORBA::tk_struct,
+                      sizeof (_oc_CORBA_UnionMember),
+                      (char *) &_oc_CORBA_UnionMember,
+                      0,
+                      sizeof (CORBA::UnionMember)
+                    );
 
-int CORBA::Container::_tao_class_id = 0;
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_UnionMember,
+                      &_tc_TAO_tc_CORBA_UnionMember
+                    )
+                  TAO_NAMESPACE_END
 
-CORBA::Container_ptr
-tao_CORBA_Container_duplicate (
-    CORBA::Container_ptr p
-  )
-{
-  return CORBA::Container::_duplicate (p);
-}
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void
-tao_CORBA_Container_release (
-    CORBA::Container_ptr p
-  )
-{
-  CORBA::release (p);
-}
+                  void CORBA::UnionMember::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    UnionMember *tmp = ACE_static_cast (UnionMember*, _tao_void_pointer);
+                    delete tmp;
+                  }
 
-CORBA::Container_ptr
-tao_CORBA_Container_nil (
-    void
-  )
-{
-  return CORBA::Container::_nil ();
-}
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-CORBA::Container_ptr
-tao_CORBA_Container_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-CORBA::Object *
-tao_CORBA_Container_upcast (
-    void *src
-  )
-{
-  CORBA::Container **tmp =
-    ACE_static_cast (CORBA::Container **, src);
-  return *tmp;
-}
+                  template class
+                    TAO_Var_Var_T<
+                        UnionMember
+                      >;
 
-CORBA::Boolean
-tao_CORBA_Container_marshal (
-    CORBA::Container_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
+                  template class
+                    TAO_Out_T<
+                        UnionMember,
+                        UnionMember_var
+                      >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-// *************************************************************
-// CORBA::Container_var
-// *************************************************************
+                  # pragma instantiate \
+                    TAO_Var_Var_T< \
+                        UnionMember \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Out_T< \
+                        UnionMember, \
+                        UnionMember_var \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+
+                  CORBA::UnionMemberSeq::UnionMemberSeq (void)
+                  {}
+
+                  CORBA::UnionMemberSeq::UnionMemberSeq (CORBA::ULong max)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::UnionMember
+                        >
+                      (max)
+                  {}
+
+                  CORBA::UnionMemberSeq::UnionMemberSeq (
+                      CORBA::ULong max,
+                      CORBA::ULong length,
+                      CORBA::UnionMember* buffer,
+                      CORBA::Boolean release
+                    )
+                    : TAO_Unbounded_Sequence<
+                          CORBA::UnionMember
+                        >
+                      (max, length, buffer, release)
+                  {}
+
+                  CORBA::UnionMemberSeq::UnionMemberSeq (const UnionMemberSeq &seq)
+                    : TAO_Unbounded_Sequence<
+                          CORBA::UnionMember
+                        >
+                      (seq)
+                  {}
+
+                  CORBA::UnionMemberSeq::~UnionMemberSeq (void)
+                  {}
+
+                  void CORBA::UnionMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    UnionMemberSeq *tmp = ACE_static_cast (UnionMemberSeq*, _tao_void_pointer);
+                    delete tmp;
+                  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+                  template class
+                    TAO_VarSeq_Var_T<
+                        UnionMemberSeq,
+                        CORBA::UnionMember
+                      >;
+
+                  template class
+                    TAO_Seq_Out_T<
+                        UnionMemberSeq,
+                        UnionMemberSeq_var,
+                        CORBA::UnionMember
+                      >;
 
-CORBA::Container_var::Container_var (void)
-  : ptr_ (Container::_nil ())
-{}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-::CORBA::Container_ptr
-CORBA::Container_var::ptr (void) const
-{
-  return this->ptr_;
-}
+                  # pragma instantiate \
+                    TAO_VarSeq_Var_T< \
+                        UnionMemberSeq, \
+                        CORBA::UnionMember \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Seq_Out_T< \
+                        UnionMemberSeq, \
+                        UnionMemberSeq_var, \
+                        CORBA::UnionMember \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    37,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f556e),
+                    ACE_NTOHL (0x696f6e4d),
+                    ACE_NTOHL (0x656d6265),
+                    ACE_NTOHL (0x72536571),
+                    ACE_NTOHL (0x3a312e30),
+                    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/UnionMemberSeq:1.0
+                                        15,
+                    ACE_NTOHL (0x556e696f),
+                    ACE_NTOHL (0x6e4d656d),
+                    ACE_NTOHL (0x62657253),
+                    ACE_NTOHL (0x65710000),  // name = UnionMemberSeq
+                                        CORBA::tk_sequence, // typecode kind
+                    276, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      CORBA::tk_struct, // typecode kind
+                      260, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        34,
+                        ACE_NTOHL (0x49444c3a),
+                        ACE_NTOHL (0x6f6d672e),
+                        ACE_NTOHL (0x6f72672f),
+                        ACE_NTOHL (0x434f5242),
+                        ACE_NTOHL (0x412f556e),
+                        ACE_NTOHL (0x696f6e4d),
+                        ACE_NTOHL (0x656d6265),
+                        ACE_NTOHL (0x723a312e),
+                        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/UnionMember:1.0
+                                                12,
+                        ACE_NTOHL (0x556e696f),
+                        ACE_NTOHL (0x6e4d656d),
+                        ACE_NTOHL (0x62657200),  // name = UnionMember
+                        4, // member count
+                                                5,
+                        ACE_NTOHL (0x6e616d65),
+                        ACE_NTOHL (0x0),  // name = name
+                                                CORBA::tk_alias, // typecode kind for typedefs
+                        68, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          33,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f4964),
+                          ACE_NTOHL (0x656e7469),
+                          ACE_NTOHL (0x66696572),
+                          ACE_NTOHL (0x3a312e30),
+                          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                                    11,
+                          ACE_NTOHL (0x4964656e),
+                          ACE_NTOHL (0x74696669),
+                          ACE_NTOHL (0x65720000),  // name = Identifier
+                                                    CORBA::tk_string,
+                          0U, // string length
+
+                        6,
+                        ACE_NTOHL (0x6c616265),
+                        ACE_NTOHL (0x6c000000),  // name = label
+                                                CORBA::tk_any,
 
-CORBA::Container_var::Container_var (const ::CORBA::Container_var &p)
-  : TAO_Base_var (),
-    ptr_ (Container::_duplicate (p.ptr ()))
-{}
+                        5,
+                        ACE_NTOHL (0x74797065),
+                        ACE_NTOHL (0x0),  // name = type
+                                                CORBA::tk_TypeCode,
+
+                        9,
+                        ACE_NTOHL (0x74797065),
+                        ACE_NTOHL (0x5f646566),
+                        ACE_NTOHL (0x0),  // name = type_def
+                                                CORBA::tk_objref, // typecode kind
+                        52, // encapsulation length
+                          TAO_ENCAP_BYTE_ORDER, // byte order
+                          30,
+                          ACE_NTOHL (0x49444c3a),
+                          ACE_NTOHL (0x6f6d672e),
+                          ACE_NTOHL (0x6f72672f),
+                          ACE_NTOHL (0x434f5242),
+                          ACE_NTOHL (0x412f4944),
+                          ACE_NTOHL (0x4c547970),
+                          ACE_NTOHL (0x653a312e),
+                          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
+                                                    8,
+                          ACE_NTOHL (0x49444c54),
+                          ACE_NTOHL (0x79706500),  // name = IDLType
+
+
+                      0U,
 
-CORBA::Container_var::~Container_var (void)
-{
-  CORBA::release (this->ptr_);
-}
+};
 
-CORBA::Container_var &
-CORBA::Container_var::operator= (Container_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMemberSeq (
+                      CORBA::tk_alias,
+                      sizeof (_oc_CORBA_UnionMemberSeq),
+                      (char *) &_oc_CORBA_UnionMemberSeq,
+                      0,
+                      sizeof (CORBA::UnionMemberSeq)
+                    );
 
-CORBA::Container_var &
-CORBA::Container_var::operator= (const ::CORBA::Container_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::Container::_duplicate (p.ptr ());
-  }
-  return *this;
-}
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_UnionMemberSeq,
+                      &_tc_TAO_tc_CORBA_UnionMemberSeq
+                    )
+                  TAO_NAMESPACE_END
 
-CORBA::Container_var::operator const ::CORBA::Container_ptr &() const // cast
-{
-  return this->ptr_;
-}
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
-CORBA::Container_var::operator ::CORBA::Container_ptr &() // cast 
-{
-  return this->ptr_;
-}
+                  CORBA::EnumMemberSeq::EnumMemberSeq (void)
+                  {}
 
-::CORBA::Container_ptr
-CORBA::Container_var::operator-> (void) const
-{
-  return this->ptr_;
-}
+                  CORBA::EnumMemberSeq::EnumMemberSeq (CORBA::ULong max)
+                    : TAO_Unbounded_String_Sequence
+                      (max)
+                  {}
 
-::CORBA::Container_ptr
-CORBA::Container_var::in (void) const
-{
-  return this->ptr_;
-}
+                  CORBA::EnumMemberSeq::EnumMemberSeq (
+                      CORBA::ULong max,
+                      CORBA::ULong length,
+                      char ** buffer,
+                      CORBA::Boolean release
+                    )
+                    : TAO_Unbounded_String_Sequence
+                      (max, length, buffer, release)
+                  {}
+
+                  CORBA::EnumMemberSeq::EnumMemberSeq (const EnumMemberSeq &seq)
+                    : TAO_Unbounded_String_Sequence
+                      (seq)
+                  {}
+
+                  CORBA::EnumMemberSeq::~EnumMemberSeq (void)
+                  {}
+
+                  void CORBA::EnumMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
+                  {
+                    EnumMemberSeq *tmp = ACE_static_cast (EnumMemberSeq*, _tao_void_pointer);
+                    delete tmp;
+                  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+                  template class
+                    TAO_MngSeq_Var_T<
+                        CORBA::EnumMemberSeq,
+                        TAO_SeqElem_String_Manager
+                      >;
+
+                  template class
+                    TAO_Seq_Out_T<
+                        CORBA::EnumMemberSeq,
+                        CORBA::EnumMemberSeq_var,
+                        TAO_SeqElem_String_Manager
+                      >;
 
-::CORBA::Container_ptr &
-CORBA::Container_var::inout (void)
-{
-  return this->ptr_;
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-::CORBA::Container_ptr &
-CORBA::Container_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Container::_nil ();
-  return this->ptr_;
-}
+                  # pragma instantiate \
+                    TAO_MngSeq_Var_T< \
+                        CORBA::EnumMemberSeq, \
+                        TAO_SeqElem_String_Manager \
+                      >
+
+                  # pragma instantiate \
+                    TAO_Seq_Out_T< \
+                        CORBA::EnumMemberSeq, \
+                        CORBA::EnumMemberSeq_var, \
+                        TAO_SeqElem_String_Manager \
+                      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+                  static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
+                  {
+                                        TAO_ENCAP_BYTE_ORDER, // byte order
+                    36,
+                    ACE_NTOHL (0x49444c3a),
+                    ACE_NTOHL (0x6f6d672e),
+                    ACE_NTOHL (0x6f72672f),
+                    ACE_NTOHL (0x434f5242),
+                    ACE_NTOHL (0x412f456e),
+                    ACE_NTOHL (0x756d4d65),
+                    ACE_NTOHL (0x6d626572),
+                    ACE_NTOHL (0x5365713a),
+                    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/EnumMemberSeq:1.0
+                                        14,
+                    ACE_NTOHL (0x456e756d),
+                    ACE_NTOHL (0x4d656d62),
+                    ACE_NTOHL (0x65725365),
+                    ACE_NTOHL (0x71000000),  // name = EnumMemberSeq
+                                        CORBA::tk_sequence, // typecode kind
+                    84, // encapsulation length
+                      TAO_ENCAP_BYTE_ORDER, // byte order
+                      CORBA::tk_alias, // typecode kind for typedefs
+                      68, // encapsulation length
+                        TAO_ENCAP_BYTE_ORDER, // byte order
+                        33,
+                        ACE_NTOHL (0x49444c3a),
+                        ACE_NTOHL (0x6f6d672e),
+                        ACE_NTOHL (0x6f72672f),
+                        ACE_NTOHL (0x434f5242),
+                        ACE_NTOHL (0x412f4964),
+                        ACE_NTOHL (0x656e7469),
+                        ACE_NTOHL (0x66696572),
+                        ACE_NTOHL (0x3a312e30),
+                        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+                                                11,
+                        ACE_NTOHL (0x4964656e),
+                        ACE_NTOHL (0x74696669),
+                        ACE_NTOHL (0x65720000),  // name = Identifier
+                                                CORBA::tk_string,
+                        0U, // string length
+
+                      0U,
 
-::CORBA::Container_ptr
-CORBA::Container_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::Container_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::Container::_nil ();
-  return val;
-}
+};
 
-::CORBA::Container_ptr
-CORBA::Container_var::tao_duplicate (Container_ptr p)
-{
-  return ::CORBA::Container::_duplicate (p);
-}
+                  static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumMemberSeq (
+                      CORBA::tk_alias,
+                      sizeof (_oc_CORBA_EnumMemberSeq),
+                      (char *) &_oc_CORBA_EnumMemberSeq,
+                      0,
+                      sizeof (CORBA::EnumMemberSeq)
+                    );
 
-void
-CORBA::Container_var::tao_release (Container_ptr p)
-{
-  CORBA::release (p);
-}
+                  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+                  TAO_NAMESPACE_BEGIN (CORBA)
+                  TAO_NAMESPACE_DEFINE (
+                      ::CORBA::TypeCode_ptr,
+                      _tc_EnumMemberSeq,
+                      &_tc_TAO_tc_CORBA_EnumMemberSeq
+                    )
+                  TAO_NAMESPACE_END
 
-::CORBA::Container_ptr
-CORBA::Container_var::tao_nil (void)
-{
-  return ::CORBA::Container::_nil ();
-}
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-::CORBA::Container_ptr
-CORBA::Container_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::CORBA::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
+                  int CORBA::Container::_tao_class_id = 0;
 
-CORBA::Object *
-CORBA::Container_var::tao_upcast (void *src)
-{
-  Container **tmp =
-    ACE_static_cast (Container **, src);
-  return *tmp;
-}
+                  CORBA::Container_ptr
+                  CORBA::tao_Container_life::tao_duplicate (
+                      CORBA::Container_ptr p
+                    )
+                  {
+                    return CORBA::Container::_duplicate (p);
+                  }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+                  void
+                  CORBA::tao_Container_life::tao_release (
+                      CORBA::Container_ptr p
+                    )
+                  {
+                    CORBA::release (p);
+                  }
 
-// *************************************************************
-// CORBA::Container_out
-// *************************************************************
+                  CORBA::Container_ptr
+                  CORBA::tao_Container_life::tao_nil (
+                      void
+                    )
+                  {
+                    return CORBA::Container::_nil ();
+                  }
+
+                  CORBA::Boolean
+                  CORBA::tao_Container_life::tao_marshal (
+                      CORBA::Container_ptr p,
+                      TAO_OutputCDR &cdr
+                    )
+                  {
+                    return p->marshal (cdr);
+                  }
+
+                  CORBA::Container_ptr
+                  CORBA::tao_Container_cast::tao_narrow (
+                      CORBA::Object *p
+                      ACE_ENV_ARG_DECL
+                    )
+                  {
+                    return CORBA::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
+                  }
 
-CORBA::Container_out::Container_out (Container_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::Container::_nil ();
-}
+                  CORBA::Object *
+                  CORBA::tao_Container_cast::tao_upcast (
+                      void *src
+                    )
+                  {
+                    CORBA::Container **tmp =
+                      ACE_static_cast (CORBA::Container **, src);
+                    return *tmp;
+                  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+                    template class
+                      TAO_Objref_Var_T<
+                          CORBA::Container,
+                          CORBA::tao_Container_life
+                        >;
+                    template class
+                      TAO_Objref_Out_T<
+                          CORBA::Container,
+                          CORBA::tao_Container_life
+                        >;
+                  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+                  # pragma instantiate \
+                      TAO_Objref_Var_T< \
+                          CORBA::Container, \
+                          CORBA::tao_Container_life \
+                        >
+                  # pragma instantiate \
+                      TAO_Objref_Out_T< \
+                          CORBA::Container, \
+                          CORBA::tao_Container_life \
+                        >
+                  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
-CORBA::Container_out::Container_out (Container_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Container::_nil ();
-}
+#if (TAO_HAS_INTERCEPTORS == 1)
 
-CORBA::Container_out::Container_out (const ::CORBA::Container_out &p)
-  : ptr_ (ACE_const_cast (Container_out &, p).ptr_)
-{}
+                  // TAO_IDL - Generated from
+                  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-::CORBA::Container_out &
-CORBA::Container_out::operator= (const ::CORBA::Container_out &p)
-{
-  this->ptr_ = ACE_const_cast (Container_out&, p).ptr_;
-  return *this;
-}
+                  class TAO_ClientRequestInfo_CORBA_Container_lookup : public TAO_ClientRequestInfo_i
+                  {
+                  public:
+                    TAO_ClientRequestInfo_CORBA_Container_lookup (
+                        TAO_GIOP_Invocation *_tao_invocation,
+                        CORBA::Object_ptr _tao_target,
+                        const char * search_name
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-CORBA::Container_out &
-CORBA::Container_out::operator= (const ::CORBA::Container_var &p)
-{
-  this->ptr_ = ::CORBA::Container::_duplicate (p.ptr ());
-  return *this;
-}
+                      virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+                        ACE_THROW_SPEC ((CORBA::SystemException));
 
-CORBA::Container_out &
-CORBA::Container_out::operator= (Container_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+                      virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+                        ACE_THROW_SPEC ((CORBA::SystemException));
 
-CORBA::Container_out::operator ::CORBA::Container_ptr &() // cast
-{
-  return this->ptr_;
-}
+                      virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+                        ACE_THROW_SPEC ((CORBA::SystemException));
 
-::CORBA::Container_ptr &
-CORBA::Container_out::ptr (void)
-{
-  return this->ptr_;
-}
+                      void result (::CORBA::Contained_ptr result);
 
-::CORBA::Container_ptr
-CORBA::Container_out::operator-> (void)
-{
-  return this->ptr_;
-}
+                    private:
+                      TAO_ClientRequestInfo_CORBA_Container_lookup (const TAO_ClientRequestInfo_CORBA_Container_lookup &);
+                      void operator= (const TAO_ClientRequestInfo_CORBA_Container_lookup &);
+                      const char * search_name_;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+                      ::CORBA::Contained_ptr _result;
+                    };
 
-#if (TAO_HAS_INTERCEPTORS == 1)
+                    // TAO_IDL - Generated from
+                    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+                    TAO_ClientRequestInfo_CORBA_Container_lookup::TAO_ClientRequestInfo_CORBA_Container_lookup (
+                        TAO_GIOP_Invocation *_tao_invocation,
+                        CORBA::Object_ptr _tao_target,
+                        const char * search_name
+                        ACE_ENV_ARG_DECL_NOT_USED
+                      )
+                                          : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+                        search_name_ (search_name)
+                  {}
 
-class TAO_ClientRequestInfo_CORBA_Container_lookup : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Container_lookup (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * search_name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+Dynamic::ParameterList *
+                  TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (ACE_ENV_SINGLE_ARG_DECL)
+                    ACE_THROW_SPEC ((CORBA::SystemException))
+                  {
+                    // Generate the argument list on demand.
+                    Dynamic::ParameterList *parameter_list =
+                      TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+                    ACE_CHECK_RETURN (0);
+
+                    Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+
+                    parameter_list->length (1);
+                    CORBA::ULong len = 0;
+                    (*parameter_list)[len].argument <<= search_name_;
+                    (*parameter_list)[len].mode = CORBA::PARAM_IN;
+                    len++;
+
+                    return safe_parameter_list._retn ();
+                  }
+
+                  Dynamic::ExceptionList *
+                  TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+                    ACE_THROW_SPEC ((CORBA::SystemException))
+                  {
+                    // Generate the exception list on demand.
+                    Dynamic::ExceptionList *exception_list =
+                      TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+                    ACE_CHECK_RETURN (0);
+
+                    return exception_list;
+                  }
+
+                CORBA::Any *
+                TAO_ClientRequestInfo_CORBA_Container_lookup::result (ACE_ENV_SINGLE_ARG_DECL)
+                  ACE_THROW_SPEC ((CORBA::SystemException))
+                {
+                  // Generate the result on demand.
+                  CORBA::Boolean tk_void_any = 0;
+                  CORBA::Any *result_any =
+                    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+                  ACE_CHECK_RETURN (0);
+
+                  CORBA::Any_var safe_result_any = result_any;
+
+                  (*result_any) <<= this->_result;
+                  return safe_result_any._retn ();
+                }
+
+              void
+              TAO_ClientRequestInfo_CORBA_Container_lookup::result (::CORBA::Contained_ptr               result)
+        {
+          // Update the result.
+          this->_result = result;
+        }
 
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        // TAO_IDL - Generated from
+        // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-    void result (::CORBA::Contained_ptr result);
-    
-  private:
-    TAO_ClientRequestInfo_CORBA_Container_lookup (const TAO_ClientRequestInfo_CORBA_Container_lookup &);
-    void operator= (const TAO_ClientRequestInfo_CORBA_Container_lookup &);
-    const char * search_name_;
-    
-    ::CORBA::Contained_ptr _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_CORBA_Container_lookup::TAO_ClientRequestInfo_CORBA_Container_lookup (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * search_name
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      search_name_ (search_name)
-{}
+        class TAO_ClientRequestInfo_CORBA_Container_contents : public TAO_ClientRequestInfo_i
+        {
+        public:
+          TAO_ClientRequestInfo_CORBA_Container_contents (
+              TAO_GIOP_Invocation *_tao_invocation,
+              CORBA::Object_ptr _tao_target,
+              CORBA::DefinitionKind & limit_type,
+              const CORBA::Boolean & exclude_inherited
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+            virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+              ACE_THROW_SPEC ((CORBA::SystemException));
+
+            virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+              ACE_THROW_SPEC ((CORBA::SystemException));
+
+            virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+              ACE_THROW_SPEC ((CORBA::SystemException));
+
+            void result (::CORBA::ContainedSeq * result);
+
+          private:
+            TAO_ClientRequestInfo_CORBA_Container_contents (const TAO_ClientRequestInfo_CORBA_Container_contents &);
+            void operator= (const TAO_ClientRequestInfo_CORBA_Container_contents &);
+            const CORBA::DefinitionKind & limit_type_;
+            const CORBA::Boolean & exclude_inherited_;
+
+            ::CORBA::ContainedSeq * _result;
+          };
+
+          // TAO_IDL - Generated from
+          // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
+          TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Container_contents (
+              TAO_GIOP_Invocation *_tao_invocation,
+              CORBA::Object_ptr _tao_target,
+              CORBA::DefinitionKind & limit_type,
+              const CORBA::Boolean & exclude_inherited
+              ACE_ENV_ARG_DECL_NOT_USED
+            )
+                      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
+              limit_type_ (limit_type),
+              exclude_inherited_ (exclude_inherited)
+        {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
-  parameter_list->length (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= search_name_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
+        TAO_ClientRequestInfo_CORBA_Container_contents::arguments (ACE_ENV_SINGLE_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException))
+        {
+          // Generate the argument list on demand.
+          Dynamic::ParameterList *parameter_list =
+            TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_lookup::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
+          Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
-void 
-TAO_ClientRequestInfo_CORBA_Container_lookup::result (::CORBA::Contained_ptr result)
-{
-  // Update the result. 
-  this->_result = result;
-}
+          parameter_list->length (2);
+          CORBA::ULong len = 0;
+          (*parameter_list)[len].argument <<=  this->limit_type_;
+          (*parameter_list)[len].mode = CORBA::PARAM_IN;
+          len++;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+          (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
+          (*parameter_list)[len].mode = CORBA::PARAM_IN;
+          len++;
 
-class TAO_ClientRequestInfo_CORBA_Container_contents : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Container_contents (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::DefinitionKind & limit_type,
-      const CORBA::Boolean & exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+          return safe_parameter_list._retn ();
+        }
 
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        Dynamic::ExceptionList *
+        TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException))
+        {
+          // Generate the exception list on demand.
+          Dynamic::ExceptionList *exception_list =
+            TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
 
-    void result (::CORBA::ContainedSeq * result);
-    
-  private:
-    TAO_ClientRequestInfo_CORBA_Container_contents (const TAO_ClientRequestInfo_CORBA_Container_contents &);
-    void operator= (const TAO_ClientRequestInfo_CORBA_Container_contents &);
-    const CORBA::DefinitionKind & limit_type_;
-    const CORBA::Boolean & exclude_inherited_;
-    
-    ::CORBA::ContainedSeq * _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Container_contents (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::DefinitionKind & limit_type,
-      const CORBA::Boolean & exclude_inherited
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      limit_type_ (limit_type),
-      exclude_inherited_ (exclude_inherited)
-{}
+          return exception_list;
+        }
 
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_contents::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
-  parameter_list->length (2);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<=  this->limit_type_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
+      CORBA::Any *
+      TAO_ClientRequestInfo_CORBA_Container_contents::result (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Generate the result on demand.
+        CORBA::Boolean tk_void_any = 0;
+        CORBA::Any *result_any =
+          TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK_RETURN (0);
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
+        CORBA::Any_var safe_result_any = result_any;
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_contents::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
+        (*result_any) <<= this->_result;
+        return safe_result_any._retn ();
+      }
 
-void 
-TAO_ClientRequestInfo_CORBA_Container_contents::result (::CORBA::ContainedSeq * result)
+    void
+    TAO_ClientRequestInfo_CORBA_Container_contents::result (::CORBA::ContainedSeq *     result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -10609,15 +9546,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ContainedSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_lookup_name (const TAO_ClientRequestInfo_CORBA_Container_lookup_name &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_lookup_name &);
@@ -10625,13 +9562,13 @@ public:
     const CORBA::Long & levels_to_search_;
     const CORBA::DefinitionKind & limit_type_;
     const CORBA::Boolean & exclude_inherited_;
-    
+
     ::CORBA::ContainedSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_lookup_name::TAO_ClientRequestInfo_CORBA_Container_lookup_name (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -10639,7 +9576,7 @@ public:
       const CORBA::Long & levels_to_search,
       CORBA::DefinitionKind & limit_type,
       const CORBA::Boolean & exclude_inherited
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       search_name_ (search_name),
@@ -10656,27 +9593,27 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= search_name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= levels_to_search_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->limit_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -10688,11 +9625,11 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10701,17 +9638,17 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (::CORBA::ContainedSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -10731,35 +9668,35 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Container::DescriptionSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_describe_contents (const TAO_ClientRequestInfo_CORBA_Container_describe_contents &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_describe_contents &);
     const CORBA::DefinitionKind & limit_type_;
     const CORBA::Boolean & exclude_inherited_;
     const CORBA::Long & max_returned_objs_;
-    
+
     ::CORBA::Container::DescriptionSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_describe_contents::TAO_ClientRequestInfo_CORBA_Container_describe_contents (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::DefinitionKind & limit_type,
       const CORBA::Boolean & exclude_inherited,
       const CORBA::Long & max_returned_objs
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       limit_type_ (limit_type),
@@ -10775,23 +9712,23 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->limit_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= max_returned_objs_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -10803,11 +9740,11 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10816,17 +9753,17 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (::CORBA::Container::DescriptionSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -10846,35 +9783,35 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ModuleDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_module (const TAO_ClientRequestInfo_CORBA_Container_create_module &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_module &);
     const char * id_;
     const char * name_;
     const char * version_;
-    
+
     ::CORBA::ModuleDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_module::TAO_ClientRequestInfo_CORBA_Container_create_module (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -10890,23 +9827,23 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -10918,11 +9855,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_module::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10931,17 +9868,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_module::result (::CORBA::ModuleDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -10963,15 +9900,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ConstantDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_constant (const TAO_ClientRequestInfo_CORBA_Container_create_constant &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_constant &);
@@ -10980,13 +9917,13 @@ public:
     const char * version_;
     CORBA::IDLType_ptr type_;
     const CORBA::Any & value_;
-    
+
     ::CORBA::ConstantDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_CORBA_Container_create_constant (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -10995,7 +9932,7 @@ public:
       const char * version,
       CORBA::IDLType_ptr type,
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11013,31 +9950,31 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11049,11 +9986,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_constant::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11062,17 +9999,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_constant::result (::CORBA::ConstantDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11093,15 +10030,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::StructDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_struct (const TAO_ClientRequestInfo_CORBA_Container_create_struct &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_struct &);
@@ -11109,13 +10046,13 @@ public:
     const char * name_;
     const char * version_;
     const CORBA::StructMemberSeq & members_;
-    
+
     ::CORBA::StructDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_CORBA_Container_create_struct (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11123,7 +10060,7 @@ public:
       const char * name,
       const char * version,
       const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11140,27 +10077,27 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11172,11 +10109,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_struct::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11185,17 +10122,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_struct::result (::CORBA::StructDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11217,15 +10154,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::UnionDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_union (const TAO_ClientRequestInfo_CORBA_Container_create_union &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_union &);
@@ -11234,13 +10171,13 @@ public:
     const char * version_;
     CORBA::IDLType_ptr discriminator_type_;
     const CORBA::UnionMemberSeq & members_;
-    
+
     ::CORBA::UnionDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_CORBA_Container_create_union (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11249,7 +10186,7 @@ public:
       const char * version,
       CORBA::IDLType_ptr discriminator_type,
       const CORBA::UnionMemberSeq & members
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11267,31 +10204,31 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (ACE_ENV_SINGLE_AR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->discriminator_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11303,11 +10240,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (ACE_ENV_SINGLE_A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_union::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11316,17 +10253,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_union::result (::CORBA::UnionDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11347,15 +10284,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::EnumDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_enum (const TAO_ClientRequestInfo_CORBA_Container_create_enum &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_enum &);
@@ -11363,13 +10300,13 @@ public:
     const char * name_;
     const char * version_;
     const CORBA::EnumMemberSeq & members_;
-    
+
     ::CORBA::EnumDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_CORBA_Container_create_enum (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11377,7 +10314,7 @@ public:
       const char * name,
       const char * version,
       const CORBA::EnumMemberSeq & members
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11394,27 +10331,27 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11426,11 +10363,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_enum::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11439,17 +10376,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_enum::result (::CORBA::EnumDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11470,15 +10407,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::AliasDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_alias (const TAO_ClientRequestInfo_CORBA_Container_create_alias &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_alias &);
@@ -11486,13 +10423,13 @@ public:
     const char * name_;
     const char * version_;
     CORBA::IDLType_ptr original_type_;
-    
+
     ::CORBA::AliasDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_CORBA_Container_create_alias (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11500,7 +10437,7 @@ public:
       const char * name,
       const char * version,
       CORBA::IDLType_ptr original_type
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11517,27 +10454,27 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (ACE_ENV_SINGLE_AR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->original_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11549,11 +10486,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (ACE_ENV_SINGLE_A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_alias::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11562,17 +10499,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_alias::result (::CORBA::AliasDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11593,15 +10530,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_interface (const TAO_ClientRequestInfo_CORBA_Container_create_interface &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_interface &);
@@ -11609,13 +10546,13 @@ public:
     const char * name_;
     const char * version_;
     const CORBA::InterfaceDefSeq & base_interfaces_;
-    
+
     ::CORBA::InterfaceDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CORBA_Container_create_interface (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11623,7 +10560,7 @@ public:
       const char * name,
       const char * version,
       const CORBA::InterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11640,27 +10577,27 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (ACE_ENV_SINGL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->base_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11672,11 +10609,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (ACE_ENV_SING
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11685,17 +10622,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::result (ACE_ENV_SINGLE_A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_interface::result (::CORBA::InterfaceDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11722,15 +10659,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_value (const TAO_ClientRequestInfo_CORBA_Container_create_value &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_value &);
@@ -11744,13 +10681,13 @@ public:
     const CORBA::ValueDefSeq & abstract_base_values_;
     const CORBA::InterfaceDefSeq & supported_interfaces_;
     const CORBA::InitializerSeq & initializers_;
-    
+
     ::CORBA::ValueDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_Container_create_value (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11764,7 +10701,7 @@ public:
       const CORBA::ValueDefSeq & abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11787,51 +10724,51 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (ACE_ENV_SINGLE_AR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (10);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->base_value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->abstract_base_values_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->supported_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11843,11 +10780,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (ACE_ENV_SINGLE_A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11856,17 +10793,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_value::result (::CORBA::ValueDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11887,15 +10824,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueBoxDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_value_box (const TAO_ClientRequestInfo_CORBA_Container_create_value_box &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_value_box &);
@@ -11903,13 +10840,13 @@ public:
     const char * name_;
     const char * version_;
     CORBA::IDLType_ptr original_type_def_;
-    
+
     ::CORBA::ValueBoxDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_CORBA_Container_create_value_box (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11917,7 +10854,7 @@ public:
       const char * name,
       const char * version,
       CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11934,27 +10871,27 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (ACE_ENV_SINGL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->original_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11966,11 +10903,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (ACE_ENV_SING
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11979,17 +10916,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (ACE_ENV_SINGLE_A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (::CORBA::ValueBoxDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12010,15 +10947,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExceptionDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_exception (const TAO_ClientRequestInfo_CORBA_Container_create_exception &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_exception &);
@@ -12026,13 +10963,13 @@ public:
     const char * name_;
     const char * version_;
     const CORBA::StructMemberSeq & members_;
-    
+
     ::CORBA::ExceptionDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_CORBA_Container_create_exception (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -12040,7 +10977,7 @@ public:
       const char * name,
       const char * version,
       const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -12057,27 +10994,27 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (ACE_ENV_SINGL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -12089,11 +11026,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (ACE_ENV_SING
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_exception::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12102,17 +11039,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::result (ACE_ENV_SINGLE_A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_exception::result (::CORBA::ExceptionDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12132,35 +11069,35 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::NativeDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_native (const TAO_ClientRequestInfo_CORBA_Container_create_native &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_native &);
     const char * id_;
     const char * name_;
     const char * version_;
-    
+
     ::CORBA::NativeDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_native::TAO_ClientRequestInfo_CORBA_Container_create_native (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id,
       const char * name,
       const char * version
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -12176,23 +11113,23 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -12204,11 +11141,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_native::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12217,17 +11154,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_native::result (::CORBA::NativeDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12248,15 +11185,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::AbstractInterfaceDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface (const TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface &);
@@ -12264,13 +11201,13 @@ public:
     const char * name_;
     const char * version_;
     const CORBA::AbstractInterfaceDefSeq & base_interfaces_;
-    
+
     ::CORBA::AbstractInterfaceDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -12278,7 +11215,7 @@ public:
       const char * name,
       const char * version,
       const CORBA::AbstractInterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -12295,27 +11232,27 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->base_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -12327,11 +11264,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12340,17 +11277,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (ACE_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (::CORBA::AbstractInterfaceDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12371,15 +11308,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::LocalInterfaceDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_local_interface (const TAO_ClientRequestInfo_CORBA_Container_create_local_interface &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_local_interface &);
@@ -12387,13 +11324,13 @@ public:
     const char * name_;
     const char * version_;
     const CORBA::InterfaceDefSeq & base_interfaces_;
-    
+
     ::CORBA::LocalInterfaceDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestInfo_CORBA_Container_create_local_interface (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -12401,7 +11338,7 @@ public:
       const char * name,
       const char * version,
       const CORBA::InterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -12418,27 +11355,27 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (ACE_ENV
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->base_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -12450,11 +11387,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (ACE_EN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12463,17 +11400,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (ACE_ENV_SI
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (::CORBA::LocalInterfaceDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12500,15 +11437,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExtValueDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Container_create_ext_value (const TAO_ClientRequestInfo_CORBA_Container_create_ext_value &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_ext_value &);
@@ -12522,13 +11459,13 @@ public:
     const CORBA::ValueDefSeq & abstract_base_values_;
     const CORBA::InterfaceDefSeq & supported_interfaces_;
     const CORBA::ExtInitializerSeq & initializers_;
-    
+
     ::CORBA::ExtValueDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Container_create_ext_value::TAO_ClientRequestInfo_CORBA_Container_create_ext_value (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -12542,7 +11479,7 @@ public:
       const CORBA::ValueDefSeq & abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::ExtInitializerSeq & initializers
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -12565,51 +11502,51 @@ TAO_ClientRequestInfo_CORBA_Container_create_ext_value::arguments (ACE_ENV_SINGL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (10);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->base_value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->abstract_base_values_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->supported_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -12621,11 +11558,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_ext_value::exceptions (ACE_ENV_SING
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Container_create_ext_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12634,17 +11571,17 @@ TAO_ClientRequestInfo_CORBA_Container_create_ext_value::result (ACE_ENV_SINGLE_A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_ext_value::result (::CORBA::ExtValueDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12654,7 +11591,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_ext_value::result (::CORBA::ExtValu
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
@@ -12679,12 +11616,12 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
 {
   CORBA::Contained_var _tao_retval (CORBA::Contained::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "lookup",
@@ -12692,22 +11629,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_lookup _tao_ri (
           &_tao_call,
@@ -12716,14 +11653,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -12731,91 +11668,95 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << search_name)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << search_name)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Contained_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Contained_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -12825,59 +11766,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -12895,18 +11834,18 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
 {
   CORBA::ContainedSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ContainedSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ContainedSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "contents",
@@ -12914,22 +11853,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       2,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_contents _tao_ri (
           &_tao_call,
@@ -12939,14 +11878,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -12954,92 +11893,96 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << limit_type) &&
-              (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << limit_type) &&
+                  (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ContainedSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ContainedSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13049,59 +11992,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13121,18 +12062,18 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
 {
   CORBA::ContainedSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ContainedSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ContainedSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "lookup_name",
@@ -13140,22 +12081,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_lookup_name _tao_ri (
           &_tao_call,
@@ -13167,14 +12108,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13182,94 +12123,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << search_name) &&
-              (_tao_out << levels_to_search) &&
-              (_tao_out << limit_type) &&
-              (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << search_name) &&
+                  (_tao_out << levels_to_search) &&
+                  (_tao_out << limit_type) &&
+                  (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ContainedSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ContainedSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13279,59 +12224,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13350,18 +12293,18 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
 {
   CORBA::Container::DescriptionSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::Container::DescriptionSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::Container::DescriptionSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_contents",
@@ -13369,22 +12312,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       3,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_describe_contents _tao_ri (
           &_tao_call,
@@ -13395,14 +12338,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13410,93 +12353,97 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << limit_type) &&
-              (_tao_out << CORBA::Any::from_boolean (exclude_inherited)) &&
-              (_tao_out << max_returned_objs)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << limit_type) &&
+                  (_tao_out << CORBA::Any::from_boolean (exclude_inherited)) &&
+                  (_tao_out << max_returned_objs)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Container::DescriptionSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Container::DescriptionSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13506,59 +12453,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13575,14 +12520,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::ModuleDef_var _tao_retval ( tao_CORBA_ModuleDef_nil ());
+  CORBA::ModuleDef_var _tao_retval (
+      CORBA::tao_ModuleDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_module",
@@ -13590,22 +12538,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       3,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_module _tao_ri (
           &_tao_call,
@@ -13616,14 +12564,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13631,93 +12579,97 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ModuleDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ModuleDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13727,59 +12679,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13798,14 +12748,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::ConstantDef_var _tao_retval ( tao_CORBA_ConstantDef_nil ());
+  CORBA::ConstantDef_var _tao_retval (
+      CORBA::tao_ConstantDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_constant",
@@ -13813,22 +12766,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_constant _tao_ri (
           &_tao_call,
@@ -13841,14 +12794,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13856,95 +12809,99 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << type) &&
-              (_tao_out << value)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << type) &&
+                  (_tao_out << value)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ConstantDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ConstantDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13954,59 +12911,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -14024,14 +12979,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::StructDef_var _tao_retval ( tao_CORBA_StructDef_nil ());
+  CORBA::StructDef_var _tao_retval (
+      CORBA::tao_StructDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_struct",
@@ -14039,22 +12997,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_struct _tao_ri (
           &_tao_call,
@@ -14066,14 +13024,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -14081,94 +13039,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << members)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << members)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::StructDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::StructDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -14178,59 +13140,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -14249,14 +13209,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::UnionDef_var _tao_retval ( tao_CORBA_UnionDef_nil ());
+  CORBA::UnionDef_var _tao_retval (
+      CORBA::tao_UnionDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_union",
@@ -14264,22 +13227,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_union _tao_ri (
           &_tao_call,
@@ -14292,14 +13255,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -14307,95 +13270,99 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << discriminator_type) &&
-              (_tao_out << members)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << discriminator_type) &&
+                  (_tao_out << members)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::UnionDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::UnionDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -14405,59 +13372,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -14475,14 +13440,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::EnumDef_var _tao_retval ( tao_CORBA_EnumDef_nil ());
+  CORBA::EnumDef_var _tao_retval (
+      CORBA::tao_EnumDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_enum",
@@ -14490,22 +13458,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_enum _tao_ri (
           &_tao_call,
@@ -14517,14 +13485,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -14532,94 +13500,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << members)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << members)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::EnumDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::EnumDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -14629,59 +13601,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -14699,14 +13669,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::AliasDef_var _tao_retval ( tao_CORBA_AliasDef_nil ());
+  CORBA::AliasDef_var _tao_retval (
+      CORBA::tao_AliasDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_alias",
@@ -14714,22 +13687,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_alias _tao_ri (
           &_tao_call,
@@ -14741,14 +13714,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -14756,94 +13729,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << original_type)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << original_type)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::AliasDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::AliasDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -14853,59 +13830,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -14923,14 +13898,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::InterfaceDef_var _tao_retval ( tao_CORBA_InterfaceDef_nil ());
+  CORBA::InterfaceDef_var _tao_retval (
+      CORBA::tao_InterfaceDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_interface",
@@ -14938,22 +13916,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_interface _tao_ri (
           &_tao_call,
@@ -14965,14 +13943,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -14980,94 +13958,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << base_interfaces)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << base_interfaces)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -15077,59 +14059,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -15153,14 +14133,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::ValueDef_var _tao_retval ( tao_CORBA_ValueDef_nil ());
+  CORBA::ValueDef_var _tao_retval (
+      CORBA::tao_ValueDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_value",
@@ -15168,22 +14151,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       10,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_value _tao_ri (
           &_tao_call,
@@ -15201,14 +14184,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -15216,100 +14199,104 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
-              (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
-              (_tao_out << base_value) &&
-              (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
-              (_tao_out << abstract_base_values) &&
-              (_tao_out << supported_interfaces) &&
-              (_tao_out << initializers)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
+                  (_tao_out << base_value) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
+                  (_tao_out << abstract_base_values) &&
+                  (_tao_out << supported_interfaces) &&
+                  (_tao_out << initializers)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ValueDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ValueDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -15319,59 +14306,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -15389,14 +14374,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::ValueBoxDef_var _tao_retval ( tao_CORBA_ValueBoxDef_nil ());
+  CORBA::ValueBoxDef_var _tao_retval (
+      CORBA::tao_ValueBoxDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_value_box",
@@ -15404,22 +14392,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_value_box _tao_ri (
           &_tao_call,
@@ -15431,14 +14419,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -15446,94 +14434,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << original_type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << original_type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ValueBoxDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ValueBoxDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -15543,59 +14535,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -15613,14 +14603,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::ExceptionDef_var _tao_retval ( tao_CORBA_ExceptionDef_nil ());
+  CORBA::ExceptionDef_var _tao_retval (
+      CORBA::tao_ExceptionDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_exception",
@@ -15628,22 +14621,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_exception _tao_ri (
           &_tao_call,
@@ -15655,14 +14648,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -15670,94 +14663,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << members)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << members)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExceptionDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExceptionDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -15767,59 +14764,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -15836,14 +14831,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::NativeDef_var _tao_retval ( tao_CORBA_NativeDef_nil ());
+  CORBA::NativeDef_var _tao_retval (
+      CORBA::tao_NativeDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_native",
@@ -15851,22 +14849,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       3,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_native _tao_ri (
           &_tao_call,
@@ -15877,14 +14875,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -15892,93 +14890,97 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::NativeDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::NativeDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -15988,59 +14990,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -16058,14 +15058,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::AbstractInterfaceDef_var _tao_retval ( tao_CORBA_AbstractInterfaceDef_nil ());
+  CORBA::AbstractInterfaceDef_var _tao_retval (
+      CORBA::tao_AbstractInterfaceDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_abstract_interface",
@@ -16073,22 +15076,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface _tao_ri (
           &_tao_call,
@@ -16100,14 +15103,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -16115,94 +15118,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << base_interfaces)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << base_interfaces)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::AbstractInterfaceDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::AbstractInterfaceDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -16212,59 +15219,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -16282,14 +15287,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::LocalInterfaceDef_var _tao_retval ( tao_CORBA_LocalInterfaceDef_nil ());
+  CORBA::LocalInterfaceDef_var _tao_retval (
+      CORBA::tao_LocalInterfaceDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_local_interface",
@@ -16297,22 +15305,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_local_interface _tao_ri (
           &_tao_call,
@@ -16324,14 +15332,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -16339,94 +15347,98 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << base_interfaces)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << base_interfaces)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::LocalInterfaceDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::LocalInterfaceDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -16436,59 +15448,57 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -16512,14 +15522,17 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
     CORBA::SystemException
   ))
 {
-  CORBA::ExtValueDef_var _tao_retval ( tao_CORBA_ExtValueDef_nil ());
+  CORBA::ExtValueDef_var _tao_retval (
+      CORBA::tao_ExtValueDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_ext_value",
@@ -16527,22 +15540,22 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
       10,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_ext_value _tao_ri (
           &_tao_call,
@@ -16560,14 +15573,14 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -16575,100 +15588,104 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
-              (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
-              (_tao_out << base_value) &&
-              (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
-              (_tao_out << abstract_base_values) &&
-              (_tao_out << supported_interfaces) &&
-              (_tao_out << initializers)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
+                  (_tao_out << base_value) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
+                  (_tao_out << abstract_base_values) &&
+                  (_tao_out << supported_interfaces) &&
+                  (_tao_out << initializers)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExtValueDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExtValueDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -16678,63 +15695,61 @@ CORBA::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -16785,8 +15800,8 @@ CORBA::_TAO_Container_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::Container::Container (int collocated)
 {
@@ -16802,14 +15817,14 @@ CORBA::Container::CORBA_Container_setup_collocation (int collocated)
   else
     this->the_TAO_Container_Proxy_Broker_ =
       ::CORBA::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
 CORBA::Container::~Container (void)
 {}
 
-void 
+void
 CORBA::Container::_tao_any_destructor (void *_tao_void_pointer)
 {
   Container *tmp = ACE_static_cast (Container *, _tao_void_pointer);
@@ -16826,7 +15841,7 @@ CORBA::Container::_narrow (
     {
       return Container::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -16835,17 +15850,17 @@ CORBA::Container::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Container::_nil ());
-      
+
       if (is_a == 0)
         {
           return Container::_nil ();
         }
     }
-  
+
   return Container::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Container_ptr 
+CORBA::Container_ptr
 CORBA::Container::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16855,18 +15870,18 @@ CORBA::Container::_unchecked_narrow (
     {
       return Container::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       Container_ptr default_proxy = Container::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -16884,7 +15899,7 @@ CORBA::Container::_unchecked_narrow (
               Container::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -16897,10 +15912,10 @@ CORBA::Container::_unchecked_narrow (
               Container::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           Container_ptr,
@@ -16920,7 +15935,7 @@ CORBA::Container::_duplicate (Container_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -16959,7 +15974,7 @@ CORBA::Container::_is_a (
 void *CORBA::Container::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, Container)::_tao_class_id)
@@ -16992,12 +16007,12 @@ void *CORBA::Container::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -17006,6 +16021,12 @@ const char* CORBA::Container::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Container:1.0";
 }
 
+CORBA::Boolean
+CORBA::Container::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -17017,10 +16038,10 @@ const char* CORBA::Container::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.lookup (
       this,
       search_name
@@ -17040,10 +16061,10 @@ const char* CORBA::Container::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.contents (
       this,
       limit_type,
@@ -17066,10 +16087,10 @@ const char* CORBA::Container::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.lookup_name (
       this,
       search_name,
@@ -17087,224 +16108,224 @@ static const CORBA::Long _oc_CORBA_Container_Description[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65722f), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65722f),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
     12,
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = Description
   3, // member count
     17,
-  ACE_NTOHL (0x636f6e74), 
-  ACE_NTOHL (0x61696e65), 
-  ACE_NTOHL (0x645f6f62), 
-  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x636f6e74),
+  ACE_NTOHL (0x61696e65),
+  ACE_NTOHL (0x645f6f62),
+  ACE_NTOHL (0x6a656374),
   ACE_NTOHL (0x0),  // name = contained_object
     CORBA::tk_objref, // typecode kind
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f436f), 
-    ACE_NTOHL (0x6e746169), 
-    ACE_NTOHL (0x6e65643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f436f),
+    ACE_NTOHL (0x6e746169),
+    ACE_NTOHL (0x6e65643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
         10,
-    ACE_NTOHL (0x436f6e74), 
-    ACE_NTOHL (0x61696e65), 
+    ACE_NTOHL (0x436f6e74),
+    ACE_NTOHL (0x61696e65),
     ACE_NTOHL (0x64000000),  // name = Contained
-    
+
   5,
-  ACE_NTOHL (0x6b696e64), 
+  ACE_NTOHL (0x6b696e64),
   ACE_NTOHL (0x0),  // name = kind
     CORBA::tk_enum, // typecode kind
   684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4465), 
-    ACE_NTOHL (0x66696e69), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x4b696e64), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4465),
+    ACE_NTOHL (0x66696e69),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x4b696e64),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
     15,
-    ACE_NTOHL (0x44656669), 
-    ACE_NTOHL (0x6e697469), 
-    ACE_NTOHL (0x6f6e4b69), 
+    ACE_NTOHL (0x44656669),
+    ACE_NTOHL (0x6e697469),
+    ACE_NTOHL (0x6f6e4b69),
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
     36, // member count
     8,
-    ACE_NTOHL (0x646b5f6e), 
+    ACE_NTOHL (0x646b5f6e),
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
     7,
-    ACE_NTOHL (0x646b5f61), 
+    ACE_NTOHL (0x646b5f61),
     ACE_NTOHL (0x6c6c0000),  // name = dk_all
     13,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x74747269), 
-    ACE_NTOHL (0x62757465), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x74747269),
+    ACE_NTOHL (0x62757465),
     ACE_NTOHL (0x0),  // name = dk_Attribute
     12,
-    ACE_NTOHL (0x646b5f43), 
-    ACE_NTOHL (0x6f6e7374), 
+    ACE_NTOHL (0x646b5f43),
+    ACE_NTOHL (0x6f6e7374),
     ACE_NTOHL (0x616e7400),  // name = dk_Constant
     13,
-    ACE_NTOHL (0x646b5f45), 
-    ACE_NTOHL (0x78636570), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x78636570),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = dk_Exception
     13,
-    ACE_NTOHL (0x646b5f49), 
-    ACE_NTOHL (0x6e746572), 
-    ACE_NTOHL (0x66616365), 
+    ACE_NTOHL (0x646b5f49),
+    ACE_NTOHL (0x6e746572),
+    ACE_NTOHL (0x66616365),
     ACE_NTOHL (0x0),  // name = dk_Interface
     10,
-    ACE_NTOHL (0x646b5f4d), 
-    ACE_NTOHL (0x6f64756c), 
+    ACE_NTOHL (0x646b5f4d),
+    ACE_NTOHL (0x6f64756c),
     ACE_NTOHL (0x65000000),  // name = dk_Module
     13,
-    ACE_NTOHL (0x646b5f4f), 
-    ACE_NTOHL (0x70657261), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x646b5f4f),
+    ACE_NTOHL (0x70657261),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = dk_Operation
     11,
-    ACE_NTOHL (0x646b5f54), 
-    ACE_NTOHL (0x79706564), 
+    ACE_NTOHL (0x646b5f54),
+    ACE_NTOHL (0x79706564),
     ACE_NTOHL (0x65660000),  // name = dk_Typedef
     9,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x6c696173), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x6c696173),
     ACE_NTOHL (0x0),  // name = dk_Alias
     10,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x74727563), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x74727563),
     ACE_NTOHL (0x74000000),  // name = dk_Struct
     9,
-    ACE_NTOHL (0x646b5f55), 
-    ACE_NTOHL (0x6e696f6e), 
+    ACE_NTOHL (0x646b5f55),
+    ACE_NTOHL (0x6e696f6e),
     ACE_NTOHL (0x0),  // name = dk_Union
     8,
-    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x646b5f45),
     ACE_NTOHL (0x6e756d00),  // name = dk_Enum
     13,
-    ACE_NTOHL (0x646b5f50), 
-    ACE_NTOHL (0x72696d69), 
-    ACE_NTOHL (0x74697665), 
+    ACE_NTOHL (0x646b5f50),
+    ACE_NTOHL (0x72696d69),
+    ACE_NTOHL (0x74697665),
     ACE_NTOHL (0x0),  // name = dk_Primitive
     10,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x7472696e), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x7472696e),
     ACE_NTOHL (0x67000000),  // name = dk_String
     12,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x65717565), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x65717565),
     ACE_NTOHL (0x6e636500),  // name = dk_Sequence
     9,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x72726179), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x72726179),
     ACE_NTOHL (0x0),  // name = dk_Array
     14,
-    ACE_NTOHL (0x646b5f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
+    ACE_NTOHL (0x646b5f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
     ACE_NTOHL (0x79000000),  // name = dk_Repository
     11,
-    ACE_NTOHL (0x646b5f57), 
-    ACE_NTOHL (0x73747269), 
+    ACE_NTOHL (0x646b5f57),
+    ACE_NTOHL (0x73747269),
     ACE_NTOHL (0x6e670000),  // name = dk_Wstring
     9,
-    ACE_NTOHL (0x646b5f46), 
-    ACE_NTOHL (0x69786564), 
+    ACE_NTOHL (0x646b5f46),
+    ACE_NTOHL (0x69786564),
     ACE_NTOHL (0x0),  // name = dk_Fixed
     9,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
     ACE_NTOHL (0x0),  // name = dk_Value
     12,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
     ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
     15,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
-    ACE_NTOHL (0x4d656d62), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
+    ACE_NTOHL (0x4d656d62),
     ACE_NTOHL (0x65720000),  // name = dk_ValueMember
     10,
-    ACE_NTOHL (0x646b5f4e), 
-    ACE_NTOHL (0x61746976), 
+    ACE_NTOHL (0x646b5f4e),
+    ACE_NTOHL (0x61746976),
     ACE_NTOHL (0x65000000),  // name = dk_Native
     21,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x62737472), 
-    ACE_NTOHL (0x61637449), 
-    ACE_NTOHL (0x6e746572), 
-    ACE_NTOHL (0x66616365), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x62737472),
+    ACE_NTOHL (0x61637449),
+    ACE_NTOHL (0x6e746572),
+    ACE_NTOHL (0x66616365),
     ACE_NTOHL (0x0),  // name = dk_AbstractInterface
     18,
-    ACE_NTOHL (0x646b5f4c), 
-    ACE_NTOHL (0x6f63616c), 
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
+    ACE_NTOHL (0x646b5f4c),
+    ACE_NTOHL (0x6f63616c),
+    ACE_NTOHL (0x496e7465),
+    ACE_NTOHL (0x72666163),
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
     13,
-    ACE_NTOHL (0x646b5f43), 
-    ACE_NTOHL (0x6f6d706f), 
-    ACE_NTOHL (0x6e656e74), 
+    ACE_NTOHL (0x646b5f43),
+    ACE_NTOHL (0x6f6d706f),
+    ACE_NTOHL (0x6e656e74),
     ACE_NTOHL (0x0),  // name = dk_Component
     8,
-    ACE_NTOHL (0x646b5f48), 
+    ACE_NTOHL (0x646b5f48),
     ACE_NTOHL (0x6f6d6500),  // name = dk_Home
     11,
-    ACE_NTOHL (0x646b5f46), 
-    ACE_NTOHL (0x6163746f), 
+    ACE_NTOHL (0x646b5f46),
+    ACE_NTOHL (0x6163746f),
     ACE_NTOHL (0x72790000),  // name = dk_Factory
     10,
-    ACE_NTOHL (0x646b5f46), 
-    ACE_NTOHL (0x696e6465), 
+    ACE_NTOHL (0x646b5f46),
+    ACE_NTOHL (0x696e6465),
     ACE_NTOHL (0x72000000),  // name = dk_Finder
     9,
-    ACE_NTOHL (0x646b5f45), 
-    ACE_NTOHL (0x6d697473), 
+    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x6d697473),
     ACE_NTOHL (0x0),  // name = dk_Emits
     13,
-    ACE_NTOHL (0x646b5f50), 
-    ACE_NTOHL (0x75626c69), 
-    ACE_NTOHL (0x73686573), 
+    ACE_NTOHL (0x646b5f50),
+    ACE_NTOHL (0x75626c69),
+    ACE_NTOHL (0x73686573),
     ACE_NTOHL (0x0),  // name = dk_Publishes
     12,
-    ACE_NTOHL (0x646b5f43), 
-    ACE_NTOHL (0x6f6e7375), 
+    ACE_NTOHL (0x646b5f43),
+    ACE_NTOHL (0x6f6e7375),
     ACE_NTOHL (0x6d657300),  // name = dk_Consumes
     12,
-    ACE_NTOHL (0x646b5f50), 
-    ACE_NTOHL (0x726f7669), 
+    ACE_NTOHL (0x646b5f50),
+    ACE_NTOHL (0x726f7669),
     ACE_NTOHL (0x64657300),  // name = dk_Provides
     8,
-    ACE_NTOHL (0x646b5f55), 
+    ACE_NTOHL (0x646b5f55),
     ACE_NTOHL (0x73657300),  // name = dk_Uses
     9,
-    ACE_NTOHL (0x646b5f45), 
-    ACE_NTOHL (0x76656e74), 
+    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x76656e74),
     ACE_NTOHL (0x0),  // name = dk_Event
-    
+
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
     CORBA::tk_any,
 
@@ -17321,7 +16342,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_Description (
 ::CORBA::TypeCode_ptr CORBA::Container::_tc_Description =
   &_tc_TAO_tc_CORBA_Container_Description;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::Container::Description::_tao_any_destructor (void *_tao_void_pointer)
@@ -17330,117 +16351,70 @@ void CORBA::Container::Description::_tao_any_destructor (void *_tao_void_pointer
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-void
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Container::Description* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::Container::Description *old =
-        ACE_reinterpret_cast (CORBA::Container::Description *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Var_Var_T<
+      Description
+    >;
 
-void
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::Container::Description *tmp =
-    ACE_reinterpret_cast (CORBA::Container::Description *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
+template class
+  TAO_Out_T<
+      Description,
+      Description_var
+    >;
 
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      Description \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      Description, \
+      Description_var \
+    >
 
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::Container::DescriptionSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::Container::DescriptionSeq::DescriptionSeq (void)
 {}
 
 CORBA::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Container::Description>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::Container::Description
+      >
+    (max)
 {}
 
 CORBA::Container::DescriptionSeq::DescriptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::Container::Description *buffer,
+    CORBA::Container::Description* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Container::Description>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::Container::Description
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Container::Description>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::Container::Description
+      >
+    (seq)
 {}
 
-CORBA::Container::DescriptionSeq::~DescriptionSeq (void) // dtor
+CORBA::Container::DescriptionSeq::~DescriptionSeq (void)
 {}
 
 void CORBA::Container::DescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -17449,7 +16423,37 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (void *_tao_void_poin
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      DescriptionSeq,
+      CORBA::Container::Description
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      DescriptionSeq,
+      DescriptionSeq_var,
+      CORBA::Container::Description
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      DescriptionSeq, \
+      CORBA::Container::Description \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      DescriptionSeq, \
+      DescriptionSeq_var, \
+      CORBA::Container::Description \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -17458,22 +16462,22 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65722f), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e53), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65722f),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/Container/DescriptionSeq:1.0
     15,
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e53),
   ACE_NTOHL (0x65710000),  // name = DescriptionSeq
     CORBA::tk_sequence, // typecode kind
   896, // encapsulation length
@@ -17482,224 +16486,224 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
     880, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       44,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f436f), 
-      ACE_NTOHL (0x6e746169), 
-      ACE_NTOHL (0x6e65722f), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
-      ACE_NTOHL (0x696f6e3a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f436f),
+      ACE_NTOHL (0x6e746169),
+      ACE_NTOHL (0x6e65722f),
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
+      ACE_NTOHL (0x696f6e3a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
             12,
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
       ACE_NTOHL (0x696f6e00),  // name = Description
       3, // member count
             17,
-      ACE_NTOHL (0x636f6e74), 
-      ACE_NTOHL (0x61696e65), 
-      ACE_NTOHL (0x645f6f62), 
-      ACE_NTOHL (0x6a656374), 
+      ACE_NTOHL (0x636f6e74),
+      ACE_NTOHL (0x61696e65),
+      ACE_NTOHL (0x645f6f62),
+      ACE_NTOHL (0x6a656374),
       ACE_NTOHL (0x0),  // name = contained_object
             CORBA::tk_objref, // typecode kind
       56, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f436f), 
-        ACE_NTOHL (0x6e746169), 
-        ACE_NTOHL (0x6e65643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f436f),
+        ACE_NTOHL (0x6e746169),
+        ACE_NTOHL (0x6e65643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
                 10,
-        ACE_NTOHL (0x436f6e74), 
-        ACE_NTOHL (0x61696e65), 
+        ACE_NTOHL (0x436f6e74),
+        ACE_NTOHL (0x61696e65),
         ACE_NTOHL (0x64000000),  // name = Contained
-        
+
       5,
-      ACE_NTOHL (0x6b696e64), 
+      ACE_NTOHL (0x6b696e64),
       ACE_NTOHL (0x0),  // name = kind
             CORBA::tk_enum, // typecode kind
       684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         37,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4465), 
-        ACE_NTOHL (0x66696e69), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x4b696e64), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4465),
+        ACE_NTOHL (0x66696e69),
+        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4b696e64),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
         15,
-        ACE_NTOHL (0x44656669), 
-        ACE_NTOHL (0x6e697469), 
-        ACE_NTOHL (0x6f6e4b69), 
+        ACE_NTOHL (0x44656669),
+        ACE_NTOHL (0x6e697469),
+        ACE_NTOHL (0x6f6e4b69),
         ACE_NTOHL (0x6e640000),  // name = DefinitionKind
         36, // member count
         8,
-        ACE_NTOHL (0x646b5f6e), 
+        ACE_NTOHL (0x646b5f6e),
         ACE_NTOHL (0x6f6e6500),  // name = dk_none
         7,
-        ACE_NTOHL (0x646b5f61), 
+        ACE_NTOHL (0x646b5f61),
         ACE_NTOHL (0x6c6c0000),  // name = dk_all
         13,
-        ACE_NTOHL (0x646b5f41), 
-        ACE_NTOHL (0x74747269), 
-        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x646b5f41),
+        ACE_NTOHL (0x74747269),
+        ACE_NTOHL (0x62757465),
         ACE_NTOHL (0x0),  // name = dk_Attribute
         12,
-        ACE_NTOHL (0x646b5f43), 
-        ACE_NTOHL (0x6f6e7374), 
+        ACE_NTOHL (0x646b5f43),
+        ACE_NTOHL (0x6f6e7374),
         ACE_NTOHL (0x616e7400),  // name = dk_Constant
         13,
-        ACE_NTOHL (0x646b5f45), 
-        ACE_NTOHL (0x78636570), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x646b5f45),
+        ACE_NTOHL (0x78636570),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = dk_Exception
         13,
-        ACE_NTOHL (0x646b5f49), 
-        ACE_NTOHL (0x6e746572), 
-        ACE_NTOHL (0x66616365), 
+        ACE_NTOHL (0x646b5f49),
+        ACE_NTOHL (0x6e746572),
+        ACE_NTOHL (0x66616365),
         ACE_NTOHL (0x0),  // name = dk_Interface
         10,
-        ACE_NTOHL (0x646b5f4d), 
-        ACE_NTOHL (0x6f64756c), 
+        ACE_NTOHL (0x646b5f4d),
+        ACE_NTOHL (0x6f64756c),
         ACE_NTOHL (0x65000000),  // name = dk_Module
         13,
-        ACE_NTOHL (0x646b5f4f), 
-        ACE_NTOHL (0x70657261), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x646b5f4f),
+        ACE_NTOHL (0x70657261),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = dk_Operation
         11,
-        ACE_NTOHL (0x646b5f54), 
-        ACE_NTOHL (0x79706564), 
+        ACE_NTOHL (0x646b5f54),
+        ACE_NTOHL (0x79706564),
         ACE_NTOHL (0x65660000),  // name = dk_Typedef
         9,
-        ACE_NTOHL (0x646b5f41), 
-        ACE_NTOHL (0x6c696173), 
+        ACE_NTOHL (0x646b5f41),
+        ACE_NTOHL (0x6c696173),
         ACE_NTOHL (0x0),  // name = dk_Alias
         10,
-        ACE_NTOHL (0x646b5f53), 
-        ACE_NTOHL (0x74727563), 
+        ACE_NTOHL (0x646b5f53),
+        ACE_NTOHL (0x74727563),
         ACE_NTOHL (0x74000000),  // name = dk_Struct
         9,
-        ACE_NTOHL (0x646b5f55), 
-        ACE_NTOHL (0x6e696f6e), 
+        ACE_NTOHL (0x646b5f55),
+        ACE_NTOHL (0x6e696f6e),
         ACE_NTOHL (0x0),  // name = dk_Union
         8,
-        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x646b5f45),
         ACE_NTOHL (0x6e756d00),  // name = dk_Enum
         13,
-        ACE_NTOHL (0x646b5f50), 
-        ACE_NTOHL (0x72696d69), 
-        ACE_NTOHL (0x74697665), 
+        ACE_NTOHL (0x646b5f50),
+        ACE_NTOHL (0x72696d69),
+        ACE_NTOHL (0x74697665),
         ACE_NTOHL (0x0),  // name = dk_Primitive
         10,
-        ACE_NTOHL (0x646b5f53), 
-        ACE_NTOHL (0x7472696e), 
+        ACE_NTOHL (0x646b5f53),
+        ACE_NTOHL (0x7472696e),
         ACE_NTOHL (0x67000000),  // name = dk_String
         12,
-        ACE_NTOHL (0x646b5f53), 
-        ACE_NTOHL (0x65717565), 
+        ACE_NTOHL (0x646b5f53),
+        ACE_NTOHL (0x65717565),
         ACE_NTOHL (0x6e636500),  // name = dk_Sequence
         9,
-        ACE_NTOHL (0x646b5f41), 
-        ACE_NTOHL (0x72726179), 
+        ACE_NTOHL (0x646b5f41),
+        ACE_NTOHL (0x72726179),
         ACE_NTOHL (0x0),  // name = dk_Array
         14,
-        ACE_NTOHL (0x646b5f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
+        ACE_NTOHL (0x646b5f52),
+        ACE_NTOHL (0x65706f73),
+        ACE_NTOHL (0x69746f72),
         ACE_NTOHL (0x79000000),  // name = dk_Repository
         11,
-        ACE_NTOHL (0x646b5f57), 
-        ACE_NTOHL (0x73747269), 
+        ACE_NTOHL (0x646b5f57),
+        ACE_NTOHL (0x73747269),
         ACE_NTOHL (0x6e670000),  // name = dk_Wstring
         9,
-        ACE_NTOHL (0x646b5f46), 
-        ACE_NTOHL (0x69786564), 
+        ACE_NTOHL (0x646b5f46),
+        ACE_NTOHL (0x69786564),
         ACE_NTOHL (0x0),  // name = dk_Fixed
         9,
-        ACE_NTOHL (0x646b5f56), 
-        ACE_NTOHL (0x616c7565), 
+        ACE_NTOHL (0x646b5f56),
+        ACE_NTOHL (0x616c7565),
         ACE_NTOHL (0x0),  // name = dk_Value
         12,
-        ACE_NTOHL (0x646b5f56), 
-        ACE_NTOHL (0x616c7565), 
+        ACE_NTOHL (0x646b5f56),
+        ACE_NTOHL (0x616c7565),
         ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
         15,
-        ACE_NTOHL (0x646b5f56), 
-        ACE_NTOHL (0x616c7565), 
-        ACE_NTOHL (0x4d656d62), 
+        ACE_NTOHL (0x646b5f56),
+        ACE_NTOHL (0x616c7565),
+        ACE_NTOHL (0x4d656d62),
         ACE_NTOHL (0x65720000),  // name = dk_ValueMember
         10,
-        ACE_NTOHL (0x646b5f4e), 
-        ACE_NTOHL (0x61746976), 
+        ACE_NTOHL (0x646b5f4e),
+        ACE_NTOHL (0x61746976),
         ACE_NTOHL (0x65000000),  // name = dk_Native
         21,
-        ACE_NTOHL (0x646b5f41), 
-        ACE_NTOHL (0x62737472), 
-        ACE_NTOHL (0x61637449), 
-        ACE_NTOHL (0x6e746572), 
-        ACE_NTOHL (0x66616365), 
+        ACE_NTOHL (0x646b5f41),
+        ACE_NTOHL (0x62737472),
+        ACE_NTOHL (0x61637449),
+        ACE_NTOHL (0x6e746572),
+        ACE_NTOHL (0x66616365),
         ACE_NTOHL (0x0),  // name = dk_AbstractInterface
         18,
-        ACE_NTOHL (0x646b5f4c), 
-        ACE_NTOHL (0x6f63616c), 
-        ACE_NTOHL (0x496e7465), 
-        ACE_NTOHL (0x72666163), 
+        ACE_NTOHL (0x646b5f4c),
+        ACE_NTOHL (0x6f63616c),
+        ACE_NTOHL (0x496e7465),
+        ACE_NTOHL (0x72666163),
         ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
         13,
-        ACE_NTOHL (0x646b5f43), 
-        ACE_NTOHL (0x6f6d706f), 
-        ACE_NTOHL (0x6e656e74), 
+        ACE_NTOHL (0x646b5f43),
+        ACE_NTOHL (0x6f6d706f),
+        ACE_NTOHL (0x6e656e74),
         ACE_NTOHL (0x0),  // name = dk_Component
         8,
-        ACE_NTOHL (0x646b5f48), 
+        ACE_NTOHL (0x646b5f48),
         ACE_NTOHL (0x6f6d6500),  // name = dk_Home
         11,
-        ACE_NTOHL (0x646b5f46), 
-        ACE_NTOHL (0x6163746f), 
+        ACE_NTOHL (0x646b5f46),
+        ACE_NTOHL (0x6163746f),
         ACE_NTOHL (0x72790000),  // name = dk_Factory
         10,
-        ACE_NTOHL (0x646b5f46), 
-        ACE_NTOHL (0x696e6465), 
+        ACE_NTOHL (0x646b5f46),
+        ACE_NTOHL (0x696e6465),
         ACE_NTOHL (0x72000000),  // name = dk_Finder
         9,
-        ACE_NTOHL (0x646b5f45), 
-        ACE_NTOHL (0x6d697473), 
+        ACE_NTOHL (0x646b5f45),
+        ACE_NTOHL (0x6d697473),
         ACE_NTOHL (0x0),  // name = dk_Emits
         13,
-        ACE_NTOHL (0x646b5f50), 
-        ACE_NTOHL (0x75626c69), 
-        ACE_NTOHL (0x73686573), 
+        ACE_NTOHL (0x646b5f50),
+        ACE_NTOHL (0x75626c69),
+        ACE_NTOHL (0x73686573),
         ACE_NTOHL (0x0),  // name = dk_Publishes
         12,
-        ACE_NTOHL (0x646b5f43), 
-        ACE_NTOHL (0x6f6e7375), 
+        ACE_NTOHL (0x646b5f43),
+        ACE_NTOHL (0x6f6e7375),
         ACE_NTOHL (0x6d657300),  // name = dk_Consumes
         12,
-        ACE_NTOHL (0x646b5f50), 
-        ACE_NTOHL (0x726f7669), 
+        ACE_NTOHL (0x646b5f50),
+        ACE_NTOHL (0x726f7669),
         ACE_NTOHL (0x64657300),  // name = dk_Provides
         8,
-        ACE_NTOHL (0x646b5f55), 
+        ACE_NTOHL (0x646b5f55),
         ACE_NTOHL (0x73657300),  // name = dk_Uses
         9,
-        ACE_NTOHL (0x646b5f45), 
-        ACE_NTOHL (0x76656e74), 
+        ACE_NTOHL (0x646b5f45),
+        ACE_NTOHL (0x76656e74),
         ACE_NTOHL (0x0),  // name = dk_Event
-        
+
       6,
-      ACE_NTOHL (0x76616c75), 
+      ACE_NTOHL (0x76616c75),
       ACE_NTOHL (0x65000000),  // name = value
             CORBA::tk_any,
 
@@ -17732,10 +16736,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_contents (
       this,
       limit_type,
@@ -17758,10 +16762,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_module (
       this,
       id,
@@ -17786,10 +16790,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_constant (
       this,
       id,
@@ -17815,10 +16819,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_struct (
       this,
       id,
@@ -17844,10 +16848,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_union (
       this,
       id,
@@ -17873,10 +16877,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_enum (
       this,
       id,
@@ -17901,10 +16905,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_alias (
       this,
       id,
@@ -17929,10 +16933,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_interface (
       this,
       id,
@@ -17963,10 +16967,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_value (
       this,
       id,
@@ -17997,10 +17001,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_value_box (
       this,
       id,
@@ -18025,10 +17029,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_exception (
       this,
       id,
@@ -18052,10 +17056,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_native (
       this,
       id,
@@ -18079,10 +17083,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_abstract_interface (
       this,
       id,
@@ -18107,10 +17111,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_local_interface (
       this,
       id,
@@ -18141,10 +17145,10 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_ext_value (
       this,
       id,
@@ -18168,17 +17172,17 @@ static const CORBA::Long _oc_CORBA_Container[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65723a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container:1.0
     10,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x61696e65), 
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x61696e65),
   ACE_NTOHL (0x72000000),  // name = Container
   };
 
@@ -18205,7 +17209,7 @@ TAO_NAMESPACE_END
 int CORBA::IDLType::_tao_class_id = 0;
 
 CORBA::IDLType_ptr
-tao_CORBA_IDLType_duplicate (
+CORBA::tao_IDLType_life::tao_duplicate (
     CORBA::IDLType_ptr p
   )
 {
@@ -18213,7 +17217,7 @@ tao_CORBA_IDLType_duplicate (
 }
 
 void
-tao_CORBA_IDLType_release (
+CORBA::tao_IDLType_life::tao_release (
     CORBA::IDLType_ptr p
   )
 {
@@ -18221,228 +17225,64 @@ tao_CORBA_IDLType_release (
 }
 
 CORBA::IDLType_ptr
-tao_CORBA_IDLType_nil (
+CORBA::tao_IDLType_life::tao_nil (
     void
   )
 {
   return CORBA::IDLType::_nil ();
 }
 
-CORBA::IDLType_ptr
-tao_CORBA_IDLType_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_IDLType_upcast (
-    void *src
-  )
-{
-  CORBA::IDLType **tmp =
-    ACE_static_cast (CORBA::IDLType **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_IDLType_marshal (
+CORBA::tao_IDLType_life::tao_marshal (
     CORBA::IDLType_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::IDLType_var
-// *************************************************************
-
-CORBA::IDLType_var::IDLType_var (void)
-  : ptr_ (IDLType::_nil ())
-{}
-
-::CORBA::IDLType_ptr
-CORBA::IDLType_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::IDLType_var::IDLType_var (const ::CORBA::IDLType_var &p)
-  : TAO_Base_var (),
-    ptr_ (IDLType::_duplicate (p.ptr ()))
-{}
-
-CORBA::IDLType_var::~IDLType_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::IDLType_var &
-CORBA::IDLType_var::operator= (IDLType_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return p->marshal (cdr);
 }
 
-CORBA::IDLType_var &
-CORBA::IDLType_var::operator= (const ::CORBA::IDLType_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::IDLType::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::IDLType_var::operator const ::CORBA::IDLType_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::IDLType_var::operator ::CORBA::IDLType_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::IDLType_ptr
-CORBA::IDLType_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::IDLType_ptr
-CORBA::IDLType_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::IDLType_ptr &
-CORBA::IDLType_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::IDLType_ptr &
-CORBA::IDLType_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::IDLType::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::IDLType_ptr
-CORBA::IDLType_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::IDLType_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::IDLType::_nil ();
-  return val;
-}
-
-::CORBA::IDLType_ptr
-CORBA::IDLType_var::tao_duplicate (IDLType_ptr p)
-{
-  return ::CORBA::IDLType::_duplicate (p);
-}
-
-void
-CORBA::IDLType_var::tao_release (IDLType_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::IDLType_ptr
-CORBA::IDLType_var::tao_nil (void)
-{
-  return ::CORBA::IDLType::_nil ();
-}
-
-::CORBA::IDLType_ptr
-CORBA::IDLType_var::tao_narrow (
+CORBA::IDLType_ptr
+CORBA::tao_IDLType_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::IDLType_var::tao_upcast (void *src)
+CORBA::tao_IDLType_cast::tao_upcast (
+    void *src
+  )
 {
-  IDLType **tmp =
-    ACE_static_cast (IDLType **, src);
+  CORBA::IDLType **tmp =
+    ACE_static_cast (CORBA::IDLType **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::IDLType_out
-// *************************************************************
-
-CORBA::IDLType_out::IDLType_out (IDLType_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::IDLType::_nil ();
-}
-
-CORBA::IDLType_out::IDLType_out (IDLType_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::IDLType::_nil ();
-}
-
-CORBA::IDLType_out::IDLType_out (const ::CORBA::IDLType_out &p)
-  : ptr_ (ACE_const_cast (IDLType_out &, p).ptr_)
-{}
-
-::CORBA::IDLType_out &
-CORBA::IDLType_out::operator= (const ::CORBA::IDLType_out &p)
-{
-  this->ptr_ = ACE_const_cast (IDLType_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::IDLType_out &
-CORBA::IDLType_out::operator= (const ::CORBA::IDLType_var &p)
-{
-  this->ptr_ = ::CORBA::IDLType::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::IDLType_out &
-CORBA::IDLType_out::operator= (IDLType_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::IDLType_out::operator ::CORBA::IDLType_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::IDLType_ptr &
-CORBA::IDLType_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::IDLType_ptr
-CORBA::IDLType_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::IDLType,
+        CORBA::tao_IDLType_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::IDLType,
+        CORBA::tao_IDLType_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::IDLType, \
+        CORBA::tao_IDLType_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::IDLType, \
+        CORBA::tao_IDLType_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -18462,29 +17302,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_IDLType_type_get (const TAO_ClientRequestInfo_CORBA_IDLType_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_IDLType_type_get &);
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_IDLType_type_get::TAO_ClientRequestInfo_CORBA_IDLType_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -18497,7 +17337,7 @@ TAO_ClientRequestInfo_CORBA_IDLType_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -18509,11 +17349,11 @@ TAO_ClientRequestInfo_CORBA_IDLType_type_get::exceptions (ACE_ENV_SINGLE_ARG_DEC
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18522,17 +17362,17 @@ TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -18542,7 +17382,7 @@ TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (CORBA::TypeCode_ptr result
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
@@ -18566,12 +17406,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -18579,22 +17419,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IDLType_type_get _tao_ri (
           &_tao_call,
@@ -18602,14 +17442,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -18617,78 +17457,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -18698,63 +17545,61 @@ CORBA::TypeCode_ptr CORBA::_TAO_IDLType_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -18805,8 +17650,8 @@ CORBA::_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::IDLType::IDLType (int collocated)
 {
@@ -18822,14 +17667,14 @@ CORBA::IDLType::CORBA_IDLType_setup_collocation (int collocated)
   else
     this->the_TAO_IDLType_Proxy_Broker_ =
       ::CORBA::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
 CORBA::IDLType::~IDLType (void)
 {}
 
-void 
+void
 CORBA::IDLType::_tao_any_destructor (void *_tao_void_pointer)
 {
   IDLType *tmp = ACE_static_cast (IDLType *, _tao_void_pointer);
@@ -18846,7 +17691,7 @@ CORBA::IDLType::_narrow (
     {
       return IDLType::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -18855,17 +17700,17 @@ CORBA::IDLType::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (IDLType::_nil ());
-      
+
       if (is_a == 0)
         {
           return IDLType::_nil ();
         }
     }
-  
+
   return IDLType::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::IDLType_ptr 
+CORBA::IDLType_ptr
 CORBA::IDLType::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -18875,18 +17720,18 @@ CORBA::IDLType::_unchecked_narrow (
     {
       return IDLType::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       IDLType_ptr default_proxy = IDLType::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -18904,7 +17749,7 @@ CORBA::IDLType::_unchecked_narrow (
               IDLType::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -18917,10 +17762,10 @@ CORBA::IDLType::_unchecked_narrow (
               IDLType::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           IDLType_ptr,
@@ -18940,7 +17785,7 @@ CORBA::IDLType::_duplicate (IDLType_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -18979,7 +17824,7 @@ CORBA::IDLType::_is_a (
 void *CORBA::IDLType::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, IDLType)::_tao_class_id)
@@ -19012,12 +17857,12 @@ void *CORBA::IDLType::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -19026,6 +17871,12 @@ const char* CORBA::IDLType::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/IDLType:1.0";
 }
 
+CORBA::Boolean
+CORBA::IDLType::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -19036,10 +17887,10 @@ CORBA::TypeCode_ptr CORBA::IDLType::type (
     CORBA::SystemException
   ))
 {
-  _TAO_IDLType_Proxy_Impl &proxy = 
+  _TAO_IDLType_Proxy_Impl &proxy =
     this->the_TAO_IDLType_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -19053,16 +17904,16 @@ static const CORBA::Long _oc_CORBA_IDLType[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4944), 
-  ACE_NTOHL (0x4c547970), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4944),
+  ACE_NTOHL (0x4c547970),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
     8,
-  ACE_NTOHL (0x49444c54), 
+  ACE_NTOHL (0x49444c54),
   ACE_NTOHL (0x79706500),  // name = IDLType
   };
 
@@ -19089,7 +17940,7 @@ TAO_NAMESPACE_END
 int CORBA::TypedefDef::_tao_class_id = 0;
 
 CORBA::TypedefDef_ptr
-tao_CORBA_TypedefDef_duplicate (
+CORBA::tao_TypedefDef_life::tao_duplicate (
     CORBA::TypedefDef_ptr p
   )
 {
@@ -19097,7 +17948,7 @@ tao_CORBA_TypedefDef_duplicate (
 }
 
 void
-tao_CORBA_TypedefDef_release (
+CORBA::tao_TypedefDef_life::tao_release (
     CORBA::TypedefDef_ptr p
   )
 {
@@ -19105,228 +17956,64 @@ tao_CORBA_TypedefDef_release (
 }
 
 CORBA::TypedefDef_ptr
-tao_CORBA_TypedefDef_nil (
+CORBA::tao_TypedefDef_life::tao_nil (
     void
   )
 {
   return CORBA::TypedefDef::_nil ();
 }
 
-CORBA::TypedefDef_ptr
-tao_CORBA_TypedefDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_TypedefDef_upcast (
-    void *src
-  )
-{
-  CORBA::TypedefDef **tmp =
-    ACE_static_cast (CORBA::TypedefDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_TypedefDef_marshal (
+CORBA::tao_TypedefDef_life::tao_marshal (
     CORBA::TypedefDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::TypedefDef_var
-// *************************************************************
-
-CORBA::TypedefDef_var::TypedefDef_var (void)
-  : ptr_ (TypedefDef::_nil ())
-{}
-
-::CORBA::TypedefDef_ptr
-CORBA::TypedefDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::TypedefDef_var::TypedefDef_var (const ::CORBA::TypedefDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (TypedefDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::TypedefDef_var::~TypedefDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::TypedefDef_var &
-CORBA::TypedefDef_var::operator= (TypedefDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::TypedefDef_var &
-CORBA::TypedefDef_var::operator= (const ::CORBA::TypedefDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::TypedefDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::TypedefDef_var::operator const ::CORBA::TypedefDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::TypedefDef_var::operator ::CORBA::TypedefDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::TypedefDef_ptr
-CORBA::TypedefDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::TypedefDef_ptr
-CORBA::TypedefDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::TypedefDef_ptr &
-CORBA::TypedefDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::TypedefDef_ptr &
-CORBA::TypedefDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::TypedefDef::_nil ();
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::TypedefDef_ptr
-CORBA::TypedefDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::TypedefDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::TypedefDef::_nil ();
-  return val;
-}
-
-::CORBA::TypedefDef_ptr
-CORBA::TypedefDef_var::tao_duplicate (TypedefDef_ptr p)
-{
-  return ::CORBA::TypedefDef::_duplicate (p);
-}
-
-void
-CORBA::TypedefDef_var::tao_release (TypedefDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::TypedefDef_ptr
-CORBA::TypedefDef_var::tao_nil (void)
-{
-  return ::CORBA::TypedefDef::_nil ();
-}
-
-::CORBA::TypedefDef_ptr
-CORBA::TypedefDef_var::tao_narrow (
+CORBA::TypedefDef_ptr
+CORBA::tao_TypedefDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::TypedefDef_var::tao_upcast (void *src)
+CORBA::tao_TypedefDef_cast::tao_upcast (
+    void *src
+  )
 {
-  TypedefDef **tmp =
-    ACE_static_cast (TypedefDef **, src);
+  CORBA::TypedefDef **tmp =
+    ACE_static_cast (CORBA::TypedefDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::TypedefDef_out
-// *************************************************************
-
-CORBA::TypedefDef_out::TypedefDef_out (TypedefDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::TypedefDef::_nil ();
-}
-
-CORBA::TypedefDef_out::TypedefDef_out (TypedefDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::TypedefDef::_nil ();
-}
-
-CORBA::TypedefDef_out::TypedefDef_out (const ::CORBA::TypedefDef_out &p)
-  : ptr_ (ACE_const_cast (TypedefDef_out &, p).ptr_)
-{}
-
-::CORBA::TypedefDef_out &
-CORBA::TypedefDef_out::operator= (const ::CORBA::TypedefDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (TypedefDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::TypedefDef_out &
-CORBA::TypedefDef_out::operator= (const ::CORBA::TypedefDef_var &p)
-{
-  this->ptr_ = ::CORBA::TypedefDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::TypedefDef_out &
-CORBA::TypedefDef_out::operator= (TypedefDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::TypedefDef_out::operator ::CORBA::TypedefDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::TypedefDef_ptr &
-CORBA::TypedefDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::TypedefDef_ptr
-CORBA::TypedefDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::TypedefDef,
+        CORBA::tao_TypedefDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::TypedefDef,
+        CORBA::tao_TypedefDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::TypedefDef, \
+        CORBA::tao_TypedefDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::TypedefDef, \
+        CORBA::tao_TypedefDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -19339,7 +18026,7 @@ CORBA::TypedefDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_Proxy_Impl (void)
@@ -19351,7 +18038,7 @@ CORBA::_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (voi
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -19402,8 +18089,8 @@ CORBA::_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::TypedefDef::TypedefDef (int collocated)
 {
@@ -19419,7 +18106,7 @@ CORBA::TypedefDef::CORBA_TypedefDef_setup_collocation (int collocated)
   else
     this->the_TAO_TypedefDef_Proxy_Broker_ =
       ::CORBA::_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
   this->CORBA_IDLType_setup_collocation (collocated);
 }
@@ -19427,7 +18114,7 @@ CORBA::TypedefDef::CORBA_TypedefDef_setup_collocation (int collocated)
 CORBA::TypedefDef::~TypedefDef (void)
 {}
 
-void 
+void
 CORBA::TypedefDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypedefDef *tmp = ACE_static_cast (TypedefDef *, _tao_void_pointer);
@@ -19444,7 +18131,7 @@ CORBA::TypedefDef::_narrow (
     {
       return TypedefDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -19453,17 +18140,17 @@ CORBA::TypedefDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (TypedefDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return TypedefDef::_nil ();
         }
     }
-  
+
   return TypedefDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypedefDef_ptr 
+CORBA::TypedefDef_ptr
 CORBA::TypedefDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -19473,18 +18160,18 @@ CORBA::TypedefDef::_unchecked_narrow (
     {
       return TypedefDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       TypedefDef_ptr default_proxy = TypedefDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -19502,7 +18189,7 @@ CORBA::TypedefDef::_unchecked_narrow (
               TypedefDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -19515,10 +18202,10 @@ CORBA::TypedefDef::_unchecked_narrow (
               TypedefDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           TypedefDef_ptr,
@@ -19538,7 +18225,7 @@ CORBA::TypedefDef::_duplicate (TypedefDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -19585,7 +18272,7 @@ CORBA::TypedefDef::_is_a (
 void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, TypedefDef)::_tao_class_id)
@@ -19646,12 +18333,12 @@ void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -19660,6 +18347,12 @@ const char* CORBA::TypedefDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/TypedefDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::TypedefDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -19667,18 +18360,18 @@ static const CORBA::Long _oc_CORBA_TypedefDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5479), 
-  ACE_NTOHL (0x70656465), 
-  ACE_NTOHL (0x66446566), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5479),
+  ACE_NTOHL (0x70656465),
+  ACE_NTOHL (0x66446566),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/TypedefDef:1.0
     11,
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x64656644), 
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x64656644),
   ACE_NTOHL (0x65660000),  // name = TypedefDef
   };
 
@@ -19706,43 +18399,43 @@ static const CORBA::Long _oc_CORBA_TypeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5479), 
-  ACE_NTOHL (0x70654465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5479),
+  ACE_NTOHL (0x70654465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeDescription:1.0
     16,
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = TypeDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -19751,54 +18444,54 @@ static const CORBA::Long _oc_CORBA_TypeDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -19821,7 +18514,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::TypeDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -19831,6 +18524,37 @@ void CORBA::TypeDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      TypeDescription
+    >;
+
+template class
+  TAO_Out_T<
+      TypeDescription,
+      TypeDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      TypeDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      TypeDescription, \
+      TypeDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
@@ -19854,7 +18578,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
         _tao_any,
         CORBA::_tc_DefinitionKind,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -19862,7 +18586,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::DefinitionKind \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -19973,7 +18697,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::Contained>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20038,7 +18762,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Contained::Description>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20096,7 +18820,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20154,7 +18885,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20212,7 +18950,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20270,7 +19015,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20328,7 +19080,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20386,7 +19145,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20444,7 +19210,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20502,7 +19275,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20560,7 +19340,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20625,7 +19412,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::StructMember>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20683,7 +19470,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20748,7 +19542,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Initializer>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20806,7 +19600,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20871,7 +19672,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20929,7 +19730,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -20994,7 +19802,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -21052,7 +19860,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -21117,7 +19932,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::UnionMember>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -21175,7 +19990,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -21233,6 +20055,13 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
@@ -21278,6 +20107,16 @@ operator>>= (
       );
 }
 
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::Container>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<CORBA::Container,CORBA::Container_var>;
@@ -21287,7 +20126,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::Container>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -21352,7 +20191,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Container::Description>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -21410,6 +20249,13 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
@@ -21518,7 +20364,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::TypedefDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -21584,7 +20430,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -21603,12 +20449,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::IRObject::_unchecked_narrow (
@@ -21627,7 +20473,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -21646,12 +20492,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::Contained::_unchecked_narrow (
@@ -21670,7 +20516,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -21678,21 +20524,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            tao_CORBA_InterfaceDef_marshal (_tao_sequence[i].in (), strm);
+            CORBA::tao_InterfaceDef_life::tao_marshal (_tao_sequence[i].in (), strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -21702,7 +20548,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -21712,32 +20558,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -21745,21 +20591,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            tao_CORBA_ValueDef_marshal (_tao_sequence[i].in (), strm);
+            CORBA::tao_ValueDef_life::tao_marshal (_tao_sequence[i].in (), strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -21769,7 +20615,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -21779,32 +20625,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -21812,21 +20658,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            tao_CORBA_AbstractInterfaceDef_marshal (_tao_sequence[i].in (), strm);
+            CORBA::tao_AbstractInterfaceDef_life::tao_marshal (_tao_sequence[i].in (), strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -21836,7 +20682,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -21846,32 +20692,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -21879,21 +20725,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            tao_CORBA_LocalInterfaceDef_marshal (_tao_sequence[i].in (), strm);
+            CORBA::tao_LocalInterfaceDef_life::tao_marshal (_tao_sequence[i].in (), strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -21903,7 +20749,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -21913,32 +20759,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -21946,21 +20792,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            tao_CORBA_ExtInterfaceDef_marshal (_tao_sequence[i].in (), strm);
+            CORBA::tao_ExtInterfaceDef_life::tao_marshal (_tao_sequence[i].in (), strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -21970,7 +20816,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -21980,32 +20826,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22013,21 +20859,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            tao_CORBA_ExtValueDef_marshal (_tao_sequence[i].in (), strm);
+            CORBA::tao_ExtValueDef_life::tao_marshal (_tao_sequence[i].in (), strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22037,7 +20883,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22047,32 +20893,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22080,21 +20926,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            tao_CORBA_ExtAbstractInterfaceDef_marshal (_tao_sequence[i].in (), strm);
+            CORBA::tao_ExtAbstractInterfaceDef_life::tao_marshal (_tao_sequence[i].in (), strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22104,7 +20950,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22114,32 +20960,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22147,21 +20993,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            tao_CORBA_ExtLocalInterfaceDef_marshal (_tao_sequence[i].in (), strm);
+            CORBA::tao_ExtLocalInterfaceDef_life::tao_marshal (_tao_sequence[i].in (), strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22171,7 +21017,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22181,32 +21027,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22214,21 +21060,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
             _tao_sequence[i].in ()->marshal (strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22238,7 +21084,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22248,32 +21094,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22281,20 +21127,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22304,7 +21150,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22314,32 +21160,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22347,20 +21193,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22370,7 +21216,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22380,32 +21226,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22413,20 +21259,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22436,7 +21282,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22446,32 +21292,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22479,20 +21325,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22502,7 +21348,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22512,32 +21358,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22545,20 +21391,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22568,7 +21414,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22578,32 +21424,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22611,20 +21457,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22634,7 +21480,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22644,32 +21490,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22677,20 +21523,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -22700,7 +21546,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -22710,32 +21556,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22754,12 +21600,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::Container::_unchecked_narrow (
@@ -22778,7 +21624,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22797,12 +21643,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::IDLType::_unchecked_narrow (
@@ -22821,7 +21667,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -22840,12 +21686,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::TypedefDef::_unchecked_narrow (
@@ -22862,5 +21708,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
-
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 3c1cd4b3f16..d561e4485e3 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -26,7 +26,6 @@
 #define _TAO_IDL_ORIG_IFR_BASEC_H_
 
 #include "ace/pre.h"
-
 #include "ifr_client_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -36,6 +35,7 @@
 #include "tao/Remote_Object_Proxy_Impl.h"
 #include "tao/Object.h"
 #include "tao/Any_T.h"
+#include "tao/VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -65,46 +65,46 @@
 
 TAO_NAMESPACE  CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
-  
+
   typedef char * Identifier;
   typedef CORBA::String_var Identifier_var;
   typedef CORBA::String_out Identifier_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Identifier;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
-  
+
   typedef char * ScopedName;
   typedef CORBA::String_var ScopedName_var;
   typedef CORBA::String_out ScopedName_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ScopedName;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
-  
+
   typedef char * RepositoryId;
   typedef CORBA::String_var RepositoryId_var;
   typedef CORBA::String_out RepositoryId_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryId;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum DefinitionKind
   {
     dk_none,
@@ -144,108 +144,71 @@ TAO_NAMESPACE  CORBA
     dk_Uses,
     dk_Event
   };
-  
+
   typedef DefinitionKind &DefinitionKind_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DefinitionKind;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_IROBJECT__ODDS_N_ENDS_CH_)
+#define _CORBA_IROBJECT__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_IROBJECT___PTR_CH_)
-#define _CORBA_IROBJECT___PTR_CH_
-  
   class IRObject;
   typedef IRObject *IRObject_ptr;
+  struct tao_IRObject_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        IRObject,
+        tao_IRObject_life
+      >
+    IRObject_var;
 
-#if !defined (_CORBA_IROBJECT___VAR_CH_)
-#define _CORBA_IROBJECT___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export IRObject_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        IRObject,
+        tao_IRObject_life
+      >
+    IRObject_out;
+
+  struct TAO_IFR_Client_Export tao_IRObject_life
   {
-  public:
-    IRObject_var (void); // default constructor
-    IRObject_var (IRObject_ptr p) : ptr_ (p) {} 
-    IRObject_var (const IRObject_var &); // copy constructor
-    ~IRObject_var (void); // destructor
-    
-    IRObject_var &operator= (IRObject_ptr);
-    IRObject_var &operator= (const IRObject_var &);
-    IRObject_ptr operator-> (void) const;
-    
-    operator const IRObject_ptr &() const;
-    operator IRObject_ptr &();
-    // in, inout, out, _retn 
-    IRObject_ptr in (void) const;
-    IRObject_ptr &inout (void);
-    IRObject_ptr &out (void);
-    IRObject_ptr _retn (void);
-    IRObject_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static IRObject_ptr tao_duplicate (IRObject_ptr);
     static void tao_release (IRObject_ptr);
     static IRObject_ptr tao_nil (void);
-    static IRObject_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        IRObject_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    IRObject_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    IRObject_var (const TAO_Base_var &rhs);
-    IRObject_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IROBJECT___OUT_CH_)
-#define _CORBA_IROBJECT___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export IRObject_out
+  struct TAO_IFR_Client_Export tao_IRObject_cast
   {
-  public:
-    IRObject_out (IRObject_ptr &);
-    IRObject_out (IRObject_var &);
-    IRObject_out (const IRObject_out &);
-    IRObject_out &operator= (const IRObject_out &);
-    IRObject_out &operator= (const IRObject_var &);
-    IRObject_out &operator= (IRObject_ptr);
-    operator IRObject_ptr &();
-    IRObject_ptr &ptr (void);
-    IRObject_ptr operator-> (void);
-  
-  private:
-    IRObject_ptr &ptr_;
+    static IRObject_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IROBJECT_CH_)
 #define _CORBA_IROBJECT_CH_
-  
+
   class _TAO_IRObject_Proxy_Impl;
   class _TAO_IRObject_Remote_Proxy_Impl;
   class _TAO_IRObject_Proxy_Broker;
   class _TAO_IRObject_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export IRObject
     : public virtual CORBA::Object
   {
@@ -253,106 +216,106 @@ TAO_NAMESPACE  CORBA
     typedef IRObject_ptr _ptr_type;
     typedef IRObject_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static IRObject_ptr _duplicate (IRObject_ptr obj);
-    
+
     static IRObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IRObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IRObject_ptr _nil (void)
       {
         return (IRObject_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_IRObject_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
-  
+
   protected:
     IRObject (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IRObject_setup_collocation (int collocated);
-    
+
     IRObject (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~IRObject (void);
-    
+
     friend class _TAO_IRObject_Remote_Proxy_Impl;
     friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
     friend class _TAO_IRObject_Direct_Proxy_Impl;
-  
+
   private:
     IRObject (const IRObject &);
     void operator= (const IRObject &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_IRObject_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_IRObject_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::DefinitionKind def_kind (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -360,10 +323,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -371,35 +334,35 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_IRObject_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_IRObject_Remote_Proxy_Impl
     : public virtual _TAO_IRObject_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_IRObject_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_IRObject_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::DefinitionKind def_kind (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -407,10 +370,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -419,23 +382,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_IRObject_Proxy_Broker
   {
   public:
@@ -444,416 +407,219 @@ TAO_NAMESPACE  CORBA
         IRObject *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_IRObject_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_IRObject_Remote_Proxy_Broker
     : public virtual _TAO_IRObject_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_IRObject_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_IRObject_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_IRObject_Proxy_Impl &select_proxy (
         IRObject *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IRObject;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
-  
+
   typedef char * VersionSpec;
   typedef CORBA::String_var VersionSpec_var;
   typedef CORBA::String_out VersionSpec_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_VersionSpec;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class Contained;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_CONTAINED__ODDS_N_ENDS_CH_)
+#define _CORBA_CONTAINED__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_CONTAINED___PTR_CH_)
-#define _CORBA_CONTAINED___PTR_CH_
-  
+  class Contained;
   typedef Contained *Contained_ptr;
+  struct tao_Contained_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        Contained,
+        tao_Contained_life
+      >
+    Contained_var;
 
-#if !defined (_CORBA_CONTAINED___VAR_CH_)
-#define _CORBA_CONTAINED___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export Contained_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        Contained,
+        tao_Contained_life
+      >
+    Contained_out;
+
+  struct TAO_IFR_Client_Export tao_Contained_life
   {
-  public:
-    Contained_var (void); // default constructor
-    Contained_var (Contained_ptr p) : ptr_ (p) {} 
-    Contained_var (const Contained_var &); // copy constructor
-    ~Contained_var (void); // destructor
-    
-    Contained_var &operator= (Contained_ptr);
-    Contained_var &operator= (const Contained_var &);
-    Contained_ptr operator-> (void) const;
-    
-    operator const Contained_ptr &() const;
-    operator Contained_ptr &();
-    // in, inout, out, _retn 
-    Contained_ptr in (void) const;
-    Contained_ptr &inout (void);
-    Contained_ptr &out (void);
-    Contained_ptr _retn (void);
-    Contained_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Contained_ptr tao_duplicate (Contained_ptr);
     static void tao_release (Contained_ptr);
     static Contained_ptr tao_nil (void);
-    static Contained_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Contained_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Contained_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Contained_var (const TAO_Base_var &rhs);
-    Contained_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED___OUT_CH_)
-#define _CORBA_CONTAINED___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export Contained_out
+  struct TAO_IFR_Client_Export tao_Contained_cast
   {
-  public:
-    Contained_out (Contained_ptr &);
-    Contained_out (Contained_var &);
-    Contained_out (const Contained_out &);
-    Contained_out &operator= (const Contained_out &);
-    Contained_out &operator= (const Contained_var &);
-    Contained_out &operator= (Contained_ptr);
-    operator Contained_ptr &();
-    Contained_ptr &ptr (void);
-    Contained_ptr operator-> (void);
-  
-  private:
-    Contained_ptr &ptr_;
+    static Contained_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class Repository;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_REPOSITORY__ODDS_N_ENDS_CH_)
+#define _CORBA_REPOSITORY__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_REPOSITORY___PTR_CH_)
-#define _CORBA_REPOSITORY___PTR_CH_
-  
+  class Repository;
   typedef Repository *Repository_ptr;
+  struct tao_Repository_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        Repository,
+        tao_Repository_life
+      >
+    Repository_var;
 
-#if !defined (_CORBA_REPOSITORY___VAR_CH_)
-#define _CORBA_REPOSITORY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        Repository,
+        tao_Repository_life
+      >
+    Repository_out;
+
+  struct TAO_IFR_Client_Export tao_Repository_life
   {
-  public:
-    Repository_var (void); // default constructor
-    Repository_var (Repository_ptr p) : ptr_ (p) {} 
-    Repository_var (const Repository_var &); // copy constructor
-    ~Repository_var (void); // destructor
-    
-    Repository_var &operator= (Repository_ptr);
-    Repository_var &operator= (const Repository_var &);
-    Repository_ptr operator-> (void) const;
-    
-    operator const Repository_ptr &() const;
-    operator Repository_ptr &();
-    // in, inout, out, _retn 
-    Repository_ptr in (void) const;
-    Repository_ptr &inout (void);
-    Repository_ptr &out (void);
-    Repository_ptr _retn (void);
-    Repository_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Repository_ptr tao_duplicate (Repository_ptr);
     static void tao_release (Repository_ptr);
     static Repository_ptr tao_nil (void);
-    static Repository_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Repository_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Repository_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Repository_var (const TAO_Base_var &rhs);
-    Repository_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY___OUT_CH_)
-#define _CORBA_REPOSITORY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export Repository_out
+  struct TAO_IFR_Client_Export tao_Repository_cast
   {
-  public:
-    Repository_out (Repository_ptr &);
-    Repository_out (Repository_var &);
-    Repository_out (const Repository_out &);
-    Repository_out &operator= (const Repository_out &);
-    Repository_out &operator= (const Repository_var &);
-    Repository_out &operator= (Repository_ptr);
-    operator Repository_ptr &();
-    Repository_ptr &ptr (void);
-    Repository_ptr operator-> (void);
-  
-  private:
-    Repository_ptr &ptr_;
+    static Repository_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class Container;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_CONTAINER___PTR_CH_)
-#define _CORBA_CONTAINER___PTR_CH_
-  
+#if !defined (_CORBA_CONTAINER__ODDS_N_ENDS_CH_)
+#define _CORBA_CONTAINER__ODDS_N_ENDS_CH_
+
+  class Container;
   typedef Container *Container_ptr;
+  struct tao_Container_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        Container,
+        tao_Container_life
+      >
+    Container_var;
 
-#if !defined (_CORBA_CONTAINER___VAR_CH_)
-#define _CORBA_CONTAINER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export Container_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        Container,
+        tao_Container_life
+      >
+    Container_out;
+
+  struct TAO_IFR_Client_Export tao_Container_life
   {
-  public:
-    Container_var (void); // default constructor
-    Container_var (Container_ptr p) : ptr_ (p) {} 
-    Container_var (const Container_var &); // copy constructor
-    ~Container_var (void); // destructor
-    
-    Container_var &operator= (Container_ptr);
-    Container_var &operator= (const Container_var &);
-    Container_ptr operator-> (void) const;
-    
-    operator const Container_ptr &() const;
-    operator Container_ptr &();
-    // in, inout, out, _retn 
-    Container_ptr in (void) const;
-    Container_ptr &inout (void);
-    Container_ptr &out (void);
-    Container_ptr _retn (void);
-    Container_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Container_ptr tao_duplicate (Container_ptr);
     static void tao_release (Container_ptr);
     static Container_ptr tao_nil (void);
-    static Container_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Container_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Container_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Container_var (const TAO_Base_var &rhs);
-    Container_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER___OUT_CH_)
-#define _CORBA_CONTAINER___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export Container_out
-  {
-  public:
-    Container_out (Container_ptr &);
-    Container_out (Container_var &);
-    Container_out (const Container_out &);
-    Container_out &operator= (const Container_out &);
-    Container_out &operator= (const Container_var &);
-    Container_out &operator= (Container_ptr);
-    operator Container_ptr &();
-    Container_ptr &ptr (void);
-    Container_ptr operator-> (void);
-  
-  private:
-    Container_ptr &ptr_;
   };
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_CONTAINED___PTR_CH_)
-#define _CORBA_CONTAINED___PTR_CH_
-  
-  class Contained;
-  typedef Contained *Contained_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED___VAR_CH_)
-#define _CORBA_CONTAINED___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export Contained_var : public TAO_Base_var
+  struct TAO_IFR_Client_Export tao_Container_cast
   {
-  public:
-    Contained_var (void); // default constructor
-    Contained_var (Contained_ptr p) : ptr_ (p) {} 
-    Contained_var (const Contained_var &); // copy constructor
-    ~Contained_var (void); // destructor
-    
-    Contained_var &operator= (Contained_ptr);
-    Contained_var &operator= (const Contained_var &);
-    Contained_ptr operator-> (void) const;
-    
-    operator const Contained_ptr &() const;
-    operator Contained_ptr &();
-    // in, inout, out, _retn 
-    Contained_ptr in (void) const;
-    Contained_ptr &inout (void);
-    Contained_ptr &out (void);
-    Contained_ptr _retn (void);
-    Contained_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static Contained_ptr tao_duplicate (Contained_ptr);
-    static void tao_release (Contained_ptr);
-    static Contained_ptr tao_nil (void);
-    static Contained_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static Container_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Contained_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Contained_var (const TAO_Base_var &rhs);
-    Contained_var &operator= (const TAO_Base_var &rhs);
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_CONTAINED___OUT_CH_)
-#define _CORBA_CONTAINED___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export Contained_out
-  {
-  public:
-    Contained_out (Contained_ptr &);
-    Contained_out (Contained_var &);
-    Contained_out (const Contained_out &);
-    Contained_out &operator= (const Contained_out &);
-    Contained_out &operator= (const Contained_var &);
-    Contained_out &operator= (Contained_ptr);
-    operator Contained_ptr &();
-    Contained_ptr &ptr (void);
-    Contained_ptr operator-> (void);
-  
-  private:
-    Contained_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINED_CH_)
 #define _CORBA_CONTAINED_CH_
-  
+
   class _TAO_Contained_Proxy_Impl;
   class _TAO_Contained_Remote_Proxy_Impl;
   class _TAO_Contained_Proxy_Broker;
   class _TAO_Contained_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export Contained
     : public virtual CORBA::IRObject
   {
@@ -861,40 +627,40 @@ TAO_NAMESPACE  CORBA
     typedef Contained_ptr _ptr_type;
     typedef Contained_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static Contained_ptr _duplicate (Contained_ptr obj);
-    
+
     static Contained_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Contained_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Contained_ptr _nil (void)
       {
         return (Contained_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void id (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -902,20 +668,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void name (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -923,20 +689,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void version (
         const char * version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -944,124 +710,85 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-    
-    class Description_var;
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+    struct Description;
+
+    typedef
+      TAO_Var_Var_T<
+          Description
+        >
+      Description_var;
+
+    typedef
+      TAO_Out_T<
+          Description,
+          Description_var
+        >
+      Description_out;
+
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export Description_var
-    {
-    public:
-      Description_var (void);
-      Description_var (Description *);
-      Description_var (const Description_var &);
-      ~Description_var (void);
-      
-      Description_var &operator= (Description *);
-      Description_var &operator= (const Description_var &);
-      Description *operator-> (void);
-      const Description *operator-> (void) const;
-      
-      operator const Description &() const;
-      operator Description &();
-      operator Description &() const;
-      
-      // Variable-size types only.
-      operator Description *&();
-      
-      // in, inout, out, _retn 
-      const Description &in (void) const;
-      Description &inout (void);
-      Description *&out (void);
-      Description *_retn (void);
-      Description *ptr (void) const;
-    
-    private:
-      Description *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export Description_out
-    {
-    public:
-      Description_out (Description *&);
-      Description_out (Description_var &);
-      Description_out (const Description_out &);
-      Description_out &operator= (const Description_out &);
-      Description_out &operator= (Description *);
-      operator Description *&();
-      Description *&ptr (void);
-      Description *operator-> (void);
-      
-    private:
-      Description *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const Description_var &);
-    };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_Description;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void move (
         CORBA::Container_ptr new_container,
         const char * new_name,
@@ -1071,66 +798,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Contained_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
-  
+
   protected:
     Contained (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Contained_setup_collocation (int collocated);
-    
+
     Contained (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Contained (void);
-    
+
     friend class _TAO_Contained_Remote_Proxy_Impl;
     friend class _TAO_Contained_ThruPOA_Proxy_Impl;
     friend class _TAO_Contained_Direct_Proxy_Impl;
-  
+
   private:
     Contained (const Contained &);
     void operator= (const Contained &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_Contained_Proxy_Impl
     : public virtual CORBA::_TAO_IRObject_Proxy_Impl
   {
   public:
     virtual ~_TAO_Contained_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual char * id (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1138,10 +865,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void id (
         CORBA::Object *_collocated_tao_target_,
         const char * id
@@ -1150,10 +877,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual char * name (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1161,10 +888,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void name (
         CORBA::Object *_collocated_tao_target_,
         const char * name
@@ -1173,10 +900,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual char * version (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1184,10 +911,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void version (
         CORBA::Object *_collocated_tao_target_,
         const char * version
@@ -1196,10 +923,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::Container_ptr defined_in (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1207,10 +934,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual char * absolute_name (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1218,10 +945,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::Repository_ptr containing_repository (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1229,10 +956,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::Contained::Description * describe (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1240,10 +967,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void move (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Container_ptr new_container,
@@ -1254,23 +981,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_Contained_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Impl
     : public virtual _TAO_Contained_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -1278,12 +1005,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_Contained_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_Contained_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual char * id (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1291,10 +1018,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void id (
         CORBA::Object *_collocated_tao_target_,
         const char * id
@@ -1303,10 +1030,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual char * name (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1314,10 +1041,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void name (
         CORBA::Object *_collocated_tao_target_,
         const char * name
@@ -1326,10 +1053,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual char * version (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1337,10 +1064,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void version (
         CORBA::Object *_collocated_tao_target_,
         const char * version
@@ -1349,10 +1076,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::Container_ptr defined_in (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1360,10 +1087,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual char * absolute_name (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1371,10 +1098,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::Repository_ptr containing_repository (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1382,10 +1109,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::Contained::Description * describe (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1393,10 +1120,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void move (
         CORBA::Object *_collocated_tao_target_,
         CORBA::Container_ptr new_container,
@@ -1408,23 +1135,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker
   {
   public:
@@ -1433,3680 +1160,1609 @@ TAO_NAMESPACE  CORBA
         Contained *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_Contained_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Broker
     : public virtual _TAO_Contained_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_Contained_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_Contained_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_Contained_Proxy_Impl &select_proxy (
         Contained *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_Contained_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Contained;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ModuleDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_MODULEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_MODULEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_MODULEDEF___PTR_CH_)
-#define _CORBA_MODULEDEF___PTR_CH_
-  
+  class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
+  struct tao_ModuleDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ModuleDef,
+        tao_ModuleDef_life
+      >
+    ModuleDef_var;
 
-#if !defined (_CORBA_MODULEDEF___VAR_CH_)
-#define _CORBA_MODULEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ModuleDef,
+        tao_ModuleDef_life
+      >
+    ModuleDef_out;
+
+  struct TAO_IFR_Client_Export tao_ModuleDef_life
   {
-  public:
-    ModuleDef_var (void); // default constructor
-    ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {} 
-    ModuleDef_var (const ModuleDef_var &); // copy constructor
-    ~ModuleDef_var (void); // destructor
-    
-    ModuleDef_var &operator= (ModuleDef_ptr);
-    ModuleDef_var &operator= (const ModuleDef_var &);
-    ModuleDef_ptr operator-> (void) const;
-    
-    operator const ModuleDef_ptr &() const;
-    operator ModuleDef_ptr &();
-    // in, inout, out, _retn 
-    ModuleDef_ptr in (void) const;
-    ModuleDef_ptr &inout (void);
-    ModuleDef_ptr &out (void);
-    ModuleDef_ptr _retn (void);
-    ModuleDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ModuleDef_ptr tao_duplicate (ModuleDef_ptr);
     static void tao_release (ModuleDef_ptr);
     static ModuleDef_ptr tao_nil (void);
-    static ModuleDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ModuleDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ModuleDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ModuleDef_var (const TAO_Base_var &rhs);
-    ModuleDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_MODULEDEF___OUT_CH_)
-#define _CORBA_MODULEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ModuleDef_out
+  struct TAO_IFR_Client_Export tao_ModuleDef_cast
   {
-  public:
-    ModuleDef_out (ModuleDef_ptr &);
-    ModuleDef_out (ModuleDef_var &);
-    ModuleDef_out (const ModuleDef_out &);
-    ModuleDef_out &operator= (const ModuleDef_out &);
-    ModuleDef_out &operator= (const ModuleDef_var &);
-    ModuleDef_out &operator= (ModuleDef_ptr);
-    operator ModuleDef_ptr &();
-    ModuleDef_ptr &ptr (void);
-    ModuleDef_ptr operator-> (void);
-  
-  private:
-    ModuleDef_ptr &ptr_;
+    static ModuleDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ConstantDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_CONSTANTDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_CONSTANTDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
-#define _CORBA_CONSTANTDEF___PTR_CH_
-  
+  class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
+  struct tao_ConstantDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ConstantDef,
+        tao_ConstantDef_life
+      >
+    ConstantDef_var;
 
-#if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
-#define _CORBA_CONSTANTDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ConstantDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ConstantDef,
+        tao_ConstantDef_life
+      >
+    ConstantDef_out;
+
+  struct TAO_IFR_Client_Export tao_ConstantDef_life
   {
-  public:
-    ConstantDef_var (void); // default constructor
-    ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {} 
-    ConstantDef_var (const ConstantDef_var &); // copy constructor
-    ~ConstantDef_var (void); // destructor
-    
-    ConstantDef_var &operator= (ConstantDef_ptr);
-    ConstantDef_var &operator= (const ConstantDef_var &);
-    ConstantDef_ptr operator-> (void) const;
-    
-    operator const ConstantDef_ptr &() const;
-    operator ConstantDef_ptr &();
-    // in, inout, out, _retn 
-    ConstantDef_ptr in (void) const;
-    ConstantDef_ptr &inout (void);
-    ConstantDef_ptr &out (void);
-    ConstantDef_ptr _retn (void);
-    ConstantDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ConstantDef_ptr tao_duplicate (ConstantDef_ptr);
     static void tao_release (ConstantDef_ptr);
     static ConstantDef_ptr tao_nil (void);
-    static ConstantDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ConstantDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ConstantDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ConstantDef_var (const TAO_Base_var &rhs);
-    ConstantDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
-#define _CORBA_CONSTANTDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ConstantDef_out
+  struct TAO_IFR_Client_Export tao_ConstantDef_cast
   {
-  public:
-    ConstantDef_out (ConstantDef_ptr &);
-    ConstantDef_out (ConstantDef_var &);
-    ConstantDef_out (const ConstantDef_out &);
-    ConstantDef_out &operator= (const ConstantDef_out &);
-    ConstantDef_out &operator= (const ConstantDef_var &);
-    ConstantDef_out &operator= (ConstantDef_ptr);
-    operator ConstantDef_ptr &();
-    ConstantDef_ptr &ptr (void);
-    ConstantDef_ptr operator-> (void);
-  
-  private:
-    ConstantDef_ptr &ptr_;
+    static ConstantDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class IDLType;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_IDLTYPE___PTR_CH_)
-#define _CORBA_IDLTYPE___PTR_CH_
-  
+#if !defined (_CORBA_IDLTYPE__ODDS_N_ENDS_CH_)
+#define _CORBA_IDLTYPE__ODDS_N_ENDS_CH_
+
+  class IDLType;
   typedef IDLType *IDLType_ptr;
+  struct tao_IDLType_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        IDLType,
+        tao_IDLType_life
+      >
+    IDLType_var;
 
-#if !defined (_CORBA_IDLTYPE___VAR_CH_)
-#define _CORBA_IDLTYPE___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export IDLType_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        IDLType,
+        tao_IDLType_life
+      >
+    IDLType_out;
+
+  struct TAO_IFR_Client_Export tao_IDLType_life
   {
-  public:
-    IDLType_var (void); // default constructor
-    IDLType_var (IDLType_ptr p) : ptr_ (p) {} 
-    IDLType_var (const IDLType_var &); // copy constructor
-    ~IDLType_var (void); // destructor
-    
-    IDLType_var &operator= (IDLType_ptr);
-    IDLType_var &operator= (const IDLType_var &);
-    IDLType_ptr operator-> (void) const;
-    
-    operator const IDLType_ptr &() const;
-    operator IDLType_ptr &();
-    // in, inout, out, _retn 
-    IDLType_ptr in (void) const;
-    IDLType_ptr &inout (void);
-    IDLType_ptr &out (void);
-    IDLType_ptr _retn (void);
-    IDLType_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static IDLType_ptr tao_duplicate (IDLType_ptr);
     static void tao_release (IDLType_ptr);
     static IDLType_ptr tao_nil (void);
-    static IDLType_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        IDLType_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    IDLType_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    IDLType_var (const TAO_Base_var &rhs);
-    IDLType_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE___OUT_CH_)
-#define _CORBA_IDLTYPE___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export IDLType_out
+  struct TAO_IFR_Client_Export tao_IDLType_cast
   {
-  public:
-    IDLType_out (IDLType_ptr &);
-    IDLType_out (IDLType_var &);
-    IDLType_out (const IDLType_out &);
-    IDLType_out &operator= (const IDLType_out &);
-    IDLType_out &operator= (const IDLType_var &);
-    IDLType_out &operator= (IDLType_ptr);
-    operator IDLType_ptr &();
-    IDLType_ptr &ptr (void);
-    IDLType_ptr operator-> (void);
-  
-  private:
-    IDLType_ptr &ptr_;
+    static IDLType_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class StructDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_STRUCTDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_STRUCTDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_STRUCTDEF___PTR_CH_)
-#define _CORBA_STRUCTDEF___PTR_CH_
-  
+  class StructDef;
   typedef StructDef *StructDef_ptr;
+  struct tao_StructDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        StructDef,
+        tao_StructDef_life
+      >
+    StructDef_var;
 
-#if !defined (_CORBA_STRUCTDEF___VAR_CH_)
-#define _CORBA_STRUCTDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export StructDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        StructDef,
+        tao_StructDef_life
+      >
+    StructDef_out;
+
+  struct TAO_IFR_Client_Export tao_StructDef_life
   {
-  public:
-    StructDef_var (void); // default constructor
-    StructDef_var (StructDef_ptr p) : ptr_ (p) {} 
-    StructDef_var (const StructDef_var &); // copy constructor
-    ~StructDef_var (void); // destructor
-    
-    StructDef_var &operator= (StructDef_ptr);
-    StructDef_var &operator= (const StructDef_var &);
-    StructDef_ptr operator-> (void) const;
-    
-    operator const StructDef_ptr &() const;
-    operator StructDef_ptr &();
-    // in, inout, out, _retn 
-    StructDef_ptr in (void) const;
-    StructDef_ptr &inout (void);
-    StructDef_ptr &out (void);
-    StructDef_ptr _retn (void);
-    StructDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static StructDef_ptr tao_duplicate (StructDef_ptr);
     static void tao_release (StructDef_ptr);
     static StructDef_ptr tao_nil (void);
-    static StructDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        StructDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    StructDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    StructDef_var (const TAO_Base_var &rhs);
-    StructDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTDEF___OUT_CH_)
-#define _CORBA_STRUCTDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export StructDef_out
+  struct TAO_IFR_Client_Export tao_StructDef_cast
   {
-  public:
-    StructDef_out (StructDef_ptr &);
-    StructDef_out (StructDef_var &);
-    StructDef_out (const StructDef_out &);
-    StructDef_out &operator= (const StructDef_out &);
-    StructDef_out &operator= (const StructDef_var &);
-    StructDef_out &operator= (StructDef_ptr);
-    operator StructDef_ptr &();
-    StructDef_ptr &ptr (void);
-    StructDef_ptr operator-> (void);
-  
-  private:
-    StructDef_ptr &ptr_;
+    static StructDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class UnionDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_UNIONDEF___PTR_CH_)
-#define _CORBA_UNIONDEF___PTR_CH_
-  
+#if !defined (_CORBA_UNIONDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_UNIONDEF__ODDS_N_ENDS_CH_
+
+  class UnionDef;
   typedef UnionDef *UnionDef_ptr;
+  struct tao_UnionDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        UnionDef,
+        tao_UnionDef_life
+      >
+    UnionDef_var;
 
-#if !defined (_CORBA_UNIONDEF___VAR_CH_)
-#define _CORBA_UNIONDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export UnionDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        UnionDef,
+        tao_UnionDef_life
+      >
+    UnionDef_out;
+
+  struct TAO_IFR_Client_Export tao_UnionDef_life
   {
-  public:
-    UnionDef_var (void); // default constructor
-    UnionDef_var (UnionDef_ptr p) : ptr_ (p) {} 
-    UnionDef_var (const UnionDef_var &); // copy constructor
-    ~UnionDef_var (void); // destructor
-    
-    UnionDef_var &operator= (UnionDef_ptr);
-    UnionDef_var &operator= (const UnionDef_var &);
-    UnionDef_ptr operator-> (void) const;
-    
-    operator const UnionDef_ptr &() const;
-    operator UnionDef_ptr &();
-    // in, inout, out, _retn 
-    UnionDef_ptr in (void) const;
-    UnionDef_ptr &inout (void);
-    UnionDef_ptr &out (void);
-    UnionDef_ptr _retn (void);
-    UnionDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static UnionDef_ptr tao_duplicate (UnionDef_ptr);
     static void tao_release (UnionDef_ptr);
     static UnionDef_ptr tao_nil (void);
-    static UnionDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        UnionDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    UnionDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    UnionDef_var (const TAO_Base_var &rhs);
-    UnionDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONDEF___OUT_CH_)
-#define _CORBA_UNIONDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export UnionDef_out
+  struct TAO_IFR_Client_Export tao_UnionDef_cast
   {
-  public:
-    UnionDef_out (UnionDef_ptr &);
-    UnionDef_out (UnionDef_var &);
-    UnionDef_out (const UnionDef_out &);
-    UnionDef_out &operator= (const UnionDef_out &);
-    UnionDef_out &operator= (const UnionDef_var &);
-    UnionDef_out &operator= (UnionDef_ptr);
-    operator UnionDef_ptr &();
-    UnionDef_ptr &ptr (void);
-    UnionDef_ptr operator-> (void);
-  
-  private:
-    UnionDef_ptr &ptr_;
+    static UnionDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class EnumDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_ENUMDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_ENUMDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_ENUMDEF___PTR_CH_)
-#define _CORBA_ENUMDEF___PTR_CH_
-  
+  class EnumDef;
   typedef EnumDef *EnumDef_ptr;
+  struct tao_EnumDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        EnumDef,
+        tao_EnumDef_life
+      >
+    EnumDef_var;
 
-#if !defined (_CORBA_ENUMDEF___VAR_CH_)
-#define _CORBA_ENUMDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export EnumDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        EnumDef,
+        tao_EnumDef_life
+      >
+    EnumDef_out;
+
+  struct TAO_IFR_Client_Export tao_EnumDef_life
   {
-  public:
-    EnumDef_var (void); // default constructor
-    EnumDef_var (EnumDef_ptr p) : ptr_ (p) {} 
-    EnumDef_var (const EnumDef_var &); // copy constructor
-    ~EnumDef_var (void); // destructor
-    
-    EnumDef_var &operator= (EnumDef_ptr);
-    EnumDef_var &operator= (const EnumDef_var &);
-    EnumDef_ptr operator-> (void) const;
-    
-    operator const EnumDef_ptr &() const;
-    operator EnumDef_ptr &();
-    // in, inout, out, _retn 
-    EnumDef_ptr in (void) const;
-    EnumDef_ptr &inout (void);
-    EnumDef_ptr &out (void);
-    EnumDef_ptr _retn (void);
-    EnumDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static EnumDef_ptr tao_duplicate (EnumDef_ptr);
     static void tao_release (EnumDef_ptr);
     static EnumDef_ptr tao_nil (void);
-    static EnumDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        EnumDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    EnumDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    EnumDef_var (const TAO_Base_var &rhs);
-    EnumDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF___OUT_CH_)
-#define _CORBA_ENUMDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export EnumDef_out
+  struct TAO_IFR_Client_Export tao_EnumDef_cast
   {
-  public:
-    EnumDef_out (EnumDef_ptr &);
-    EnumDef_out (EnumDef_var &);
-    EnumDef_out (const EnumDef_out &);
-    EnumDef_out &operator= (const EnumDef_out &);
-    EnumDef_out &operator= (const EnumDef_var &);
-    EnumDef_out &operator= (EnumDef_ptr);
-    operator EnumDef_ptr &();
-    EnumDef_ptr &ptr (void);
-    EnumDef_ptr operator-> (void);
-  
-  private:
-    EnumDef_ptr &ptr_;
+    static EnumDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class AliasDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_ALIASDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_ALIASDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_ALIASDEF___PTR_CH_)
-#define _CORBA_ALIASDEF___PTR_CH_
-  
+  class AliasDef;
   typedef AliasDef *AliasDef_ptr;
+  struct tao_AliasDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        AliasDef,
+        tao_AliasDef_life
+      >
+    AliasDef_var;
 
-#if !defined (_CORBA_ALIASDEF___VAR_CH_)
-#define _CORBA_ALIASDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export AliasDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        AliasDef,
+        tao_AliasDef_life
+      >
+    AliasDef_out;
+
+  struct TAO_IFR_Client_Export tao_AliasDef_life
   {
-  public:
-    AliasDef_var (void); // default constructor
-    AliasDef_var (AliasDef_ptr p) : ptr_ (p) {} 
-    AliasDef_var (const AliasDef_var &); // copy constructor
-    ~AliasDef_var (void); // destructor
-    
-    AliasDef_var &operator= (AliasDef_ptr);
-    AliasDef_var &operator= (const AliasDef_var &);
-    AliasDef_ptr operator-> (void) const;
-    
-    operator const AliasDef_ptr &() const;
-    operator AliasDef_ptr &();
-    // in, inout, out, _retn 
-    AliasDef_ptr in (void) const;
-    AliasDef_ptr &inout (void);
-    AliasDef_ptr &out (void);
-    AliasDef_ptr _retn (void);
-    AliasDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static AliasDef_ptr tao_duplicate (AliasDef_ptr);
     static void tao_release (AliasDef_ptr);
     static AliasDef_ptr tao_nil (void);
-    static AliasDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        AliasDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    AliasDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    AliasDef_var (const TAO_Base_var &rhs);
-    AliasDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF___OUT_CH_)
-#define _CORBA_ALIASDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export AliasDef_out
+  struct TAO_IFR_Client_Export tao_AliasDef_cast
   {
-  public:
-    AliasDef_out (AliasDef_ptr &);
-    AliasDef_out (AliasDef_var &);
-    AliasDef_out (const AliasDef_out &);
-    AliasDef_out &operator= (const AliasDef_out &);
-    AliasDef_out &operator= (const AliasDef_var &);
-    AliasDef_out &operator= (AliasDef_ptr);
-    operator AliasDef_ptr &();
-    AliasDef_ptr &ptr (void);
-    AliasDef_ptr operator-> (void);
-  
-  private:
-    AliasDef_ptr &ptr_;
+    static AliasDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class InterfaceDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
-#define _CORBA_INTERFACEDEF___PTR_CH_
-  
+#if !defined (_CORBA_INTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_INTERFACEDEF__ODDS_N_ENDS_CH_
+
+  class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
+  struct tao_InterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        InterfaceDef,
+        tao_InterfaceDef_life
+      >
+    InterfaceDef_var;
 
-#if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
-#define _CORBA_INTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        InterfaceDef,
+        tao_InterfaceDef_life
+      >
+    InterfaceDef_out;
+
+  struct TAO_IFR_Client_Export tao_InterfaceDef_life
   {
-  public:
-    InterfaceDef_var (void); // default constructor
-    InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {} 
-    InterfaceDef_var (const InterfaceDef_var &); // copy constructor
-    ~InterfaceDef_var (void); // destructor
-    
-    InterfaceDef_var &operator= (InterfaceDef_ptr);
-    InterfaceDef_var &operator= (const InterfaceDef_var &);
-    InterfaceDef_ptr operator-> (void) const;
-    
-    operator const InterfaceDef_ptr &() const;
-    operator InterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    InterfaceDef_ptr in (void) const;
-    InterfaceDef_ptr &inout (void);
-    InterfaceDef_ptr &out (void);
-    InterfaceDef_ptr _retn (void);
-    InterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static InterfaceDef_ptr tao_duplicate (InterfaceDef_ptr);
     static void tao_release (InterfaceDef_ptr);
     static InterfaceDef_ptr tao_nil (void);
-    static InterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        InterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    InterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    InterfaceDef_var (const TAO_Base_var &rhs);
-    InterfaceDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
-#define _CORBA_INTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export InterfaceDef_out
-  {
-  public:
-    InterfaceDef_out (InterfaceDef_ptr &);
-    InterfaceDef_out (InterfaceDef_var &);
-    InterfaceDef_out (const InterfaceDef_out &);
-    InterfaceDef_out &operator= (const InterfaceDef_out &);
-    InterfaceDef_out &operator= (const InterfaceDef_var &);
-    InterfaceDef_out &operator= (InterfaceDef_ptr);
-    operator InterfaceDef_ptr &();
-    InterfaceDef_ptr &ptr (void);
-    InterfaceDef_ptr operator-> (void);
-  
-  private:
-    InterfaceDef_ptr &ptr_;
   };
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-    : public TAO_Unbounded_Base_Sequence
+  struct TAO_IFR_Client_Export tao_InterfaceDef_cast
   {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        InterfaceDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static InterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (InterfaceDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const InterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static InterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
-#define _CORBA_INTERFACEDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class InterfaceDefSeq;
-  class InterfaceDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::InterfaceDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export InterfaceDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<InterfaceDef,InterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        InterfaceDefSeq,
+        TAO_Object_Manager<
+            InterfaceDef,
+            InterfaceDef,
+            CORBA::tao_InterfaceDef_life
+          >
+      >
+    InterfaceDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        InterfaceDefSeq,
+        InterfaceDefSeq_var,
+        TAO_Object_Manager<
+            InterfaceDef,
+            InterfaceDef,
+            CORBA::tao_InterfaceDef_life
+          >
+      >
+    InterfaceDefSeq_out;
+
+  class TAO_IFR_Client_Export InterfaceDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            InterfaceDef,
+            InterfaceDef,
+            CORBA::tao_InterfaceDef_life,
+            CORBA::tao_InterfaceDef_cast
+          >
   {
   public:
     InterfaceDefSeq (void);
     InterfaceDefSeq (CORBA::ULong max);
     InterfaceDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        InterfaceDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        InterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     InterfaceDefSeq (const InterfaceDefSeq &);
     ~InterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef InterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_INTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_INTERFACEDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::InterfaceDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export InterfaceDefSeq_var
-  {
-  public:
-    InterfaceDefSeq_var (void);
-    InterfaceDefSeq_var (InterfaceDefSeq *);
-    InterfaceDefSeq_var (const InterfaceDefSeq_var &);
-    ~InterfaceDefSeq_var (void);
-    
-    InterfaceDefSeq_var &operator= (InterfaceDefSeq *);
-    InterfaceDefSeq_var &operator= (const InterfaceDefSeq_var &);
-    InterfaceDefSeq *operator-> (void);
-    const InterfaceDefSeq *operator-> (void) const;
-    
-    operator const InterfaceDefSeq &() const;
-    operator InterfaceDefSeq &();
-    operator InterfaceDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator InterfaceDefSeq *&();
-    
-    TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const InterfaceDefSeq &in (void) const;
-    InterfaceDefSeq &inout (void);
-    InterfaceDefSeq *&out (void);
-    InterfaceDefSeq *_retn (void);
-    InterfaceDefSeq *ptr (void) const;
-  
-  private:
-    InterfaceDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_INTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_INTERFACEDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export InterfaceDefSeq_out
-  {
-  public:
-    InterfaceDefSeq_out (InterfaceDefSeq *&);
-    InterfaceDefSeq_out (InterfaceDefSeq_var &);
-    InterfaceDefSeq_out (const InterfaceDefSeq_out &);
-    InterfaceDefSeq_out &operator= (const InterfaceDefSeq_out &);
-    InterfaceDefSeq_out &operator= (InterfaceDefSeq *);
-    operator InterfaceDefSeq *&();
-    InterfaceDefSeq *&ptr (void);
-    InterfaceDefSeq *operator-> (void);
-    TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    InterfaceDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const InterfaceDefSeq_var &);
+    typedef InterfaceDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ExceptionDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_EXCEPTIONDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXCEPTIONDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
-#define _CORBA_EXCEPTIONDEF___PTR_CH_
-  
+  class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
+  struct tao_ExceptionDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExceptionDef,
+        tao_ExceptionDef_life
+      >
+    ExceptionDef_var;
 
-#if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
-#define _CORBA_EXCEPTIONDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExceptionDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ExceptionDef,
+        tao_ExceptionDef_life
+      >
+    ExceptionDef_out;
+
+  struct TAO_IFR_Client_Export tao_ExceptionDef_life
   {
-  public:
-    ExceptionDef_var (void); // default constructor
-    ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {} 
-    ExceptionDef_var (const ExceptionDef_var &); // copy constructor
-    ~ExceptionDef_var (void); // destructor
-    
-    ExceptionDef_var &operator= (ExceptionDef_ptr);
-    ExceptionDef_var &operator= (const ExceptionDef_var &);
-    ExceptionDef_ptr operator-> (void) const;
-    
-    operator const ExceptionDef_ptr &() const;
-    operator ExceptionDef_ptr &();
-    // in, inout, out, _retn 
-    ExceptionDef_ptr in (void) const;
-    ExceptionDef_ptr &inout (void);
-    ExceptionDef_ptr &out (void);
-    ExceptionDef_ptr _retn (void);
-    ExceptionDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ExceptionDef_ptr tao_duplicate (ExceptionDef_ptr);
     static void tao_release (ExceptionDef_ptr);
     static ExceptionDef_ptr tao_nil (void);
-    static ExceptionDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExceptionDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExceptionDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExceptionDef_var (const TAO_Base_var &rhs);
-    ExceptionDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
-#define _CORBA_EXCEPTIONDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExceptionDef_out
+  struct TAO_IFR_Client_Export tao_ExceptionDef_cast
   {
-  public:
-    ExceptionDef_out (ExceptionDef_ptr &);
-    ExceptionDef_out (ExceptionDef_var &);
-    ExceptionDef_out (const ExceptionDef_out &);
-    ExceptionDef_out &operator= (const ExceptionDef_out &);
-    ExceptionDef_out &operator= (const ExceptionDef_var &);
-    ExceptionDef_out &operator= (ExceptionDef_ptr);
-    operator ExceptionDef_ptr &();
-    ExceptionDef_ptr &ptr (void);
-    ExceptionDef_ptr operator-> (void);
-  
-  private:
-    ExceptionDef_ptr &ptr_;
+    static ExceptionDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class NativeDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_NATIVEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_NATIVEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_NATIVEDEF___PTR_CH_)
-#define _CORBA_NATIVEDEF___PTR_CH_
-  
+  class NativeDef;
   typedef NativeDef *NativeDef_ptr;
+  struct tao_NativeDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        NativeDef,
+        tao_NativeDef_life
+      >
+    NativeDef_var;
 
-#if !defined (_CORBA_NATIVEDEF___VAR_CH_)
-#define _CORBA_NATIVEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export NativeDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        NativeDef,
+        tao_NativeDef_life
+      >
+    NativeDef_out;
+
+  struct TAO_IFR_Client_Export tao_NativeDef_life
   {
-  public:
-    NativeDef_var (void); // default constructor
-    NativeDef_var (NativeDef_ptr p) : ptr_ (p) {} 
-    NativeDef_var (const NativeDef_var &); // copy constructor
-    ~NativeDef_var (void); // destructor
-    
-    NativeDef_var &operator= (NativeDef_ptr);
-    NativeDef_var &operator= (const NativeDef_var &);
-    NativeDef_ptr operator-> (void) const;
-    
-    operator const NativeDef_ptr &() const;
-    operator NativeDef_ptr &();
-    // in, inout, out, _retn 
-    NativeDef_ptr in (void) const;
-    NativeDef_ptr &inout (void);
-    NativeDef_ptr &out (void);
-    NativeDef_ptr _retn (void);
-    NativeDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static NativeDef_ptr tao_duplicate (NativeDef_ptr);
     static void tao_release (NativeDef_ptr);
     static NativeDef_ptr tao_nil (void);
-    static NativeDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        NativeDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    NativeDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    NativeDef_var (const TAO_Base_var &rhs);
-    NativeDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_NATIVEDEF___OUT_CH_)
-#define _CORBA_NATIVEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export NativeDef_out
+  struct TAO_IFR_Client_Export tao_NativeDef_cast
   {
-  public:
-    NativeDef_out (NativeDef_ptr &);
-    NativeDef_out (NativeDef_var &);
-    NativeDef_out (const NativeDef_out &);
-    NativeDef_out &operator= (const NativeDef_out &);
-    NativeDef_out &operator= (const NativeDef_var &);
-    NativeDef_out &operator= (NativeDef_ptr);
-    operator NativeDef_ptr &();
-    NativeDef_ptr &ptr (void);
-    NativeDef_ptr operator-> (void);
-  
-  private:
-    NativeDef_ptr &ptr_;
+    static NativeDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ValueDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_VALUEDEF___PTR_CH_)
-#define _CORBA_VALUEDEF___PTR_CH_
-  
+#if !defined (_CORBA_VALUEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_VALUEDEF__ODDS_N_ENDS_CH_
+
+  class ValueDef;
   typedef ValueDef *ValueDef_ptr;
+  struct tao_ValueDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ValueDef,
+        tao_ValueDef_life
+      >
+    ValueDef_var;
 
-#if !defined (_CORBA_VALUEDEF___VAR_CH_)
-#define _CORBA_VALUEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ValueDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ValueDef,
+        tao_ValueDef_life
+      >
+    ValueDef_out;
+
+  struct TAO_IFR_Client_Export tao_ValueDef_life
   {
-  public:
-    ValueDef_var (void); // default constructor
-    ValueDef_var (ValueDef_ptr p) : ptr_ (p) {} 
-    ValueDef_var (const ValueDef_var &); // copy constructor
-    ~ValueDef_var (void); // destructor
-    
-    ValueDef_var &operator= (ValueDef_ptr);
-    ValueDef_var &operator= (const ValueDef_var &);
-    ValueDef_ptr operator-> (void) const;
-    
-    operator const ValueDef_ptr &() const;
-    operator ValueDef_ptr &();
-    // in, inout, out, _retn 
-    ValueDef_ptr in (void) const;
-    ValueDef_ptr &inout (void);
-    ValueDef_ptr &out (void);
-    ValueDef_ptr _retn (void);
-    ValueDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ValueDef_ptr tao_duplicate (ValueDef_ptr);
     static void tao_release (ValueDef_ptr);
     static ValueDef_ptr tao_nil (void);
-    static ValueDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ValueDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ValueDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ValueDef_var (const TAO_Base_var &rhs);
-    ValueDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF___OUT_CH_)
-#define _CORBA_VALUEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ValueDef_out
-  {
-  public:
-    ValueDef_out (ValueDef_ptr &);
-    ValueDef_out (ValueDef_var &);
-    ValueDef_out (const ValueDef_out &);
-    ValueDef_out &operator= (const ValueDef_out &);
-    ValueDef_out &operator= (const ValueDef_var &);
-    ValueDef_out &operator= (ValueDef_ptr);
-    operator ValueDef_ptr &();
-    ValueDef_ptr &ptr (void);
-    ValueDef_ptr operator-> (void);
-  
-  private:
-    ValueDef_ptr &ptr_;
   };
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-    : public TAO_Unbounded_Base_Sequence
+  struct TAO_IFR_Client_Export tao_ValueDef_cast
   {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ValueDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static ValueDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ValueDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ValueDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static ValueDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEDEFSEQ_CH_)
-#define _CORBA_VALUEDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ValueDefSeq;
-  class ValueDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::ValueDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ValueDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ValueDef,ValueDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ValueDefSeq,
+        TAO_Object_Manager<
+            ValueDef,
+            ValueDef,
+            CORBA::tao_ValueDef_life
+          >
+      >
+    ValueDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ValueDefSeq,
+        ValueDefSeq_var,
+        TAO_Object_Manager<
+            ValueDef,
+            ValueDef,
+            CORBA::tao_ValueDef_life
+          >
+      >
+    ValueDefSeq_out;
+
+  class TAO_IFR_Client_Export ValueDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            ValueDef,
+            ValueDef,
+            CORBA::tao_ValueDef_life,
+            CORBA::tao_ValueDef_cast
+          >
   {
   public:
     ValueDefSeq (void);
     ValueDefSeq (CORBA::ULong max);
     ValueDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ValueDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ValueDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ValueDefSeq (const ValueDefSeq &);
     ~ValueDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ValueDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEFSEQ___VAR_CH_)
-#define _CORBA_VALUEDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ValueDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ValueDefSeq_var
-  {
-  public:
-    ValueDefSeq_var (void);
-    ValueDefSeq_var (ValueDefSeq *);
-    ValueDefSeq_var (const ValueDefSeq_var &);
-    ~ValueDefSeq_var (void);
-    
-    ValueDefSeq_var &operator= (ValueDefSeq *);
-    ValueDefSeq_var &operator= (const ValueDefSeq_var &);
-    ValueDefSeq *operator-> (void);
-    const ValueDefSeq *operator-> (void) const;
-    
-    operator const ValueDefSeq &() const;
-    operator ValueDefSeq &();
-    operator ValueDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator ValueDefSeq *&();
-    
-    TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ValueDefSeq &in (void) const;
-    ValueDefSeq &inout (void);
-    ValueDefSeq *&out (void);
-    ValueDefSeq *_retn (void);
-    ValueDefSeq *ptr (void) const;
-  
-  private:
-    ValueDefSeq *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_VALUEDEFSEQ___OUT_CH_)
-#define _CORBA_VALUEDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ValueDefSeq_out
-  {
-  public:
-    ValueDefSeq_out (ValueDefSeq *&);
-    ValueDefSeq_out (ValueDefSeq_var &);
-    ValueDefSeq_out (const ValueDefSeq_out &);
-    ValueDefSeq_out &operator= (const ValueDefSeq_out &);
-    ValueDefSeq_out &operator= (ValueDefSeq *);
-    operator ValueDefSeq *&();
-    ValueDefSeq *&ptr (void);
-    ValueDefSeq *operator-> (void);
-    TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ValueDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ValueDefSeq_var &);
+    typedef ValueDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDefSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ValueBoxDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
-#define _CORBA_VALUEBOXDEF___PTR_CH_
-  
+#if !defined (_CORBA_VALUEBOXDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_VALUEBOXDEF__ODDS_N_ENDS_CH_
+
+  class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
+  struct tao_ValueBoxDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ValueBoxDef,
+        tao_ValueBoxDef_life
+      >
+    ValueBoxDef_var;
 
-#if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
-#define _CORBA_VALUEBOXDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ValueBoxDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ValueBoxDef,
+        tao_ValueBoxDef_life
+      >
+    ValueBoxDef_out;
+
+  struct TAO_IFR_Client_Export tao_ValueBoxDef_life
   {
-  public:
-    ValueBoxDef_var (void); // default constructor
-    ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {} 
-    ValueBoxDef_var (const ValueBoxDef_var &); // copy constructor
-    ~ValueBoxDef_var (void); // destructor
-    
-    ValueBoxDef_var &operator= (ValueBoxDef_ptr);
-    ValueBoxDef_var &operator= (const ValueBoxDef_var &);
-    ValueBoxDef_ptr operator-> (void) const;
-    
-    operator const ValueBoxDef_ptr &() const;
-    operator ValueBoxDef_ptr &();
-    // in, inout, out, _retn 
-    ValueBoxDef_ptr in (void) const;
-    ValueBoxDef_ptr &inout (void);
-    ValueBoxDef_ptr &out (void);
-    ValueBoxDef_ptr _retn (void);
-    ValueBoxDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ValueBoxDef_ptr tao_duplicate (ValueBoxDef_ptr);
     static void tao_release (ValueBoxDef_ptr);
     static ValueBoxDef_ptr tao_nil (void);
-    static ValueBoxDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ValueBoxDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ValueBoxDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ValueBoxDef_var (const TAO_Base_var &rhs);
-    ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
-#define _CORBA_VALUEBOXDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ValueBoxDef_out
+  struct TAO_IFR_Client_Export tao_ValueBoxDef_cast
   {
-  public:
-    ValueBoxDef_out (ValueBoxDef_ptr &);
-    ValueBoxDef_out (ValueBoxDef_var &);
-    ValueBoxDef_out (const ValueBoxDef_out &);
-    ValueBoxDef_out &operator= (const ValueBoxDef_out &);
-    ValueBoxDef_out &operator= (const ValueBoxDef_var &);
-    ValueBoxDef_out &operator= (ValueBoxDef_ptr);
-    operator ValueBoxDef_ptr &();
-    ValueBoxDef_ptr &ptr (void);
-    ValueBoxDef_ptr operator-> (void);
-  
-  private:
-    ValueBoxDef_ptr &ptr_;
+    static ValueBoxDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class AbstractInterfaceDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
-  
+  class AbstractInterfaceDef;
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
+  struct tao_AbstractInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        AbstractInterfaceDef,
+        tao_AbstractInterfaceDef_life
+      >
+    AbstractInterfaceDef_var;
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        AbstractInterfaceDef,
+        tao_AbstractInterfaceDef_life
+      >
+    AbstractInterfaceDef_out;
+
+  struct TAO_IFR_Client_Export tao_AbstractInterfaceDef_life
   {
-  public:
-    AbstractInterfaceDef_var (void); // default constructor
-    AbstractInterfaceDef_var (AbstractInterfaceDef_ptr p) : ptr_ (p) {} 
-    AbstractInterfaceDef_var (const AbstractInterfaceDef_var &); // copy constructor
-    ~AbstractInterfaceDef_var (void); // destructor
-    
-    AbstractInterfaceDef_var &operator= (AbstractInterfaceDef_ptr);
-    AbstractInterfaceDef_var &operator= (const AbstractInterfaceDef_var &);
-    AbstractInterfaceDef_ptr operator-> (void) const;
-    
-    operator const AbstractInterfaceDef_ptr &() const;
-    operator AbstractInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    AbstractInterfaceDef_ptr in (void) const;
-    AbstractInterfaceDef_ptr &inout (void);
-    AbstractInterfaceDef_ptr &out (void);
-    AbstractInterfaceDef_ptr _retn (void);
-    AbstractInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static AbstractInterfaceDef_ptr tao_duplicate (AbstractInterfaceDef_ptr);
     static void tao_release (AbstractInterfaceDef_ptr);
     static AbstractInterfaceDef_ptr tao_nil (void);
-    static AbstractInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        AbstractInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    AbstractInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    AbstractInterfaceDef_var (const TAO_Base_var &rhs);
-    AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDef_out
-  {
-  public:
-    AbstractInterfaceDef_out (AbstractInterfaceDef_ptr &);
-    AbstractInterfaceDef_out (AbstractInterfaceDef_var &);
-    AbstractInterfaceDef_out (const AbstractInterfaceDef_out &);
-    AbstractInterfaceDef_out &operator= (const AbstractInterfaceDef_out &);
-    AbstractInterfaceDef_out &operator= (const AbstractInterfaceDef_var &);
-    AbstractInterfaceDef_out &operator= (AbstractInterfaceDef_ptr);
-    operator AbstractInterfaceDef_ptr &();
-    AbstractInterfaceDef_ptr &ptr (void);
-    AbstractInterfaceDef_ptr operator-> (void);
-  
-  private:
-    AbstractInterfaceDef_ptr &ptr_;
   };
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-    : public TAO_Unbounded_Base_Sequence
+  struct TAO_IFR_Client_Export tao_AbstractInterfaceDef_cast
   {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        AbstractInterfaceDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static AbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (AbstractInterfaceDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    AbstractInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const AbstractInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static AbstractInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class AbstractInterfaceDefSeq;
-  class AbstractInterfaceDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::AbstractInterfaceDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<AbstractInterfaceDef,AbstractInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        AbstractInterfaceDefSeq,
+        TAO_Object_Manager<
+            AbstractInterfaceDef,
+            AbstractInterfaceDef,
+            CORBA::tao_AbstractInterfaceDef_life
+          >
+      >
+    AbstractInterfaceDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        AbstractInterfaceDefSeq,
+        AbstractInterfaceDefSeq_var,
+        TAO_Object_Manager<
+            AbstractInterfaceDef,
+            AbstractInterfaceDef,
+            CORBA::tao_AbstractInterfaceDef_life
+          >
+      >
+    AbstractInterfaceDefSeq_out;
+
+  class TAO_IFR_Client_Export AbstractInterfaceDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            AbstractInterfaceDef,
+            AbstractInterfaceDef,
+            CORBA::tao_AbstractInterfaceDef_life,
+            CORBA::tao_AbstractInterfaceDef_cast
+          >
   {
   public:
     AbstractInterfaceDefSeq (void);
     AbstractInterfaceDefSeq (CORBA::ULong max);
     AbstractInterfaceDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        AbstractInterfaceDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        AbstractInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &);
     ~AbstractInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef AbstractInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::AbstractInterfaceDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDefSeq_var
-  {
-  public:
-    AbstractInterfaceDefSeq_var (void);
-    AbstractInterfaceDefSeq_var (AbstractInterfaceDefSeq *);
-    AbstractInterfaceDefSeq_var (const AbstractInterfaceDefSeq_var &);
-    ~AbstractInterfaceDefSeq_var (void);
-    
-    AbstractInterfaceDefSeq_var &operator= (AbstractInterfaceDefSeq *);
-    AbstractInterfaceDefSeq_var &operator= (const AbstractInterfaceDefSeq_var &);
-    AbstractInterfaceDefSeq *operator-> (void);
-    const AbstractInterfaceDefSeq *operator-> (void) const;
-    
-    operator const AbstractInterfaceDefSeq &() const;
-    operator AbstractInterfaceDefSeq &();
-    operator AbstractInterfaceDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator AbstractInterfaceDefSeq *&();
-    
-    TAO_Object_Manager<AbstractInterfaceDef, AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const AbstractInterfaceDefSeq &in (void) const;
-    AbstractInterfaceDefSeq &inout (void);
-    AbstractInterfaceDefSeq *&out (void);
-    AbstractInterfaceDefSeq *_retn (void);
-    AbstractInterfaceDefSeq *ptr (void) const;
-  
-  private:
-    AbstractInterfaceDefSeq *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDefSeq_out
-  {
-  public:
-    AbstractInterfaceDefSeq_out (AbstractInterfaceDefSeq *&);
-    AbstractInterfaceDefSeq_out (AbstractInterfaceDefSeq_var &);
-    AbstractInterfaceDefSeq_out (const AbstractInterfaceDefSeq_out &);
-    AbstractInterfaceDefSeq_out &operator= (const AbstractInterfaceDefSeq_out &);
-    AbstractInterfaceDefSeq_out &operator= (AbstractInterfaceDefSeq *);
-    operator AbstractInterfaceDefSeq *&();
-    AbstractInterfaceDefSeq *&ptr (void);
-    AbstractInterfaceDefSeq *operator-> (void);
-    TAO_Object_Manager<AbstractInterfaceDef, AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    AbstractInterfaceDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const AbstractInterfaceDefSeq_var &);
+    typedef AbstractInterfaceDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class LocalInterfaceDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_LOCALINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_LOCALINTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
-#define _CORBA_LOCALINTERFACEDEF___PTR_CH_
-  
+  class LocalInterfaceDef;
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
+  struct tao_LocalInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        LocalInterfaceDef,
+        tao_LocalInterfaceDef_life
+      >
+    LocalInterfaceDef_var;
 
-#if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
-#define _CORBA_LOCALINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export LocalInterfaceDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        LocalInterfaceDef,
+        tao_LocalInterfaceDef_life
+      >
+    LocalInterfaceDef_out;
+
+  struct TAO_IFR_Client_Export tao_LocalInterfaceDef_life
   {
-  public:
-    LocalInterfaceDef_var (void); // default constructor
-    LocalInterfaceDef_var (LocalInterfaceDef_ptr p) : ptr_ (p) {} 
-    LocalInterfaceDef_var (const LocalInterfaceDef_var &); // copy constructor
-    ~LocalInterfaceDef_var (void); // destructor
-    
-    LocalInterfaceDef_var &operator= (LocalInterfaceDef_ptr);
-    LocalInterfaceDef_var &operator= (const LocalInterfaceDef_var &);
-    LocalInterfaceDef_ptr operator-> (void) const;
-    
-    operator const LocalInterfaceDef_ptr &() const;
-    operator LocalInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    LocalInterfaceDef_ptr in (void) const;
-    LocalInterfaceDef_ptr &inout (void);
-    LocalInterfaceDef_ptr &out (void);
-    LocalInterfaceDef_ptr _retn (void);
-    LocalInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static LocalInterfaceDef_ptr tao_duplicate (LocalInterfaceDef_ptr);
     static void tao_release (LocalInterfaceDef_ptr);
     static LocalInterfaceDef_ptr tao_nil (void);
-    static LocalInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        LocalInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    LocalInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    LocalInterfaceDef_var (const TAO_Base_var &rhs);
-    LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
-#define _CORBA_LOCALINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export LocalInterfaceDef_out
-  {
-  public:
-    LocalInterfaceDef_out (LocalInterfaceDef_ptr &);
-    LocalInterfaceDef_out (LocalInterfaceDef_var &);
-    LocalInterfaceDef_out (const LocalInterfaceDef_out &);
-    LocalInterfaceDef_out &operator= (const LocalInterfaceDef_out &);
-    LocalInterfaceDef_out &operator= (const LocalInterfaceDef_var &);
-    LocalInterfaceDef_out &operator= (LocalInterfaceDef_ptr);
-    operator LocalInterfaceDef_ptr &();
-    LocalInterfaceDef_ptr &ptr (void);
-    LocalInterfaceDef_ptr operator-> (void);
-  
-  private:
-    LocalInterfaceDef_ptr &ptr_;
   };
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-    : public TAO_Unbounded_Base_Sequence
+  struct TAO_IFR_Client_Export tao_LocalInterfaceDef_cast
   {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        LocalInterfaceDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static LocalInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (LocalInterfaceDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    LocalInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const LocalInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static LocalInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
-#define _CORBA_LOCALINTERFACEDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class LocalInterfaceDefSeq;
-  class LocalInterfaceDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::LocalInterfaceDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export LocalInterfaceDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<LocalInterfaceDef,LocalInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        LocalInterfaceDefSeq,
+        TAO_Object_Manager<
+            LocalInterfaceDef,
+            LocalInterfaceDef,
+            CORBA::tao_LocalInterfaceDef_life
+          >
+      >
+    LocalInterfaceDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        LocalInterfaceDefSeq,
+        LocalInterfaceDefSeq_var,
+        TAO_Object_Manager<
+            LocalInterfaceDef,
+            LocalInterfaceDef,
+            CORBA::tao_LocalInterfaceDef_life
+          >
+      >
+    LocalInterfaceDefSeq_out;
+
+  class TAO_IFR_Client_Export LocalInterfaceDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            LocalInterfaceDef,
+            LocalInterfaceDef,
+            CORBA::tao_LocalInterfaceDef_life,
+            CORBA::tao_LocalInterfaceDef_cast
+          >
   {
   public:
     LocalInterfaceDefSeq (void);
     LocalInterfaceDefSeq (CORBA::ULong max);
     LocalInterfaceDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        LocalInterfaceDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        LocalInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     LocalInterfaceDefSeq (const LocalInterfaceDefSeq &);
     ~LocalInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef LocalInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::LocalInterfaceDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export LocalInterfaceDefSeq_var
-  {
-  public:
-    LocalInterfaceDefSeq_var (void);
-    LocalInterfaceDefSeq_var (LocalInterfaceDefSeq *);
-    LocalInterfaceDefSeq_var (const LocalInterfaceDefSeq_var &);
-    ~LocalInterfaceDefSeq_var (void);
-    
-    LocalInterfaceDefSeq_var &operator= (LocalInterfaceDefSeq *);
-    LocalInterfaceDefSeq_var &operator= (const LocalInterfaceDefSeq_var &);
-    LocalInterfaceDefSeq *operator-> (void);
-    const LocalInterfaceDefSeq *operator-> (void) const;
-    
-    operator const LocalInterfaceDefSeq &() const;
-    operator LocalInterfaceDefSeq &();
-    operator LocalInterfaceDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator LocalInterfaceDefSeq *&();
-    
-    TAO_Object_Manager<LocalInterfaceDef, LocalInterfaceDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const LocalInterfaceDefSeq &in (void) const;
-    LocalInterfaceDefSeq &inout (void);
-    LocalInterfaceDefSeq *&out (void);
-    LocalInterfaceDefSeq *_retn (void);
-    LocalInterfaceDefSeq *ptr (void) const;
-  
-  private:
-    LocalInterfaceDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export LocalInterfaceDefSeq_out
-  {
-  public:
-    LocalInterfaceDefSeq_out (LocalInterfaceDefSeq *&);
-    LocalInterfaceDefSeq_out (LocalInterfaceDefSeq_var &);
-    LocalInterfaceDefSeq_out (const LocalInterfaceDefSeq_out &);
-    LocalInterfaceDefSeq_out &operator= (const LocalInterfaceDefSeq_out &);
-    LocalInterfaceDefSeq_out &operator= (LocalInterfaceDefSeq *);
-    operator LocalInterfaceDefSeq *&();
-    LocalInterfaceDefSeq *&ptr (void);
-    LocalInterfaceDefSeq *operator-> (void);
-    TAO_Object_Manager<LocalInterfaceDef, LocalInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    LocalInterfaceDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const LocalInterfaceDefSeq_var &);
+    typedef LocalInterfaceDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ExtInterfaceDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_EXTINTERFACEDEF___PTR_CH_)
-#define _CORBA_EXTINTERFACEDEF___PTR_CH_
-  
+#if !defined (_CORBA_EXTINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTINTERFACEDEF__ODDS_N_ENDS_CH_
+
+  class ExtInterfaceDef;
   typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
+  struct tao_ExtInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExtInterfaceDef,
+        tao_ExtInterfaceDef_life
+      >
+    ExtInterfaceDef_var;
 
-#if !defined (_CORBA_EXTINTERFACEDEF___VAR_CH_)
-#define _CORBA_EXTINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtInterfaceDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ExtInterfaceDef,
+        tao_ExtInterfaceDef_life
+      >
+    ExtInterfaceDef_out;
+
+  struct TAO_IFR_Client_Export tao_ExtInterfaceDef_life
   {
-  public:
-    ExtInterfaceDef_var (void); // default constructor
-    ExtInterfaceDef_var (ExtInterfaceDef_ptr p) : ptr_ (p) {} 
-    ExtInterfaceDef_var (const ExtInterfaceDef_var &); // copy constructor
-    ~ExtInterfaceDef_var (void); // destructor
-    
-    ExtInterfaceDef_var &operator= (ExtInterfaceDef_ptr);
-    ExtInterfaceDef_var &operator= (const ExtInterfaceDef_var &);
-    ExtInterfaceDef_ptr operator-> (void) const;
-    
-    operator const ExtInterfaceDef_ptr &() const;
-    operator ExtInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    ExtInterfaceDef_ptr in (void) const;
-    ExtInterfaceDef_ptr &inout (void);
-    ExtInterfaceDef_ptr &out (void);
-    ExtInterfaceDef_ptr _retn (void);
-    ExtInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ExtInterfaceDef_ptr tao_duplicate (ExtInterfaceDef_ptr);
     static void tao_release (ExtInterfaceDef_ptr);
     static ExtInterfaceDef_ptr tao_nil (void);
-    static ExtInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtInterfaceDef_var (const TAO_Base_var &rhs);
-    ExtInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTINTERFACEDEF___OUT_CH_)
-#define _CORBA_EXTINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtInterfaceDef_out
-  {
-  public:
-    ExtInterfaceDef_out (ExtInterfaceDef_ptr &);
-    ExtInterfaceDef_out (ExtInterfaceDef_var &);
-    ExtInterfaceDef_out (const ExtInterfaceDef_out &);
-    ExtInterfaceDef_out &operator= (const ExtInterfaceDef_out &);
-    ExtInterfaceDef_out &operator= (const ExtInterfaceDef_var &);
-    ExtInterfaceDef_out &operator= (ExtInterfaceDef_ptr);
-    operator ExtInterfaceDef_ptr &();
-    ExtInterfaceDef_ptr &ptr (void);
-    ExtInterfaceDef_ptr operator-> (void);
-  
-  private:
-    ExtInterfaceDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
-    : public TAO_Unbounded_Base_Sequence
+  struct TAO_IFR_Client_Export tao_ExtInterfaceDef_cast
   {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExtInterfaceDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static ExtInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ExtInterfaceDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExtInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ExtInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static ExtInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTINTERFACEDEFSEQ_CH_)
-#define _CORBA_EXTINTERFACEDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ExtInterfaceDefSeq;
-  class ExtInterfaceDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::ExtInterfaceDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtInterfaceDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ExtInterfaceDef,ExtInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ExtInterfaceDefSeq,
+        TAO_Object_Manager<
+            ExtInterfaceDef,
+            ExtInterfaceDef,
+            CORBA::tao_ExtInterfaceDef_life
+          >
+      >
+    ExtInterfaceDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ExtInterfaceDefSeq,
+        ExtInterfaceDefSeq_var,
+        TAO_Object_Manager<
+            ExtInterfaceDef,
+            ExtInterfaceDef,
+            CORBA::tao_ExtInterfaceDef_life
+          >
+      >
+    ExtInterfaceDefSeq_out;
+
+  class TAO_IFR_Client_Export ExtInterfaceDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            ExtInterfaceDef,
+            ExtInterfaceDef,
+            CORBA::tao_ExtInterfaceDef_life,
+            CORBA::tao_ExtInterfaceDef_cast
+          >
   {
   public:
     ExtInterfaceDefSeq (void);
     ExtInterfaceDefSeq (CORBA::ULong max);
     ExtInterfaceDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ExtInterfaceDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExtInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExtInterfaceDefSeq (const ExtInterfaceDefSeq &);
     ~ExtInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ExtInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTINTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_EXTINTERFACEDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ExtInterfaceDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtInterfaceDefSeq_var
-  {
-  public:
-    ExtInterfaceDefSeq_var (void);
-    ExtInterfaceDefSeq_var (ExtInterfaceDefSeq *);
-    ExtInterfaceDefSeq_var (const ExtInterfaceDefSeq_var &);
-    ~ExtInterfaceDefSeq_var (void);
-    
-    ExtInterfaceDefSeq_var &operator= (ExtInterfaceDefSeq *);
-    ExtInterfaceDefSeq_var &operator= (const ExtInterfaceDefSeq_var &);
-    ExtInterfaceDefSeq *operator-> (void);
-    const ExtInterfaceDefSeq *operator-> (void) const;
-    
-    operator const ExtInterfaceDefSeq &() const;
-    operator ExtInterfaceDefSeq &();
-    operator ExtInterfaceDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator ExtInterfaceDefSeq *&();
-    
-    TAO_Object_Manager<ExtInterfaceDef, ExtInterfaceDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ExtInterfaceDefSeq &in (void) const;
-    ExtInterfaceDefSeq &inout (void);
-    ExtInterfaceDefSeq *&out (void);
-    ExtInterfaceDefSeq *_retn (void);
-    ExtInterfaceDefSeq *ptr (void) const;
-  
-  private:
-    ExtInterfaceDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_EXTINTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_EXTINTERFACEDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ExtInterfaceDefSeq_out
-  {
-  public:
-    ExtInterfaceDefSeq_out (ExtInterfaceDefSeq *&);
-    ExtInterfaceDefSeq_out (ExtInterfaceDefSeq_var &);
-    ExtInterfaceDefSeq_out (const ExtInterfaceDefSeq_out &);
-    ExtInterfaceDefSeq_out &operator= (const ExtInterfaceDefSeq_out &);
-    ExtInterfaceDefSeq_out &operator= (ExtInterfaceDefSeq *);
-    operator ExtInterfaceDefSeq *&();
-    ExtInterfaceDefSeq *&ptr (void);
-    ExtInterfaceDefSeq *operator-> (void);
-    TAO_Object_Manager<ExtInterfaceDef, ExtInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ExtInterfaceDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExtInterfaceDefSeq_var &);
+    typedef ExtInterfaceDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ExtValueDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_EXTVALUEDEF___PTR_CH_)
-#define _CORBA_EXTVALUEDEF___PTR_CH_
-  
+#if !defined (_CORBA_EXTVALUEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTVALUEDEF__ODDS_N_ENDS_CH_
+
+  class ExtValueDef;
   typedef ExtValueDef *ExtValueDef_ptr;
+  struct tao_ExtValueDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExtValueDef,
+        tao_ExtValueDef_life
+      >
+    ExtValueDef_var;
 
-#if !defined (_CORBA_EXTVALUEDEF___VAR_CH_)
-#define _CORBA_EXTVALUEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtValueDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ExtValueDef,
+        tao_ExtValueDef_life
+      >
+    ExtValueDef_out;
+
+  struct TAO_IFR_Client_Export tao_ExtValueDef_life
   {
-  public:
-    ExtValueDef_var (void); // default constructor
-    ExtValueDef_var (ExtValueDef_ptr p) : ptr_ (p) {} 
-    ExtValueDef_var (const ExtValueDef_var &); // copy constructor
-    ~ExtValueDef_var (void); // destructor
-    
-    ExtValueDef_var &operator= (ExtValueDef_ptr);
-    ExtValueDef_var &operator= (const ExtValueDef_var &);
-    ExtValueDef_ptr operator-> (void) const;
-    
-    operator const ExtValueDef_ptr &() const;
-    operator ExtValueDef_ptr &();
-    // in, inout, out, _retn 
-    ExtValueDef_ptr in (void) const;
-    ExtValueDef_ptr &inout (void);
-    ExtValueDef_ptr &out (void);
-    ExtValueDef_ptr _retn (void);
-    ExtValueDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ExtValueDef_ptr tao_duplicate (ExtValueDef_ptr);
     static void tao_release (ExtValueDef_ptr);
     static ExtValueDef_ptr tao_nil (void);
-    static ExtValueDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtValueDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtValueDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtValueDef_var (const TAO_Base_var &rhs);
-    ExtValueDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTVALUEDEF___OUT_CH_)
-#define _CORBA_EXTVALUEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtValueDef_out
-  {
-  public:
-    ExtValueDef_out (ExtValueDef_ptr &);
-    ExtValueDef_out (ExtValueDef_var &);
-    ExtValueDef_out (const ExtValueDef_out &);
-    ExtValueDef_out &operator= (const ExtValueDef_out &);
-    ExtValueDef_out &operator= (const ExtValueDef_var &);
-    ExtValueDef_out &operator= (ExtValueDef_ptr);
-    operator ExtValueDef_ptr &();
-    ExtValueDef_ptr &ptr (void);
-    ExtValueDef_ptr operator-> (void);
-  
-  private:
-    ExtValueDef_ptr &ptr_;
   };
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
-    : public TAO_Unbounded_Base_Sequence
+  struct TAO_IFR_Client_Export tao_ExtValueDef_cast
   {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExtValueDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::ExtValueDef,CORBA::ExtValueDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static ExtValueDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ExtValueDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExtValueDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ExtValueDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static ExtValueDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTVALUEDEFSEQ_CH_)
-#define _CORBA_EXTVALUEDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ExtValueDefSeq;
-  class ExtValueDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::ExtValueDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtValueDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ExtValueDef,ExtValueDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ExtValueDefSeq,
+        TAO_Object_Manager<
+            ExtValueDef,
+            ExtValueDef,
+            CORBA::tao_ExtValueDef_life
+          >
+      >
+    ExtValueDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ExtValueDefSeq,
+        ExtValueDefSeq_var,
+        TAO_Object_Manager<
+            ExtValueDef,
+            ExtValueDef,
+            CORBA::tao_ExtValueDef_life
+          >
+      >
+    ExtValueDefSeq_out;
+
+  class TAO_IFR_Client_Export ExtValueDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            ExtValueDef,
+            ExtValueDef,
+            CORBA::tao_ExtValueDef_life,
+            CORBA::tao_ExtValueDef_cast
+          >
   {
   public:
     ExtValueDefSeq (void);
     ExtValueDefSeq (CORBA::ULong max);
     ExtValueDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ExtValueDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExtValueDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExtValueDefSeq (const ExtValueDefSeq &);
     ~ExtValueDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ExtValueDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTVALUEDEFSEQ___VAR_CH_)
-#define _CORBA_EXTVALUEDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ExtValueDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtValueDefSeq_var
-  {
-  public:
-    ExtValueDefSeq_var (void);
-    ExtValueDefSeq_var (ExtValueDefSeq *);
-    ExtValueDefSeq_var (const ExtValueDefSeq_var &);
-    ~ExtValueDefSeq_var (void);
-    
-    ExtValueDefSeq_var &operator= (ExtValueDefSeq *);
-    ExtValueDefSeq_var &operator= (const ExtValueDefSeq_var &);
-    ExtValueDefSeq *operator-> (void);
-    const ExtValueDefSeq *operator-> (void) const;
-    
-    operator const ExtValueDefSeq &() const;
-    operator ExtValueDefSeq &();
-    operator ExtValueDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator ExtValueDefSeq *&();
-    
-    TAO_Object_Manager<ExtValueDef, ExtValueDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ExtValueDefSeq &in (void) const;
-    ExtValueDefSeq &inout (void);
-    ExtValueDefSeq *&out (void);
-    ExtValueDefSeq *_retn (void);
-    ExtValueDefSeq *ptr (void) const;
-  
-  private:
-    ExtValueDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_EXTVALUEDEFSEQ___OUT_CH_)
-#define _CORBA_EXTVALUEDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ExtValueDefSeq_out
-  {
-  public:
-    ExtValueDefSeq_out (ExtValueDefSeq *&);
-    ExtValueDefSeq_out (ExtValueDefSeq_var &);
-    ExtValueDefSeq_out (const ExtValueDefSeq_out &);
-    ExtValueDefSeq_out &operator= (const ExtValueDefSeq_out &);
-    ExtValueDefSeq_out &operator= (ExtValueDefSeq *);
-    operator ExtValueDefSeq *&();
-    ExtValueDefSeq *&ptr (void);
-    ExtValueDefSeq *operator-> (void);
-    TAO_Object_Manager<ExtValueDef, ExtValueDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ExtValueDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExtValueDefSeq_var &);
+    typedef ExtValueDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtValueDefSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ExtAbstractInterfaceDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___PTR_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF___PTR_CH_
-  
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF__ODDS_N_ENDS_CH_
+
+  class ExtAbstractInterfaceDef;
   typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
+  struct tao_ExtAbstractInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExtAbstractInterfaceDef,
+        tao_ExtAbstractInterfaceDef_life
+      >
+    ExtAbstractInterfaceDef_var;
 
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___VAR_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ExtAbstractInterfaceDef,
+        tao_ExtAbstractInterfaceDef_life
+      >
+    ExtAbstractInterfaceDef_out;
+
+  struct TAO_IFR_Client_Export tao_ExtAbstractInterfaceDef_life
   {
-  public:
-    ExtAbstractInterfaceDef_var (void); // default constructor
-    ExtAbstractInterfaceDef_var (ExtAbstractInterfaceDef_ptr p) : ptr_ (p) {} 
-    ExtAbstractInterfaceDef_var (const ExtAbstractInterfaceDef_var &); // copy constructor
-    ~ExtAbstractInterfaceDef_var (void); // destructor
-    
-    ExtAbstractInterfaceDef_var &operator= (ExtAbstractInterfaceDef_ptr);
-    ExtAbstractInterfaceDef_var &operator= (const ExtAbstractInterfaceDef_var &);
-    ExtAbstractInterfaceDef_ptr operator-> (void) const;
-    
-    operator const ExtAbstractInterfaceDef_ptr &() const;
-    operator ExtAbstractInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    ExtAbstractInterfaceDef_ptr in (void) const;
-    ExtAbstractInterfaceDef_ptr &inout (void);
-    ExtAbstractInterfaceDef_ptr &out (void);
-    ExtAbstractInterfaceDef_ptr _retn (void);
-    ExtAbstractInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ExtAbstractInterfaceDef_ptr tao_duplicate (ExtAbstractInterfaceDef_ptr);
     static void tao_release (ExtAbstractInterfaceDef_ptr);
     static ExtAbstractInterfaceDef_ptr tao_nil (void);
-    static ExtAbstractInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtAbstractInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtAbstractInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtAbstractInterfaceDef_var (const TAO_Base_var &rhs);
-    ExtAbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___OUT_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDef_out
+  struct TAO_IFR_Client_Export tao_ExtAbstractInterfaceDef_cast
   {
-  public:
-    ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_ptr &);
-    ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_var &);
-    ExtAbstractInterfaceDef_out (const ExtAbstractInterfaceDef_out &);
-    ExtAbstractInterfaceDef_out &operator= (const ExtAbstractInterfaceDef_out &);
-    ExtAbstractInterfaceDef_out &operator= (const ExtAbstractInterfaceDef_var &);
-    ExtAbstractInterfaceDef_out &operator= (ExtAbstractInterfaceDef_ptr);
-    operator ExtAbstractInterfaceDef_ptr &();
-    ExtAbstractInterfaceDef_ptr &ptr (void);
-    ExtAbstractInterfaceDef_ptr operator-> (void);
-  
-  private:
-    ExtAbstractInterfaceDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExtAbstractInterfaceDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static ExtAbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ExtAbstractInterfaceDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExtAbstractInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ExtAbstractInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static ExtAbstractInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ExtAbstractInterfaceDefSeq;
-  class ExtAbstractInterfaceDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::ExtAbstractInterfaceDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ExtAbstractInterfaceDef,ExtAbstractInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ExtAbstractInterfaceDefSeq,
+        TAO_Object_Manager<
+            ExtAbstractInterfaceDef,
+            ExtAbstractInterfaceDef,
+            CORBA::tao_ExtAbstractInterfaceDef_life
+          >
+      >
+    ExtAbstractInterfaceDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ExtAbstractInterfaceDefSeq,
+        ExtAbstractInterfaceDefSeq_var,
+        TAO_Object_Manager<
+            ExtAbstractInterfaceDef,
+            ExtAbstractInterfaceDef,
+            CORBA::tao_ExtAbstractInterfaceDef_life
+          >
+      >
+    ExtAbstractInterfaceDefSeq_out;
+
+  class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            ExtAbstractInterfaceDef,
+            ExtAbstractInterfaceDef,
+            CORBA::tao_ExtAbstractInterfaceDef_life,
+            CORBA::tao_ExtAbstractInterfaceDef_cast
+          >
   {
   public:
     ExtAbstractInterfaceDefSeq (void);
     ExtAbstractInterfaceDefSeq (CORBA::ULong max);
     ExtAbstractInterfaceDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ExtAbstractInterfaceDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExtAbstractInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &);
     ~ExtAbstractInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ExtAbstractInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ExtAbstractInterfaceDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq_var
-  {
-  public:
-    ExtAbstractInterfaceDefSeq_var (void);
-    ExtAbstractInterfaceDefSeq_var (ExtAbstractInterfaceDefSeq *);
-    ExtAbstractInterfaceDefSeq_var (const ExtAbstractInterfaceDefSeq_var &);
-    ~ExtAbstractInterfaceDefSeq_var (void);
-    
-    ExtAbstractInterfaceDefSeq_var &operator= (ExtAbstractInterfaceDefSeq *);
-    ExtAbstractInterfaceDefSeq_var &operator= (const ExtAbstractInterfaceDefSeq_var &);
-    ExtAbstractInterfaceDefSeq *operator-> (void);
-    const ExtAbstractInterfaceDefSeq *operator-> (void) const;
-    
-    operator const ExtAbstractInterfaceDefSeq &() const;
-    operator ExtAbstractInterfaceDefSeq &();
-    operator ExtAbstractInterfaceDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator ExtAbstractInterfaceDefSeq *&();
-    
-    TAO_Object_Manager<ExtAbstractInterfaceDef, ExtAbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ExtAbstractInterfaceDefSeq &in (void) const;
-    ExtAbstractInterfaceDefSeq &inout (void);
-    ExtAbstractInterfaceDefSeq *&out (void);
-    ExtAbstractInterfaceDefSeq *_retn (void);
-    ExtAbstractInterfaceDefSeq *ptr (void) const;
-  
-  private:
-    ExtAbstractInterfaceDefSeq *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq_out
-  {
-  public:
-    ExtAbstractInterfaceDefSeq_out (ExtAbstractInterfaceDefSeq *&);
-    ExtAbstractInterfaceDefSeq_out (ExtAbstractInterfaceDefSeq_var &);
-    ExtAbstractInterfaceDefSeq_out (const ExtAbstractInterfaceDefSeq_out &);
-    ExtAbstractInterfaceDefSeq_out &operator= (const ExtAbstractInterfaceDefSeq_out &);
-    ExtAbstractInterfaceDefSeq_out &operator= (ExtAbstractInterfaceDefSeq *);
-    operator ExtAbstractInterfaceDefSeq *&();
-    ExtAbstractInterfaceDefSeq *&ptr (void);
-    ExtAbstractInterfaceDefSeq *operator-> (void);
-    TAO_Object_Manager<ExtAbstractInterfaceDef, ExtAbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ExtAbstractInterfaceDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExtAbstractInterfaceDefSeq_var &);
+    typedef ExtAbstractInterfaceDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAbstractInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ExtLocalInterfaceDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF___PTR_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF___PTR_CH_
-  
+  class ExtLocalInterfaceDef;
   typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
+  struct tao_ExtLocalInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExtLocalInterfaceDef,
+        tao_ExtLocalInterfaceDef_life
+      >
+    ExtLocalInterfaceDef_var;
 
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF___VAR_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        ExtLocalInterfaceDef,
+        tao_ExtLocalInterfaceDef_life
+      >
+    ExtLocalInterfaceDef_out;
+
+  struct TAO_IFR_Client_Export tao_ExtLocalInterfaceDef_life
   {
-  public:
-    ExtLocalInterfaceDef_var (void); // default constructor
-    ExtLocalInterfaceDef_var (ExtLocalInterfaceDef_ptr p) : ptr_ (p) {} 
-    ExtLocalInterfaceDef_var (const ExtLocalInterfaceDef_var &); // copy constructor
-    ~ExtLocalInterfaceDef_var (void); // destructor
-    
-    ExtLocalInterfaceDef_var &operator= (ExtLocalInterfaceDef_ptr);
-    ExtLocalInterfaceDef_var &operator= (const ExtLocalInterfaceDef_var &);
-    ExtLocalInterfaceDef_ptr operator-> (void) const;
-    
-    operator const ExtLocalInterfaceDef_ptr &() const;
-    operator ExtLocalInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    ExtLocalInterfaceDef_ptr in (void) const;
-    ExtLocalInterfaceDef_ptr &inout (void);
-    ExtLocalInterfaceDef_ptr &out (void);
-    ExtLocalInterfaceDef_ptr _retn (void);
-    ExtLocalInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ExtLocalInterfaceDef_ptr tao_duplicate (ExtLocalInterfaceDef_ptr);
     static void tao_release (ExtLocalInterfaceDef_ptr);
     static ExtLocalInterfaceDef_ptr tao_nil (void);
-    static ExtLocalInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtLocalInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtLocalInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtLocalInterfaceDef_var (const TAO_Base_var &rhs);
-    ExtLocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF___OUT_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDef_out
+  struct TAO_IFR_Client_Export tao_ExtLocalInterfaceDef_cast
   {
-  public:
-    ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_ptr &);
-    ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_var &);
-    ExtLocalInterfaceDef_out (const ExtLocalInterfaceDef_out &);
-    ExtLocalInterfaceDef_out &operator= (const ExtLocalInterfaceDef_out &);
-    ExtLocalInterfaceDef_out &operator= (const ExtLocalInterfaceDef_var &);
-    ExtLocalInterfaceDef_out &operator= (ExtLocalInterfaceDef_ptr);
-    operator ExtLocalInterfaceDef_ptr &();
-    ExtLocalInterfaceDef_ptr &ptr (void);
-    ExtLocalInterfaceDef_ptr operator-> (void);
-  
-  private:
-    ExtLocalInterfaceDef_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExtLocalInterfaceDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static ExtLocalInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ExtLocalInterfaceDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExtLocalInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ExtLocalInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static ExtLocalInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ExtLocalInterfaceDefSeq;
-  class ExtLocalInterfaceDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::ExtLocalInterfaceDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ExtLocalInterfaceDef,ExtLocalInterfaceDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ExtLocalInterfaceDefSeq,
+        TAO_Object_Manager<
+            ExtLocalInterfaceDef,
+            ExtLocalInterfaceDef,
+            CORBA::tao_ExtLocalInterfaceDef_life
+          >
+      >
+    ExtLocalInterfaceDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ExtLocalInterfaceDefSeq,
+        ExtLocalInterfaceDefSeq_var,
+        TAO_Object_Manager<
+            ExtLocalInterfaceDef,
+            ExtLocalInterfaceDef,
+            CORBA::tao_ExtLocalInterfaceDef_life
+          >
+      >
+    ExtLocalInterfaceDefSeq_out;
+
+  class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            ExtLocalInterfaceDef,
+            ExtLocalInterfaceDef,
+            CORBA::tao_ExtLocalInterfaceDef_life,
+            CORBA::tao_ExtLocalInterfaceDef_cast
+          >
   {
   public:
     ExtLocalInterfaceDefSeq (void);
     ExtLocalInterfaceDefSeq (CORBA::ULong max);
     ExtLocalInterfaceDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ExtLocalInterfaceDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExtLocalInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &);
     ~ExtLocalInterfaceDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ExtLocalInterfaceDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ExtLocalInterfaceDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq_var
-  {
-  public:
-    ExtLocalInterfaceDefSeq_var (void);
-    ExtLocalInterfaceDefSeq_var (ExtLocalInterfaceDefSeq *);
-    ExtLocalInterfaceDefSeq_var (const ExtLocalInterfaceDefSeq_var &);
-    ~ExtLocalInterfaceDefSeq_var (void);
-    
-    ExtLocalInterfaceDefSeq_var &operator= (ExtLocalInterfaceDefSeq *);
-    ExtLocalInterfaceDefSeq_var &operator= (const ExtLocalInterfaceDefSeq_var &);
-    ExtLocalInterfaceDefSeq *operator-> (void);
-    const ExtLocalInterfaceDefSeq *operator-> (void) const;
-    
-    operator const ExtLocalInterfaceDefSeq &() const;
-    operator ExtLocalInterfaceDefSeq &();
-    operator ExtLocalInterfaceDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator ExtLocalInterfaceDefSeq *&();
-    
-    TAO_Object_Manager<ExtLocalInterfaceDef, ExtLocalInterfaceDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ExtLocalInterfaceDefSeq &in (void) const;
-    ExtLocalInterfaceDefSeq &inout (void);
-    ExtLocalInterfaceDefSeq *&out (void);
-    ExtLocalInterfaceDefSeq *_retn (void);
-    ExtLocalInterfaceDefSeq *ptr (void) const;
-  
-  private:
-    ExtLocalInterfaceDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq_out
-  {
-  public:
-    ExtLocalInterfaceDefSeq_out (ExtLocalInterfaceDefSeq *&);
-    ExtLocalInterfaceDefSeq_out (ExtLocalInterfaceDefSeq_var &);
-    ExtLocalInterfaceDefSeq_out (const ExtLocalInterfaceDefSeq_out &);
-    ExtLocalInterfaceDefSeq_out &operator= (const ExtLocalInterfaceDefSeq_out &);
-    ExtLocalInterfaceDefSeq_out &operator= (ExtLocalInterfaceDefSeq *);
-    operator ExtLocalInterfaceDefSeq *&();
-    ExtLocalInterfaceDefSeq *&ptr (void);
-    ExtLocalInterfaceDefSeq *operator-> (void);
-    TAO_Object_Manager<ExtLocalInterfaceDef, ExtLocalInterfaceDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ExtLocalInterfaceDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExtLocalInterfaceDefSeq_var &);
+    typedef ExtLocalInterfaceDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtLocalInterfaceDefSeq;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        Contained* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static Contained **allocbuf (CORBA::ULong nelems);
-    static void freebuf (Contained **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    Contained* *get_buffer (CORBA::Boolean orphan = 0);
-    const Contained* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    virtual CORBA::Object* _upcast (void *src) const;
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtLocalInterfaceDefSeq;
 
-#if !defined (_CORBA_CONTAINEDSEQ_CH_)
-#define _CORBA_CONTAINEDSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ContainedSeq;
-  class ContainedSeq_var;
-  
-  // *************************************************************
-  // CORBA::ContainedSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ContainedSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<Contained,Contained_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ContainedSeq,
+        TAO_Object_Manager<
+            Contained,
+            Contained,
+            CORBA::tao_Contained_life
+          >
+      >
+    ContainedSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ContainedSeq,
+        ContainedSeq_var,
+        TAO_Object_Manager<
+            Contained,
+            Contained,
+            CORBA::tao_Contained_life
+          >
+      >
+    ContainedSeq_out;
+
+  class TAO_IFR_Client_Export ContainedSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            Contained,
+            Contained,
+            CORBA::tao_Contained_life,
+            CORBA::tao_Contained_cast
+          >
   {
   public:
     ContainedSeq (void);
     ContainedSeq (CORBA::ULong max);
     ContainedSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        Contained_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        Contained_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ContainedSeq (const ContainedSeq &);
     ~ContainedSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
+
+    static void _tao_any_destructor (void *);
+
     typedef ContainedSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINEDSEQ___VAR_CH_)
-#define _CORBA_CONTAINEDSEQ___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ContainedSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ContainedSeq_var
-  {
-  public:
-    ContainedSeq_var (void);
-    ContainedSeq_var (ContainedSeq *);
-    ContainedSeq_var (const ContainedSeq_var &);
-    ~ContainedSeq_var (void);
-    
-    ContainedSeq_var &operator= (ContainedSeq *);
-    ContainedSeq_var &operator= (const ContainedSeq_var &);
-    ContainedSeq *operator-> (void);
-    const ContainedSeq *operator-> (void) const;
-    
-    operator const ContainedSeq &() const;
-    operator ContainedSeq &();
-    operator ContainedSeq &() const;
-    
-    // Variable-size base types only.
-    operator ContainedSeq *&();
-    
-    TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ContainedSeq &in (void) const;
-    ContainedSeq &inout (void);
-    ContainedSeq *&out (void);
-    ContainedSeq *_retn (void);
-    ContainedSeq *ptr (void) const;
-  
-  private:
-    ContainedSeq *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContainedSeq;
 
-#if !defined (_CORBA_CONTAINEDSEQ___OUT_CH_)
-#define _CORBA_CONTAINEDSEQ___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ContainedSeq_out
-  {
-  public:
-    ContainedSeq_out (ContainedSeq *&);
-    ContainedSeq_out (ContainedSeq_var &);
-    ContainedSeq_out (const ContainedSeq_out &);
-    ContainedSeq_out &operator= (const ContainedSeq_out &);
-    ContainedSeq_out &operator= (ContainedSeq *);
-    operator ContainedSeq *&();
-    ContainedSeq *&ptr (void);
-    ContainedSeq *operator-> (void);
-    TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ContainedSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ContainedSeq_var &);
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct StructMember;
+
+  typedef
+    TAO_Var_Var_T<
+        StructMember
+      >
+    StructMember_var;
+
+  typedef
+    TAO_Out_T<
+        StructMember,
+        StructMember_var
+      >
+    StructMember_out;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContainedSeq;
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class StructMember_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export StructMember
   {
     typedef StructMember_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export StructMember_var
-  {
-  public:
-    StructMember_var (void);
-    StructMember_var (StructMember *);
-    StructMember_var (const StructMember_var &);
-    ~StructMember_var (void);
-    
-    StructMember_var &operator= (StructMember *);
-    StructMember_var &operator= (const StructMember_var &);
-    StructMember *operator-> (void);
-    const StructMember *operator-> (void) const;
-    
-    operator const StructMember &() const;
-    operator StructMember &();
-    operator StructMember &() const;
-    
-    // Variable-size types only.
-    operator StructMember *&();
-    
-    // in, inout, out, _retn 
-    const StructMember &in (void) const;
-    StructMember &inout (void);
-    StructMember *&out (void);
-    StructMember *_retn (void);
-    StructMember *ptr (void) const;
-  
-  private:
-    StructMember *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export StructMember_out
-  {
-  public:
-    StructMember_out (StructMember *&);
-    StructMember_out (StructMember_var &);
-    StructMember_out (const StructMember_out &);
-    StructMember_out &operator= (const StructMember_out &);
-    StructMember_out &operator= (StructMember *);
-    operator StructMember *&();
-    StructMember *&ptr (void);
-    StructMember *operator-> (void);
-    
-  private:
-    StructMember *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const StructMember_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMember;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        StructMember *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
-        const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void);
-    
-    // = Accessors.
-    StructMember &operator[] (CORBA::ULong i);
-    const StructMember &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static StructMember *allocbuf (CORBA::ULong size);
-    static void freebuf (StructMember *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    StructMember *get_buffer (CORBA::Boolean orphan = 0);
-    const StructMember *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        StructMember *data,
-        CORBA::Boolean release
-      );
-  };
+  class StructMemberSeq;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_VarSeq_Var_T<
+        StructMemberSeq,
+        StructMember
+      >
+    StructMemberSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_Seq_Out_T<
+        StructMemberSeq,
+        StructMemberSeq_var,
+        StructMember
+      >
+    StructMemberSeq_out;
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
-#define _CORBA_STRUCTMEMBERSEQ_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class StructMemberSeq;
-  class StructMemberSeq_var;
-  
-  // *************************************************************
-  // CORBA::StructMemberSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export StructMemberSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<StructMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  class TAO_IFR_Client_Export StructMemberSeq
+    : public
+        TAO_Unbounded_Sequence<
+            StructMember
+          >
   {
   public:
     StructMemberSeq (void);
     StructMemberSeq (CORBA::ULong max);
     StructMemberSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        StructMember *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        StructMember* buffer,
         CORBA::Boolean release = 0
       );
     StructMemberSeq (const StructMemberSeq &);
     ~StructMemberSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
+
+    static void _tao_any_destructor (void *);
+
     typedef StructMemberSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ___VAR_CH_)
-#define _CORBA_STRUCTMEMBERSEQ___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::StructMemberSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export StructMemberSeq_var
-  {
-  public:
-    StructMemberSeq_var (void);
-    StructMemberSeq_var (StructMemberSeq *);
-    StructMemberSeq_var (const StructMemberSeq_var &);
-    ~StructMemberSeq_var (void);
-    
-    StructMemberSeq_var &operator= (StructMemberSeq *);
-    StructMemberSeq_var &operator= (const StructMemberSeq_var &);
-    StructMemberSeq *operator-> (void);
-    const StructMemberSeq *operator-> (void) const;
-    
-    operator const StructMemberSeq &() const;
-    operator StructMemberSeq &();
-    operator StructMemberSeq &() const;
-    
-    // Variable-size base types only.
-    operator StructMemberSeq *&();
-    
-    StructMember & operator[] (CORBA::ULong index);
-    const StructMember & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const StructMemberSeq &in (void) const;
-    StructMemberSeq &inout (void);
-    StructMemberSeq *&out (void);
-    StructMemberSeq *_retn (void);
-    StructMemberSeq *ptr (void) const;
-  
-  private:
-    StructMemberSeq *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMemberSeq;
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ___OUT_CH_)
-#define _CORBA_STRUCTMEMBERSEQ___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export StructMemberSeq_out
-  {
-  public:
-    StructMemberSeq_out (StructMemberSeq *&);
-    StructMemberSeq_out (StructMemberSeq_var &);
-    StructMemberSeq_out (const StructMemberSeq_out &);
-    StructMemberSeq_out &operator= (const StructMemberSeq_out &);
-    StructMemberSeq_out &operator= (StructMemberSeq *);
-    operator StructMemberSeq *&();
-    StructMemberSeq *&ptr (void);
-    StructMemberSeq *operator-> (void);
-    StructMember & operator[] (CORBA::ULong index);
-  
-  private:
-    StructMemberSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const StructMemberSeq_var &);
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct Initializer;
+
+  typedef
+    TAO_Var_Var_T<
+        Initializer
+      >
+    Initializer_var;
+
+  typedef
+    TAO_Out_T<
+        Initializer,
+        Initializer_var
+      >
+    Initializer_out;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructMemberSeq;
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class Initializer_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export Initializer
   {
     typedef Initializer_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     TAO_String_Manager name;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export Initializer_var
-  {
-  public:
-    Initializer_var (void);
-    Initializer_var (Initializer *);
-    Initializer_var (const Initializer_var &);
-    ~Initializer_var (void);
-    
-    Initializer_var &operator= (Initializer *);
-    Initializer_var &operator= (const Initializer_var &);
-    Initializer *operator-> (void);
-    const Initializer *operator-> (void) const;
-    
-    operator const Initializer &() const;
-    operator Initializer &();
-    operator Initializer &() const;
-    
-    // Variable-size types only.
-    operator Initializer *&();
-    
-    // in, inout, out, _retn 
-    const Initializer &in (void) const;
-    Initializer &inout (void);
-    Initializer *&out (void);
-    Initializer *_retn (void);
-    Initializer *ptr (void) const;
-  
-  private:
-    Initializer *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export Initializer_out
-  {
-  public:
-    Initializer_out (Initializer *&);
-    Initializer_out (Initializer_var &);
-    Initializer_out (const Initializer_out &);
-    Initializer_out &operator= (const Initializer_out &);
-    Initializer_out &operator= (Initializer *);
-    operator Initializer *&();
-    Initializer *&ptr (void);
-    Initializer *operator-> (void);
-    
-  private:
-    Initializer *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const Initializer_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Initializer;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_InitializerSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        Initializer *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq (
-        const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_InitializerSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void);
-    
-    // = Accessors.
-    Initializer &operator[] (CORBA::ULong i);
-    const Initializer &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static Initializer *allocbuf (CORBA::ULong size);
-    static void freebuf (Initializer *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    Initializer *get_buffer (CORBA::Boolean orphan = 0);
-    const Initializer *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Initializer *data,
-        CORBA::Boolean release
-      );
-  };
+  class InitializerSeq;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_VarSeq_Var_T<
+        InitializerSeq,
+        Initializer
+      >
+    InitializerSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_Seq_Out_T<
+        InitializerSeq,
+        InitializerSeq_var,
+        Initializer
+      >
+    InitializerSeq_out;
 
-#if !defined (_CORBA_INITIALIZERSEQ_CH_)
-#define _CORBA_INITIALIZERSEQ_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class InitializerSeq;
-  class InitializerSeq_var;
-  
-  // *************************************************************
-  // CORBA::InitializerSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export InitializerSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_InitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<Initializer>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  class TAO_IFR_Client_Export InitializerSeq
+    : public
+        TAO_Unbounded_Sequence<
+            Initializer
+          >
   {
   public:
     InitializerSeq (void);
     InitializerSeq (CORBA::ULong max);
     InitializerSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        Initializer *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        Initializer* buffer,
         CORBA::Boolean release = 0
       );
     InitializerSeq (const InitializerSeq &);
     ~InitializerSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
+
+    static void _tao_any_destructor (void *);
+
     typedef InitializerSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INITIALIZERSEQ___VAR_CH_)
-#define _CORBA_INITIALIZERSEQ___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::InitializerSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export InitializerSeq_var
-  {
-  public:
-    InitializerSeq_var (void);
-    InitializerSeq_var (InitializerSeq *);
-    InitializerSeq_var (const InitializerSeq_var &);
-    ~InitializerSeq_var (void);
-    
-    InitializerSeq_var &operator= (InitializerSeq *);
-    InitializerSeq_var &operator= (const InitializerSeq_var &);
-    InitializerSeq *operator-> (void);
-    const InitializerSeq *operator-> (void) const;
-    
-    operator const InitializerSeq &() const;
-    operator InitializerSeq &();
-    operator InitializerSeq &() const;
-    
-    // Variable-size base types only.
-    operator InitializerSeq *&();
-    
-    Initializer & operator[] (CORBA::ULong index);
-    const Initializer & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const InitializerSeq &in (void) const;
-    InitializerSeq &inout (void);
-    InitializerSeq *&out (void);
-    InitializerSeq *_retn (void);
-    InitializerSeq *ptr (void) const;
-  
-  private:
-    InitializerSeq *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InitializerSeq;
 
-#if !defined (_CORBA_INITIALIZERSEQ___OUT_CH_)
-#define _CORBA_INITIALIZERSEQ___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export InitializerSeq_out
-  {
-  public:
-    InitializerSeq_out (InitializerSeq *&);
-    InitializerSeq_out (InitializerSeq_var &);
-    InitializerSeq_out (const InitializerSeq_out &);
-    InitializerSeq_out &operator= (const InitializerSeq_out &);
-    InitializerSeq_out &operator= (InitializerSeq *);
-    operator InitializerSeq *&();
-    InitializerSeq *&ptr (void);
-    InitializerSeq *operator-> (void);
-    Initializer & operator[] (CORBA::ULong index);
-  
-  private:
-    InitializerSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const InitializerSeq_var &);
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct ExceptionDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        ExceptionDescription
+      >
+    ExceptionDescription_var;
+
+  typedef
+    TAO_Out_T<
+        ExceptionDescription,
+        ExceptionDescription_var
+      >
+    ExceptionDescription_out;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InitializerSeq;
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ExceptionDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export ExceptionDescription
   {
     typedef ExceptionDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -5114,958 +2770,286 @@ TAO_NAMESPACE  CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export ExceptionDescription_var
-  {
-  public:
-    ExceptionDescription_var (void);
-    ExceptionDescription_var (ExceptionDescription *);
-    ExceptionDescription_var (const ExceptionDescription_var &);
-    ~ExceptionDescription_var (void);
-    
-    ExceptionDescription_var &operator= (ExceptionDescription *);
-    ExceptionDescription_var &operator= (const ExceptionDescription_var &);
-    ExceptionDescription *operator-> (void);
-    const ExceptionDescription *operator-> (void) const;
-    
-    operator const ExceptionDescription &() const;
-    operator ExceptionDescription &();
-    operator ExceptionDescription &() const;
-    
-    // Variable-size types only.
-    operator ExceptionDescription *&();
-    
-    // in, inout, out, _retn 
-    const ExceptionDescription &in (void) const;
-    ExceptionDescription &inout (void);
-    ExceptionDescription *&out (void);
-    ExceptionDescription *_retn (void);
-    ExceptionDescription *ptr (void) const;
-  
-  private:
-    ExceptionDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export ExceptionDescription_out
-  {
-  public:
-    ExceptionDescription_out (ExceptionDescription *&);
-    ExceptionDescription_out (ExceptionDescription_var &);
-    ExceptionDescription_out (const ExceptionDescription_out &);
-    ExceptionDescription_out &operator= (const ExceptionDescription_out &);
-    ExceptionDescription_out &operator= (ExceptionDescription *);
-    operator ExceptionDescription *&();
-    ExceptionDescription *&ptr (void);
-    ExceptionDescription *operator-> (void);
-    
-  private:
-    ExceptionDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExceptionDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDescription;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExceptionDescription *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
-        const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void);
-    
-    // = Accessors.
-    ExceptionDescription &operator[] (CORBA::ULong i);
-    const ExceptionDescription &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ExceptionDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (ExceptionDescription *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const ExceptionDescription *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExceptionDescription *data,
-        CORBA::Boolean release
-      );
-  };
+  class ExcDescriptionSeq;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_VarSeq_Var_T<
+        ExcDescriptionSeq,
+        ExceptionDescription
+      >
+    ExcDescriptionSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_Seq_Out_T<
+        ExcDescriptionSeq,
+        ExcDescriptionSeq_var,
+        ExceptionDescription
+      >
+    ExcDescriptionSeq_out;
 
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class ExcDescriptionSeq;
-  class ExcDescriptionSeq_var;
-  
-  // *************************************************************
-  // CORBA::ExcDescriptionSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExcDescriptionSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ExceptionDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  class TAO_IFR_Client_Export ExcDescriptionSeq
+    : public
+        TAO_Unbounded_Sequence<
+            ExceptionDescription
+          >
   {
   public:
     ExcDescriptionSeq (void);
     ExcDescriptionSeq (CORBA::ULong max);
     ExcDescriptionSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ExceptionDescription *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExceptionDescription* buffer,
         CORBA::Boolean release = 0
       );
     ExcDescriptionSeq (const ExcDescriptionSeq &);
     ~ExcDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
+
+    static void _tao_any_destructor (void *);
+
     typedef ExcDescriptionSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ExcDescriptionSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExcDescriptionSeq_var
-  {
-  public:
-    ExcDescriptionSeq_var (void);
-    ExcDescriptionSeq_var (ExcDescriptionSeq *);
-    ExcDescriptionSeq_var (const ExcDescriptionSeq_var &);
-    ~ExcDescriptionSeq_var (void);
-    
-    ExcDescriptionSeq_var &operator= (ExcDescriptionSeq *);
-    ExcDescriptionSeq_var &operator= (const ExcDescriptionSeq_var &);
-    ExcDescriptionSeq *operator-> (void);
-    const ExcDescriptionSeq *operator-> (void) const;
-    
-    operator const ExcDescriptionSeq &() const;
-    operator ExcDescriptionSeq &();
-    operator ExcDescriptionSeq &() const;
-    
-    // Variable-size base types only.
-    operator ExcDescriptionSeq *&();
-    
-    ExceptionDescription & operator[] (CORBA::ULong index);
-    const ExceptionDescription & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ExcDescriptionSeq &in (void) const;
-    ExcDescriptionSeq &inout (void);
-    ExcDescriptionSeq *&out (void);
-    ExcDescriptionSeq *_retn (void);
-    ExcDescriptionSeq *ptr (void) const;
-  
-  private:
-    ExcDescriptionSeq *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
 
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_EXCDESCRIPTIONSEQ___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ExcDescriptionSeq_out
-  {
-  public:
-    ExcDescriptionSeq_out (ExcDescriptionSeq *&);
-    ExcDescriptionSeq_out (ExcDescriptionSeq_var &);
-    ExcDescriptionSeq_out (const ExcDescriptionSeq_out &);
-    ExcDescriptionSeq_out &operator= (const ExcDescriptionSeq_out &);
-    ExcDescriptionSeq_out &operator= (ExcDescriptionSeq *);
-    operator ExcDescriptionSeq *&();
-    ExcDescriptionSeq *&ptr (void);
-    ExcDescriptionSeq *operator-> (void);
-    ExceptionDescription & operator[] (CORBA::ULong index);
-  
-  private:
-    ExcDescriptionSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExcDescriptionSeq_var &);
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct ExtInitializer;
+
+  typedef
+    TAO_Var_Var_T<
+        ExtInitializer
+      >
+    ExtInitializer_var;
+
+  typedef
+    TAO_Out_T<
+        ExtInitializer,
+        ExtInitializer_var
+      >
+    ExtInitializer_out;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ExtInitializer_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export ExtInitializer
   {
     typedef ExtInitializer_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     CORBA::ExcDescriptionSeq exceptions;
     TAO_String_Manager name;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export ExtInitializer_var
-  {
-  public:
-    ExtInitializer_var (void);
-    ExtInitializer_var (ExtInitializer *);
-    ExtInitializer_var (const ExtInitializer_var &);
-    ~ExtInitializer_var (void);
-    
-    ExtInitializer_var &operator= (ExtInitializer *);
-    ExtInitializer_var &operator= (const ExtInitializer_var &);
-    ExtInitializer *operator-> (void);
-    const ExtInitializer *operator-> (void) const;
-    
-    operator const ExtInitializer &() const;
-    operator ExtInitializer &();
-    operator ExtInitializer &() const;
-    
-    // Variable-size types only.
-    operator ExtInitializer *&();
-    
-    // in, inout, out, _retn 
-    const ExtInitializer &in (void) const;
-    ExtInitializer &inout (void);
-    ExtInitializer *&out (void);
-    ExtInitializer *_retn (void);
-    ExtInitializer *ptr (void) const;
-  
-  private:
-    ExtInitializer *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export ExtInitializer_out
-  {
-  public:
-    ExtInitializer_out (ExtInitializer *&);
-    ExtInitializer_out (ExtInitializer_var &);
-    ExtInitializer_out (const ExtInitializer_out &);
-    ExtInitializer_out &operator= (const ExtInitializer_out &);
-    ExtInitializer_out &operator= (ExtInitializer *);
-    operator ExtInitializer *&();
-    ExtInitializer *&ptr (void);
-    ExtInitializer *operator-> (void);
-    
-  private:
-    ExtInitializer *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExtInitializer_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializer;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExtInitializer *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (
-        const _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (void);
-    
-    // = Accessors.
-    ExtInitializer &operator[] (CORBA::ULong i);
-    const ExtInitializer &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ExtInitializer *allocbuf (CORBA::ULong size);
-    static void freebuf (ExtInitializer *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExtInitializer *get_buffer (CORBA::Boolean orphan = 0);
-    const ExtInitializer *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExtInitializer *data,
-        CORBA::Boolean release
-      );
-  };
+  class ExtInitializerSeq;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_VarSeq_Var_T<
+        ExtInitializerSeq,
+        ExtInitializer
+      >
+    ExtInitializerSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_Seq_Out_T<
+        ExtInitializerSeq,
+        ExtInitializerSeq_var,
+        ExtInitializer
+      >
+    ExtInitializerSeq_out;
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ_CH_)
-#define _CORBA_EXTINITIALIZERSEQ_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class ExtInitializerSeq;
-  class ExtInitializerSeq_var;
-  
-  // *************************************************************
-  // CORBA::ExtInitializerSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtInitializerSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ExtInitializer>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  class TAO_IFR_Client_Export ExtInitializerSeq
+    : public
+        TAO_Unbounded_Sequence<
+            ExtInitializer
+          >
   {
   public:
     ExtInitializerSeq (void);
     ExtInitializerSeq (CORBA::ULong max);
     ExtInitializerSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ExtInitializer *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExtInitializer* buffer,
         CORBA::Boolean release = 0
       );
     ExtInitializerSeq (const ExtInitializerSeq &);
     ~ExtInitializerSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
+
+    static void _tao_any_destructor (void *);
+
     typedef ExtInitializerSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ___VAR_CH_)
-#define _CORBA_EXTINITIALIZERSEQ___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ExtInitializerSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtInitializerSeq_var
-  {
-  public:
-    ExtInitializerSeq_var (void);
-    ExtInitializerSeq_var (ExtInitializerSeq *);
-    ExtInitializerSeq_var (const ExtInitializerSeq_var &);
-    ~ExtInitializerSeq_var (void);
-    
-    ExtInitializerSeq_var &operator= (ExtInitializerSeq *);
-    ExtInitializerSeq_var &operator= (const ExtInitializerSeq_var &);
-    ExtInitializerSeq *operator-> (void);
-    const ExtInitializerSeq *operator-> (void) const;
-    
-    operator const ExtInitializerSeq &() const;
-    operator ExtInitializerSeq &();
-    operator ExtInitializerSeq &() const;
-    
-    // Variable-size base types only.
-    operator ExtInitializerSeq *&();
-    
-    ExtInitializer & operator[] (CORBA::ULong index);
-    const ExtInitializer & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ExtInitializerSeq &in (void) const;
-    ExtInitializerSeq &inout (void);
-    ExtInitializerSeq *&out (void);
-    ExtInitializerSeq *_retn (void);
-    ExtInitializerSeq *ptr (void) const;
-  
-  private:
-    ExtInitializerSeq *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializerSeq;
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ___OUT_CH_)
-#define _CORBA_EXTINITIALIZERSEQ___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ExtInitializerSeq_out
-  {
-  public:
-    ExtInitializerSeq_out (ExtInitializerSeq *&);
-    ExtInitializerSeq_out (ExtInitializerSeq_var &);
-    ExtInitializerSeq_out (const ExtInitializerSeq_out &);
-    ExtInitializerSeq_out &operator= (const ExtInitializerSeq_out &);
-    ExtInitializerSeq_out &operator= (ExtInitializerSeq *);
-    operator ExtInitializerSeq *&();
-    ExtInitializerSeq *&ptr (void);
-    ExtInitializerSeq *operator-> (void);
-    ExtInitializer & operator[] (CORBA::ULong index);
-  
-  private:
-    ExtInitializerSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExtInitializerSeq_var &);
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct UnionMember;
+
+  typedef
+    TAO_Var_Var_T<
+        UnionMember
+      >
+    UnionMember_var;
+
+  typedef
+    TAO_Out_T<
+        UnionMember,
+        UnionMember_var
+      >
+    UnionMember_out;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInitializerSeq;
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class UnionMember_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export UnionMember
   {
     typedef UnionMember_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::Any label;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export UnionMember_var
-  {
-  public:
-    UnionMember_var (void);
-    UnionMember_var (UnionMember *);
-    UnionMember_var (const UnionMember_var &);
-    ~UnionMember_var (void);
-    
-    UnionMember_var &operator= (UnionMember *);
-    UnionMember_var &operator= (const UnionMember_var &);
-    UnionMember *operator-> (void);
-    const UnionMember *operator-> (void) const;
-    
-    operator const UnionMember &() const;
-    operator UnionMember &();
-    operator UnionMember &() const;
-    
-    // Variable-size types only.
-    operator UnionMember *&();
-    
-    // in, inout, out, _retn 
-    const UnionMember &in (void) const;
-    UnionMember &inout (void);
-    UnionMember *&out (void);
-    UnionMember *_retn (void);
-    UnionMember *ptr (void) const;
-  
-  private:
-    UnionMember *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export UnionMember_out
-  {
-  public:
-    UnionMember_out (UnionMember *&);
-    UnionMember_out (UnionMember_var &);
-    UnionMember_out (const UnionMember_out &);
-    UnionMember_out &operator= (const UnionMember_out &);
-    UnionMember_out &operator= (UnionMember *);
-    operator UnionMember *&();
-    UnionMember *&ptr (void);
-    UnionMember *operator-> (void);
-    
-  private:
-    UnionMember *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const UnionMember_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMember;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        UnionMember *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
-        const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void);
-    
-    // = Accessors.
-    UnionMember &operator[] (CORBA::ULong i);
-    const UnionMember &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static UnionMember *allocbuf (CORBA::ULong size);
-    static void freebuf (UnionMember *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    UnionMember *get_buffer (CORBA::Boolean orphan = 0);
-    const UnionMember *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        UnionMember *data,
-        CORBA::Boolean release
-      );
-  };
+  class UnionMemberSeq;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_VarSeq_Var_T<
+        UnionMemberSeq,
+        UnionMember
+      >
+    UnionMemberSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_Seq_Out_T<
+        UnionMemberSeq,
+        UnionMemberSeq_var,
+        UnionMember
+      >
+    UnionMemberSeq_out;
 
-#if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
-#define _CORBA_UNIONMEMBERSEQ_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class UnionMemberSeq;
-  class UnionMemberSeq_var;
-  
-  // *************************************************************
-  // CORBA::UnionMemberSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export UnionMemberSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<UnionMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  class TAO_IFR_Client_Export UnionMemberSeq
+    : public
+        TAO_Unbounded_Sequence<
+            UnionMember
+          >
   {
   public:
     UnionMemberSeq (void);
     UnionMemberSeq (CORBA::ULong max);
     UnionMemberSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        UnionMember *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        UnionMember* buffer,
         CORBA::Boolean release = 0
       );
     UnionMemberSeq (const UnionMemberSeq &);
     ~UnionMemberSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef UnionMemberSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_UNIONMEMBERSEQ___VAR_CH_)
-#define _CORBA_UNIONMEMBERSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::UnionMemberSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export UnionMemberSeq_var
-  {
-  public:
-    UnionMemberSeq_var (void);
-    UnionMemberSeq_var (UnionMemberSeq *);
-    UnionMemberSeq_var (const UnionMemberSeq_var &);
-    ~UnionMemberSeq_var (void);
-    
-    UnionMemberSeq_var &operator= (UnionMemberSeq *);
-    UnionMemberSeq_var &operator= (const UnionMemberSeq_var &);
-    UnionMemberSeq *operator-> (void);
-    const UnionMemberSeq *operator-> (void) const;
-    
-    operator const UnionMemberSeq &() const;
-    operator UnionMemberSeq &();
-    operator UnionMemberSeq &() const;
-    
-    // Variable-size base types only.
-    operator UnionMemberSeq *&();
-    
-    UnionMember & operator[] (CORBA::ULong index);
-    const UnionMember & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const UnionMemberSeq &in (void) const;
-    UnionMemberSeq &inout (void);
-    UnionMemberSeq *&out (void);
-    UnionMemberSeq *_retn (void);
-    UnionMemberSeq *ptr (void) const;
-  
-  private:
-    UnionMemberSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_UNIONMEMBERSEQ___OUT_CH_)
-#define _CORBA_UNIONMEMBERSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export UnionMemberSeq_out
-  {
-  public:
-    UnionMemberSeq_out (UnionMemberSeq *&);
-    UnionMemberSeq_out (UnionMemberSeq_var &);
-    UnionMemberSeq_out (const UnionMemberSeq_out &);
-    UnionMemberSeq_out &operator= (const UnionMemberSeq_out &);
-    UnionMemberSeq_out &operator= (UnionMemberSeq *);
-    operator UnionMemberSeq *&();
-    UnionMemberSeq *&ptr (void);
-    UnionMemberSeq *operator-> (void);
-    UnionMember & operator[] (CORBA::ULong index);
-  
-  private:
-    UnionMemberSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const UnionMemberSeq_var &);
+    typedef UnionMemberSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionMemberSeq;
 
-#if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
-#define _CORBA_ENUMMEMBERSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class EnumMemberSeq;
-  class EnumMemberSeq_var;
-  
-  // *************************************************************
-  // CORBA::EnumMemberSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export EnumMemberSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        EnumMemberSeq,
+        TAO_SeqElem_String_Manager
+      >
+    EnumMemberSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        EnumMemberSeq,
+        EnumMemberSeq_var,
+        TAO_SeqElem_String_Manager
+      >
+    EnumMemberSeq_out;
+
+  class TAO_IFR_Client_Export EnumMemberSeq
+    : public
+        TAO_Unbounded_String_Sequence
   {
   public:
     EnumMemberSeq (void);
     EnumMemberSeq (CORBA::ULong max);
     EnumMemberSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        char * *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        char ** buffer,
         CORBA::Boolean release = 0
       );
     EnumMemberSeq (const EnumMemberSeq &);
     ~EnumMemberSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef EnumMemberSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_ENUMMEMBERSEQ___VAR_CH_)
-#define _CORBA_ENUMMEMBERSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::EnumMemberSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export EnumMemberSeq_var
-  {
-  public:
-    EnumMemberSeq_var (void);
-    EnumMemberSeq_var (EnumMemberSeq *);
-    EnumMemberSeq_var (const EnumMemberSeq_var &);
-    ~EnumMemberSeq_var (void);
-    
-    EnumMemberSeq_var &operator= (EnumMemberSeq *);
-    EnumMemberSeq_var &operator= (const EnumMemberSeq_var &);
-    EnumMemberSeq *operator-> (void);
-    const EnumMemberSeq *operator-> (void) const;
-    
-    operator const EnumMemberSeq &() const;
-    operator EnumMemberSeq &();
-    operator EnumMemberSeq &() const;
-    
-    // Variable-size base types only.
-    operator EnumMemberSeq *&();
-    
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const EnumMemberSeq &in (void) const;
-    EnumMemberSeq &inout (void);
-    EnumMemberSeq *&out (void);
-    EnumMemberSeq *_retn (void);
-    EnumMemberSeq *ptr (void) const;
-  
-  private:
-    EnumMemberSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_ENUMMEMBERSEQ___OUT_CH_)
-#define _CORBA_ENUMMEMBERSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export EnumMemberSeq_out
-  {
-  public:
-    EnumMemberSeq_out (EnumMemberSeq *&);
-    EnumMemberSeq_out (EnumMemberSeq_var &);
-    EnumMemberSeq_out (const EnumMemberSeq_out &);
-    EnumMemberSeq_out &operator= (const EnumMemberSeq_out &);
-    EnumMemberSeq_out &operator= (EnumMemberSeq *);
-    operator EnumMemberSeq *&();
-    EnumMemberSeq *&ptr (void);
-    EnumMemberSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-  private:
-    EnumMemberSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const EnumMemberSeq_var &);
+    typedef EnumMemberSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_CONTAINER___PTR_CH_)
-#define _CORBA_CONTAINER___PTR_CH_
-  
-  class Container;
-  typedef Container *Container_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER___VAR_CH_)
-#define _CORBA_CONTAINER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export Container_var : public TAO_Base_var
-  {
-  public:
-    Container_var (void); // default constructor
-    Container_var (Container_ptr p) : ptr_ (p) {} 
-    Container_var (const Container_var &); // copy constructor
-    ~Container_var (void); // destructor
-    
-    Container_var &operator= (Container_ptr);
-    Container_var &operator= (const Container_var &);
-    Container_ptr operator-> (void) const;
-    
-    operator const Container_ptr &() const;
-    operator Container_ptr &();
-    // in, inout, out, _retn 
-    Container_ptr in (void) const;
-    Container_ptr &inout (void);
-    Container_ptr &out (void);
-    Container_ptr _retn (void);
-    Container_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static Container_ptr tao_duplicate (Container_ptr);
-    static void tao_release (Container_ptr);
-    static Container_ptr tao_nil (void);
-    static Container_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Container_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Container_var (const TAO_Base_var &rhs);
-    Container_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_CONTAINER___OUT_CH_)
-#define _CORBA_CONTAINER___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export Container_out
-  {
-  public:
-    Container_out (Container_ptr &);
-    Container_out (Container_var &);
-    Container_out (const Container_out &);
-    Container_out &operator= (const Container_out &);
-    Container_out &operator= (const Container_var &);
-    Container_out &operator= (Container_ptr);
-    operator Container_ptr &();
-    Container_ptr &ptr (void);
-    Container_ptr operator-> (void);
-  
-  private:
-    Container_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumMemberSeq;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINER_CH_)
 #define _CORBA_CONTAINER_CH_
-  
+
   class _TAO_Container_Proxy_Impl;
   class _TAO_Container_Remote_Proxy_Impl;
   class _TAO_Container_Proxy_Broker;
   class _TAO_Container_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export Container
     : public virtual CORBA::IRObject
   {
@@ -6073,30 +3057,30 @@ TAO_NAMESPACE  CORBA
     typedef Container_ptr _ptr_type;
     typedef Container_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static Container_ptr _duplicate (Container_ptr obj);
-    
+
     static Container_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Container_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Container_ptr _nil (void)
       {
         return (Container_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6104,10 +3088,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
@@ -6116,10 +3100,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
@@ -6130,260 +3114,94 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-    
-    class Description_var;
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+    struct Description;
+
+    typedef
+      TAO_Var_Var_T<
+          Description
+        >
+      Description_var;
+
+    typedef
+      TAO_Out_T<
+          Description,
+          Description_var
+        >
+      Description_out;
+
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, Contained_var) contained_object;
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export Description_var
-    {
-    public:
-      Description_var (void);
-      Description_var (Description *);
-      Description_var (const Description_var &);
-      ~Description_var (void);
-      
-      Description_var &operator= (Description *);
-      Description_var &operator= (const Description_var &);
-      Description *operator-> (void);
-      const Description *operator-> (void) const;
-      
-      operator const Description &() const;
-      operator Description &();
-      operator Description &() const;
-      
-      // Variable-size types only.
-      operator Description *&();
-      
-      // in, inout, out, _retn 
-      const Description &in (void) const;
-      Description &inout (void);
-      Description *&out (void);
-      Description *_retn (void);
-      Description *ptr (void) const;
-    
-    private:
-      Description *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export Description_out
-    {
-    public:
-      Description_out (Description *&);
-      Description_out (Description_var &);
-      Description_out (const Description_out &);
-      Description_out &operator= (const Description_out &);
-      Description_out &operator= (Description *);
-      operator Description *&();
-      Description *&ptr (void);
-      Description *operator-> (void);
-      
-    private:
-      Description *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const Description_var &);
-    };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr _tc_Description;
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-    
-    class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void);
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          Description *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (
-          const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs
-        );
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &operator= (
-          const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void);
-      
-      // = Accessors.
-      Description &operator[] (CORBA::ULong i);
-      const Description &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static Description *allocbuf (CORBA::ULong size);
-      static void freebuf (Description *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      Description *get_buffer (CORBA::Boolean orphan = 0);
-      const Description *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          Description *data,
-          CORBA::Boolean release
-        );
-    };
-
-#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    static ::CORBA::TypeCode_ptr _tc_Description;
 
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
     class DescriptionSeq;
-    class DescriptionSeq_var;
-    
-    // *************************************************************
-    // CORBA::Container::DescriptionSeq
-    // *************************************************************
-    
-    class TAO_IFR_Client_Export DescriptionSeq : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<Description>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+    typedef
+      TAO_VarSeq_Var_T<
+          DescriptionSeq,
+          Description
+        >
+      DescriptionSeq_var;
+
+    typedef
+      TAO_Seq_Out_T<
+          DescriptionSeq,
+          DescriptionSeq_var,
+          Description
+        >
+      DescriptionSeq_out;
+
+    class TAO_IFR_Client_Export DescriptionSeq
+      : public
+          TAO_Unbounded_Sequence<
+              Description
+            >
     {
     public:
       DescriptionSeq (void);
       DescriptionSeq (CORBA::ULong max);
       DescriptionSeq (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          Description *buffer, 
+          CORBA::ULong max,
+          CORBA::ULong length,
+          Description* buffer,
           CORBA::Boolean release = 0
         );
       DescriptionSeq (const DescriptionSeq &);
       ~DescriptionSeq (void);
-      
-      static void _tao_any_destructor (void*);
-      
-      typedef DescriptionSeq_var _var_type;
-    };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-    
-    // *************************************************************
-    // class CORBA::Container::DescriptionSeq_var
-    // *************************************************************
-    
-    class TAO_IFR_Client_Export DescriptionSeq_var
-    {
-    public:
-      DescriptionSeq_var (void);
-      DescriptionSeq_var (DescriptionSeq *);
-      DescriptionSeq_var (const DescriptionSeq_var &);
-      ~DescriptionSeq_var (void);
-      
-      DescriptionSeq_var &operator= (DescriptionSeq *);
-      DescriptionSeq_var &operator= (const DescriptionSeq_var &);
-      DescriptionSeq *operator-> (void);
-      const DescriptionSeq *operator-> (void) const;
-      
-      operator const DescriptionSeq &() const;
-      operator DescriptionSeq &();
-      operator DescriptionSeq &() const;
-      
-      // Variable-size base types only.
-      operator DescriptionSeq *&();
-      
-      Description & operator[] (CORBA::ULong index);
-      const Description & operator[] (CORBA::ULong index) const;
-      
-      // in, inout, out, _retn 
-      const DescriptionSeq &in (void) const;
-      DescriptionSeq &inout (void);
-      DescriptionSeq *&out (void);
-      DescriptionSeq *_retn (void);
-      DescriptionSeq *ptr (void) const;
-    
-    private:
-      DescriptionSeq *ptr_;
-    };
-
-#endif /* end #if !defined */
+      static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-    
-    class TAO_IFR_Client_Export DescriptionSeq_out
-    {
-    public:
-      DescriptionSeq_out (DescriptionSeq *&);
-      DescriptionSeq_out (DescriptionSeq_var &);
-      DescriptionSeq_out (const DescriptionSeq_out &);
-      DescriptionSeq_out &operator= (const DescriptionSeq_out &);
-      DescriptionSeq_out &operator= (DescriptionSeq *);
-      operator DescriptionSeq *&();
-      DescriptionSeq *&ptr (void);
-      DescriptionSeq *operator-> (void);
-      Description & operator[] (CORBA::ULong index);
-    
-    private:
-      DescriptionSeq *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const DescriptionSeq_var &);
+      typedef DescriptionSeq_var _var_type;
     };
 
-#endif /* end #if !defined */
-    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_DescriptionSeq;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
@@ -6393,10 +3211,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
         const char * name,
@@ -6406,10 +3224,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
@@ -6421,10 +3239,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
@@ -6435,10 +3253,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
@@ -6450,10 +3268,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
@@ -6464,10 +3282,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
@@ -6478,10 +3296,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
@@ -6492,10 +3310,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -6512,10 +3330,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
@@ -6526,10 +3344,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
@@ -6540,10 +3358,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
         const char * name,
@@ -6553,10 +3371,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
@@ -6567,10 +3385,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
@@ -6581,10 +3399,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
@@ -6601,66 +3419,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-  
+
   protected:
     Container (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Container_setup_collocation (int collocated);
-    
+
     Container (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Container (void);
-    
+
     friend class _TAO_Container_Remote_Proxy_Impl;
     friend class _TAO_Container_ThruPOA_Proxy_Impl;
     friend class _TAO_Container_Direct_Proxy_Impl;
-  
+
   private:
     Container (const Container &);
     void operator= (const Container &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_Container_Proxy_Impl
     : public virtual CORBA::_TAO_IRObject_Proxy_Impl
   {
   public:
     virtual ~_TAO_Container_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::Contained_ptr lookup (
         CORBA::Object *_collocated_tao_target_,
         const char * search_name
@@ -6669,10 +3487,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ContainedSeq * contents (
         CORBA::Object *_collocated_tao_target_,
         CORBA::DefinitionKind limit_type,
@@ -6682,10 +3500,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ContainedSeq * lookup_name (
         CORBA::Object *_collocated_tao_target_,
         const char * search_name,
@@ -6697,10 +3515,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         CORBA::Object *_collocated_tao_target_,
         CORBA::DefinitionKind limit_type,
@@ -6711,10 +3529,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ModuleDef_ptr create_module (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6725,10 +3543,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ConstantDef_ptr create_constant (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6741,10 +3559,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::StructDef_ptr create_struct (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6756,10 +3574,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::UnionDef_ptr create_union (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6772,10 +3590,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::EnumDef_ptr create_enum (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6787,10 +3605,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::AliasDef_ptr create_alias (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6802,10 +3620,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6817,10 +3635,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ValueDef_ptr create_value (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6838,10 +3656,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6853,10 +3671,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6868,10 +3686,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::NativeDef_ptr create_native (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6882,10 +3700,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6897,10 +3715,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6912,10 +3730,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -6933,23 +3751,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_Container_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Impl
     : public virtual _TAO_Container_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -6957,12 +3775,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_Container_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_Container_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::Contained_ptr lookup (
         CORBA::Object *_collocated_tao_target_,
         const char * search_name
@@ -6971,10 +3789,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ContainedSeq * contents (
         CORBA::Object *_collocated_tao_target_,
         CORBA::DefinitionKind limit_type,
@@ -6984,10 +3802,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ContainedSeq * lookup_name (
         CORBA::Object *_collocated_tao_target_,
         const char * search_name,
@@ -6999,10 +3817,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         CORBA::Object *_collocated_tao_target_,
         CORBA::DefinitionKind limit_type,
@@ -7013,10 +3831,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ModuleDef_ptr create_module (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7027,10 +3845,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ConstantDef_ptr create_constant (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7043,10 +3861,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::StructDef_ptr create_struct (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7058,10 +3876,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::UnionDef_ptr create_union (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7074,10 +3892,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::EnumDef_ptr create_enum (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7089,10 +3907,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::AliasDef_ptr create_alias (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7104,10 +3922,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7119,10 +3937,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ValueDef_ptr create_value (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7140,10 +3958,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7155,10 +3973,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7170,10 +3988,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::NativeDef_ptr create_native (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7184,10 +4002,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7199,10 +4017,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7214,10 +4032,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -7236,23 +4054,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_Container_Proxy_Broker
   {
   public:
@@ -7261,152 +4079,69 @@ TAO_NAMESPACE  CORBA
         Container *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_Container_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Broker
     : public virtual _TAO_Container_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_Container_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_Container_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_Container_Proxy_Impl &select_proxy (
         Container *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_Container_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_IDLTYPE___PTR_CH_)
-#define _CORBA_IDLTYPE___PTR_CH_
-  
-  class IDLType;
-  typedef IDLType *IDLType_ptr;
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_IDLTYPE___VAR_CH_)
-#define _CORBA_IDLTYPE___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export IDLType_var : public TAO_Base_var
-  {
-  public:
-    IDLType_var (void); // default constructor
-    IDLType_var (IDLType_ptr p) : ptr_ (p) {} 
-    IDLType_var (const IDLType_var &); // copy constructor
-    ~IDLType_var (void); // destructor
-    
-    IDLType_var &operator= (IDLType_ptr);
-    IDLType_var &operator= (const IDLType_var &);
-    IDLType_ptr operator-> (void) const;
-    
-    operator const IDLType_ptr &() const;
-    operator IDLType_ptr &();
-    // in, inout, out, _retn 
-    IDLType_ptr in (void) const;
-    IDLType_ptr &inout (void);
-    IDLType_ptr &out (void);
-    IDLType_ptr _retn (void);
-    IDLType_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static IDLType_ptr tao_duplicate (IDLType_ptr);
-    static void tao_release (IDLType_ptr);
-    static IDLType_ptr tao_nil (void);
-    static IDLType_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    IDLType_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    IDLType_var (const TAO_Base_var &rhs);
-    IDLType_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#if !defined (_CORBA_IDLTYPE___OUT_CH_)
-#define _CORBA_IDLTYPE___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export IDLType_out
-  {
-  public:
-    IDLType_out (IDLType_ptr &);
-    IDLType_out (IDLType_var &);
-    IDLType_out (const IDLType_out &);
-    IDLType_out &operator= (const IDLType_out &);
-    IDLType_out &operator= (const IDLType_var &);
-    IDLType_out &operator= (IDLType_ptr);
-    operator IDLType_ptr &();
-    IDLType_ptr &ptr (void);
-    IDLType_ptr operator-> (void);
-  
-  private:
-    IDLType_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IDLTYPE_CH_)
 #define _CORBA_IDLTYPE_CH_
-  
+
   class _TAO_IDLType_Proxy_Impl;
   class _TAO_IDLType_Remote_Proxy_Impl;
   class _TAO_IDLType_Proxy_Broker;
   class _TAO_IDLType_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export IDLType
     : public virtual CORBA::IRObject
   {
@@ -7414,96 +4149,96 @@ TAO_NAMESPACE  CORBA
     typedef IDLType_ptr _ptr_type;
     typedef IDLType_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static IDLType_ptr _duplicate (IDLType_ptr obj);
-    
+
     static IDLType_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IDLType_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IDLType_ptr _nil (void)
       {
         return (IDLType_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_IDLType_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
-  
+
   protected:
     IDLType (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IDLType_setup_collocation (int collocated);
-    
+
     IDLType (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~IDLType (void);
-    
+
     friend class _TAO_IDLType_Remote_Proxy_Impl;
     friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
     friend class _TAO_IDLType_Direct_Proxy_Impl;
-  
+
   private:
     IDLType (const IDLType &);
     void operator= (const IDLType &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Impl
     : public virtual CORBA::_TAO_IRObject_Proxy_Impl
   {
   public:
     virtual ~_TAO_IDLType_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7511,23 +4246,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_IDLType_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Impl
     : public virtual _TAO_IDLType_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -7535,12 +4270,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_IDLType_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_IDLType_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7549,23 +4284,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker
   {
   public:
@@ -7574,152 +4309,115 @@ TAO_NAMESPACE  CORBA
         IDLType *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_IDLType_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Broker
     : public virtual _TAO_IDLType_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_IDLType_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_IDLType_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_IDLType_Proxy_Impl &select_proxy (
         IDLType *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDLType;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_TYPEDEFDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_TYPEDEFDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_TYPEDEFDEF___PTR_CH_)
-#define _CORBA_TYPEDEFDEF___PTR_CH_
-  
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
+  struct tao_TypedefDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        TypedefDef,
+        tao_TypedefDef_life
+      >
+    TypedefDef_var;
 
-#if !defined (_CORBA_TYPEDEFDEF___VAR_CH_)
-#define _CORBA_TYPEDEFDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export TypedefDef_var : public TAO_Base_var
+  typedef
+    TAO_Objref_Out_T<
+        TypedefDef,
+        tao_TypedefDef_life
+      >
+    TypedefDef_out;
+
+  struct TAO_IFR_Client_Export tao_TypedefDef_life
   {
-  public:
-    TypedefDef_var (void); // default constructor
-    TypedefDef_var (TypedefDef_ptr p) : ptr_ (p) {} 
-    TypedefDef_var (const TypedefDef_var &); // copy constructor
-    ~TypedefDef_var (void); // destructor
-    
-    TypedefDef_var &operator= (TypedefDef_ptr);
-    TypedefDef_var &operator= (const TypedefDef_var &);
-    TypedefDef_ptr operator-> (void) const;
-    
-    operator const TypedefDef_ptr &() const;
-    operator TypedefDef_ptr &();
-    // in, inout, out, _retn 
-    TypedefDef_ptr in (void) const;
-    TypedefDef_ptr &inout (void);
-    TypedefDef_ptr &out (void);
-    TypedefDef_ptr _retn (void);
-    TypedefDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static TypedefDef_ptr tao_duplicate (TypedefDef_ptr);
     static void tao_release (TypedefDef_ptr);
     static TypedefDef_ptr tao_nil (void);
-    static TypedefDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        TypedefDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    TypedefDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    TypedefDef_var (const TAO_Base_var &rhs);
-    TypedefDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_TYPEDEFDEF___OUT_CH_)
-#define _CORBA_TYPEDEFDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export TypedefDef_out
+  struct TAO_IFR_Client_Export tao_TypedefDef_cast
   {
-  public:
-    TypedefDef_out (TypedefDef_ptr &);
-    TypedefDef_out (TypedefDef_var &);
-    TypedefDef_out (const TypedefDef_out &);
-    TypedefDef_out &operator= (const TypedefDef_out &);
-    TypedefDef_out &operator= (const TypedefDef_var &);
-    TypedefDef_out &operator= (TypedefDef_ptr);
-    operator TypedefDef_ptr &();
-    TypedefDef_ptr &ptr (void);
-    TypedefDef_ptr operator-> (void);
-  
-  private:
-    TypedefDef_ptr &ptr_;
+    static TypedefDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPEDEFDEF_CH_)
 #define _CORBA_TYPEDEFDEF_CH_
-  
+
   class _TAO_TypedefDef_Proxy_Impl;
   class _TAO_TypedefDef_Remote_Proxy_Impl;
   class _TAO_TypedefDef_Proxy_Broker;
   class _TAO_TypedefDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export TypedefDef
     : public virtual CORBA::Contained,
       public virtual CORBA::IDLType
@@ -7728,100 +4426,100 @@ TAO_NAMESPACE  CORBA
     typedef TypedefDef_ptr _ptr_type;
     typedef TypedefDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
-    
+
     static TypedefDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TypedefDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TypedefDef_ptr _nil (void)
       {
         return (TypedefDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_TypedefDef_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
-  
+
   protected:
     TypedefDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_TypedefDef_setup_collocation (int collocated);
-    
+
     TypedefDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~TypedefDef (void);
-    
+
     friend class _TAO_TypedefDef_Remote_Proxy_Impl;
     friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
     friend class _TAO_TypedefDef_Direct_Proxy_Impl;
-  
+
   private:
     TypedefDef (const TypedefDef &);
     void operator= (const TypedefDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Contained_Proxy_Impl, 
+    : public virtual CORBA::_TAO_Contained_Proxy_Impl,
       public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_TypedefDef_Proxy_Impl (void) {}
-  
+
   protected:
     _TAO_TypedefDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Impl
     : public virtual _TAO_TypedefDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -7830,26 +4528,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_TypedefDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_TypedefDef_Remote_Proxy_Impl (void) {}
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker
   {
   public:
@@ -7858,67 +4556,83 @@ TAO_NAMESPACE  CORBA
         TypedefDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_TypedefDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Broker
     : public virtual _TAO_TypedefDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_TypedefDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_TypedefDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
         TypedefDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypedefDef;
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct TypeDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        TypeDescription
+      >
+    TypeDescription_var;
+
+  typedef
+    TAO_Out_T<
+        TypeDescription,
+        TypeDescription_var
+      >
+    TypeDescription_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class TypeDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export TypeDescription
   {
     typedef TypeDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -7926,65 +4640,10 @@ TAO_NAMESPACE  CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export TypeDescription_var
-  {
-  public:
-    TypeDescription_var (void);
-    TypeDescription_var (TypeDescription *);
-    TypeDescription_var (const TypeDescription_var &);
-    ~TypeDescription_var (void);
-    
-    TypeDescription_var &operator= (TypeDescription *);
-    TypeDescription_var &operator= (const TypeDescription_var &);
-    TypeDescription *operator-> (void);
-    const TypeDescription *operator-> (void) const;
-    
-    operator const TypeDescription &() const;
-    operator TypeDescription &();
-    operator TypeDescription &() const;
-    
-    // Variable-size types only.
-    operator TypeDescription *&();
-    
-    // in, inout, out, _retn 
-    const TypeDescription &in (void) const;
-    TypeDescription &inout (void);
-    TypeDescription *&out (void);
-    TypeDescription *_retn (void);
-    TypeDescription *ptr (void) const;
-  
-  private:
-    TypeDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export TypeDescription_out
-  {
-  public:
-    TypeDescription_out (TypeDescription *&);
-    TypeDescription_out (TypeDescription_var &);
-    TypeDescription_out (const TypeDescription_out &);
-    TypeDescription_out &operator= (const TypeDescription_out &);
-    TypeDescription_out &operator= (TypeDescription *);
-    operator TypeDescription *&();
-    TypeDescription *&ptr (void);
-    TypeDescription *operator-> (void);
-    
-  private:
-    TypeDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const TypeDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeDescription;
 
 // TAO_IDL - Generated from
@@ -8029,747 +4688,6 @@ CORBA::_TAO_TypedefDef_Proxy_Broker *
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:103
-
-// External declarations for undefined interface
-
-// CORBA::Repository
-TAO_IFR_Client_Export
-CORBA::Repository_ptr
-tao_CORBA_Repository_duplicate (
-    CORBA::Repository_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_Repository_release (
-    CORBA::Repository_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::Repository_ptr
-tao_CORBA_Repository_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::Repository_ptr
-tao_CORBA_Repository_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_Repository_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_Repository_marshal (
-    CORBA::Repository_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ModuleDef
-TAO_IFR_Client_Export
-CORBA::ModuleDef_ptr
-tao_CORBA_ModuleDef_duplicate (
-    CORBA::ModuleDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ModuleDef_release (
-    CORBA::ModuleDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ModuleDef_ptr
-tao_CORBA_ModuleDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ModuleDef_ptr
-tao_CORBA_ModuleDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ModuleDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ModuleDef_marshal (
-    CORBA::ModuleDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ConstantDef
-TAO_IFR_Client_Export
-CORBA::ConstantDef_ptr
-tao_CORBA_ConstantDef_duplicate (
-    CORBA::ConstantDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ConstantDef_release (
-    CORBA::ConstantDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ConstantDef_ptr
-tao_CORBA_ConstantDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ConstantDef_ptr
-tao_CORBA_ConstantDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ConstantDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ConstantDef_marshal (
-    CORBA::ConstantDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::StructDef
-TAO_IFR_Client_Export
-CORBA::StructDef_ptr
-tao_CORBA_StructDef_duplicate (
-    CORBA::StructDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_StructDef_release (
-    CORBA::StructDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::StructDef_ptr
-tao_CORBA_StructDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::StructDef_ptr
-tao_CORBA_StructDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_StructDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_StructDef_marshal (
-    CORBA::StructDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::UnionDef
-TAO_IFR_Client_Export
-CORBA::UnionDef_ptr
-tao_CORBA_UnionDef_duplicate (
-    CORBA::UnionDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_UnionDef_release (
-    CORBA::UnionDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::UnionDef_ptr
-tao_CORBA_UnionDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::UnionDef_ptr
-tao_CORBA_UnionDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_UnionDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_UnionDef_marshal (
-    CORBA::UnionDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::EnumDef
-TAO_IFR_Client_Export
-CORBA::EnumDef_ptr
-tao_CORBA_EnumDef_duplicate (
-    CORBA::EnumDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_EnumDef_release (
-    CORBA::EnumDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::EnumDef_ptr
-tao_CORBA_EnumDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::EnumDef_ptr
-tao_CORBA_EnumDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_EnumDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_EnumDef_marshal (
-    CORBA::EnumDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::AliasDef
-TAO_IFR_Client_Export
-CORBA::AliasDef_ptr
-tao_CORBA_AliasDef_duplicate (
-    CORBA::AliasDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_AliasDef_release (
-    CORBA::AliasDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::AliasDef_ptr
-tao_CORBA_AliasDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::AliasDef_ptr
-tao_CORBA_AliasDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_AliasDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_AliasDef_marshal (
-    CORBA::AliasDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::InterfaceDef
-TAO_IFR_Client_Export
-CORBA::InterfaceDef_ptr
-tao_CORBA_InterfaceDef_duplicate (
-    CORBA::InterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_InterfaceDef_release (
-    CORBA::InterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::InterfaceDef_ptr
-tao_CORBA_InterfaceDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::InterfaceDef_ptr
-tao_CORBA_InterfaceDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_InterfaceDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_InterfaceDef_marshal (
-    CORBA::InterfaceDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ExceptionDef
-TAO_IFR_Client_Export
-CORBA::ExceptionDef_ptr
-tao_CORBA_ExceptionDef_duplicate (
-    CORBA::ExceptionDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ExceptionDef_release (
-    CORBA::ExceptionDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExceptionDef_ptr
-tao_CORBA_ExceptionDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExceptionDef_ptr
-tao_CORBA_ExceptionDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ExceptionDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ExceptionDef_marshal (
-    CORBA::ExceptionDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::NativeDef
-TAO_IFR_Client_Export
-CORBA::NativeDef_ptr
-tao_CORBA_NativeDef_duplicate (
-    CORBA::NativeDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_NativeDef_release (
-    CORBA::NativeDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::NativeDef_ptr
-tao_CORBA_NativeDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::NativeDef_ptr
-tao_CORBA_NativeDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_NativeDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_NativeDef_marshal (
-    CORBA::NativeDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ValueDef
-TAO_IFR_Client_Export
-CORBA::ValueDef_ptr
-tao_CORBA_ValueDef_duplicate (
-    CORBA::ValueDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ValueDef_release (
-    CORBA::ValueDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ValueDef_ptr
-tao_CORBA_ValueDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ValueDef_ptr
-tao_CORBA_ValueDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ValueDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ValueDef_marshal (
-    CORBA::ValueDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ValueBoxDef
-TAO_IFR_Client_Export
-CORBA::ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_duplicate (
-    CORBA::ValueBoxDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ValueBoxDef_release (
-    CORBA::ValueBoxDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ValueBoxDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ValueBoxDef_marshal (
-    CORBA::ValueBoxDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::AbstractInterfaceDef
-TAO_IFR_Client_Export
-CORBA::AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_duplicate (
-    CORBA::AbstractInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_AbstractInterfaceDef_release (
-    CORBA::AbstractInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_AbstractInterfaceDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_AbstractInterfaceDef_marshal (
-    CORBA::AbstractInterfaceDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::LocalInterfaceDef
-TAO_IFR_Client_Export
-CORBA::LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_duplicate (
-    CORBA::LocalInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_LocalInterfaceDef_release (
-    CORBA::LocalInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_LocalInterfaceDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_LocalInterfaceDef_marshal (
-    CORBA::LocalInterfaceDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ExtInterfaceDef
-TAO_IFR_Client_Export
-CORBA::ExtInterfaceDef_ptr
-tao_CORBA_ExtInterfaceDef_duplicate (
-    CORBA::ExtInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ExtInterfaceDef_release (
-    CORBA::ExtInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExtInterfaceDef_ptr
-tao_CORBA_ExtInterfaceDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExtInterfaceDef_ptr
-tao_CORBA_ExtInterfaceDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ExtInterfaceDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ExtInterfaceDef_marshal (
-    CORBA::ExtInterfaceDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ExtValueDef
-TAO_IFR_Client_Export
-CORBA::ExtValueDef_ptr
-tao_CORBA_ExtValueDef_duplicate (
-    CORBA::ExtValueDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ExtValueDef_release (
-    CORBA::ExtValueDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExtValueDef_ptr
-tao_CORBA_ExtValueDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExtValueDef_ptr
-tao_CORBA_ExtValueDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ExtValueDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ExtValueDef_marshal (
-    CORBA::ExtValueDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ExtAbstractInterfaceDef
-TAO_IFR_Client_Export
-CORBA::ExtAbstractInterfaceDef_ptr
-tao_CORBA_ExtAbstractInterfaceDef_duplicate (
-    CORBA::ExtAbstractInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ExtAbstractInterfaceDef_release (
-    CORBA::ExtAbstractInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExtAbstractInterfaceDef_ptr
-tao_CORBA_ExtAbstractInterfaceDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExtAbstractInterfaceDef_ptr
-tao_CORBA_ExtAbstractInterfaceDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ExtAbstractInterfaceDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ExtAbstractInterfaceDef_marshal (
-    CORBA::ExtAbstractInterfaceDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// External declarations for undefined interface
-
-// CORBA::ExtLocalInterfaceDef
-TAO_IFR_Client_Export
-CORBA::ExtLocalInterfaceDef_ptr
-tao_CORBA_ExtLocalInterfaceDef_duplicate (
-    CORBA::ExtLocalInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_ExtLocalInterfaceDef_release (
-    CORBA::ExtLocalInterfaceDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExtLocalInterfaceDef_ptr
-tao_CORBA_ExtLocalInterfaceDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::ExtLocalInterfaceDef_ptr
-tao_CORBA_ExtLocalInterfaceDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_ExtLocalInterfaceDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_ExtLocalInterfaceDef_marshal (
-    CORBA::ExtLocalInterfaceDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::DefinitionKind);
@@ -9621,7 +5539,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BaseC.i"
@@ -9637,5 +5555,3 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc
 
 #include "ace/post.h"
 #endif /* ifndef */
-
-
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.i b/TAO/tao/IFR_Client/IFR_BaseC.i
index 11d23f2fb35..a12c14edff3 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.i
+++ b/TAO/tao/IFR_Client/IFR_BaseC.i
@@ -37,13 +37,6 @@ CORBA::IRObject::IRObject (
   this->CORBA_IRObject_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::IRObject::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -58,217 +51,6 @@ TAO::Any_Impl_T<CORBA::IRObject>::to_object (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::Contained::Description_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Contained::Description_var::Description_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Contained::Description_var::Description_var (Description *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Contained::Description_var::Description_var (const ::CORBA::Contained::Description_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::Contained::Description (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::Contained::Description_var::~Description_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_var &
-CORBA::Contained::Description_var::operator= (Description *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::Contained::Description_var &
-CORBA::Contained::Description_var::operator= (const ::CORBA::Contained::Description_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Description *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Description (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Description *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::Contained::Description *
-CORBA::Contained::Description_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Contained::Description *
-CORBA::Contained::Description_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_var::operator const ::CORBA::Contained::Description &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_var::operator ::CORBA::Contained::Description &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_var::operator ::CORBA::Contained::Description &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::Contained::Description_var::operator ::CORBA::Contained::Description *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::Contained::Description &
-CORBA::Contained::Description_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Contained::Description &
-CORBA::Contained::Description_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::Contained::Description *&
-CORBA::Contained::Description_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Contained::Description *
-CORBA::Contained::Description_var::_retn (void)
-{
-  ::CORBA::Contained::Description *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::Contained::Description *
-CORBA::Contained::Description_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::Contained::Description_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Contained::Description_out::Description_out (::CORBA::Contained::Description *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_out::Description_out (Description_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_out::Description_out (const ::CORBA::Contained::Description_out &p)
-  : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::Contained::Description_out &
-CORBA::Contained::Description_out::operator= (const ::CORBA::Contained::Description_out &p)
-{
-  this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Contained::Description_out &
-CORBA::Contained::Description_out::operator= (Description *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Contained::Description_out::operator ::CORBA::Contained::Description *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Contained::Description *&
-CORBA::Contained::Description_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Contained::Description *
-CORBA::Contained::Description_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_CONTAINED___CI_)
@@ -285,8164 +67,6 @@ CORBA::Contained::Contained (
   this->CORBA_Contained_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::Contained::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::InterfaceDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::InterfaceDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::InterfaceDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_InterfaceDef_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (CORBA::InterfaceDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::InterfaceDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::InterfaceDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::InterfaceDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_InterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::InterfaceDef **tmp =
-        ACE_reinterpret_cast (CORBA::InterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_InterfaceDef_release (tmp[i]);
-          tmp[i] = tao_CORBA_InterfaceDef_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::InterfaceDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::InterfaceDef **, this->buffer_);
-  
-  CORBA::InterfaceDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_InterfaceDef_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::InterfaceDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::InterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::InterfaceDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::InterfaceDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::InterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CI_)
-#define _CORBA_INTERFACEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::InterfaceDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::InterfaceDefSeq_var (InterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::InterfaceDefSeq_var (const ::CORBA::InterfaceDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::InterfaceDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::~InterfaceDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var &
-CORBA::InterfaceDefSeq_var::operator= (InterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq_var &
-CORBA::InterfaceDefSeq_var::operator= (const ::CORBA::InterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          InterfaceDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              InterfaceDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              InterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::operator const ::CORBA::InterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::operator ::CORBA::InterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::operator ::CORBA::InterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::InterfaceDefSeq_var::operator ::CORBA::InterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::InterfaceDef, CORBA::InterfaceDef_var>
-CORBA::InterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::InterfaceDefSeq &
-CORBA::InterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq &
-CORBA::InterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq *&
-CORBA::InterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA::InterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_out::InterfaceDefSeq_out (InterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_out::InterfaceDefSeq_out (InterfaceDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_out::InterfaceDefSeq_out (const ::CORBA::InterfaceDefSeq_out &p)
-  : ptr_ (ACE_const_cast (InterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq_out &
-CORBA::InterfaceDefSeq_out::operator= (const ::CORBA::InterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (InterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq_out &
-CORBA::InterfaceDefSeq_out::operator= (InterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::InterfaceDefSeq_out::operator ::CORBA::InterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq *&
-CORBA::InterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDefSeq *
-CORBA::InterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::InterfaceDef, CORBA::InterfaceDef_var>
-CORBA::InterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::ValueDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::ValueDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::ValueDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_ValueDef_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (CORBA::ValueDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ValueDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ValueDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
-      CORBA::ValueDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_ValueDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::ValueDef **tmp =
-        ACE_reinterpret_cast (CORBA::ValueDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_ValueDef_release (tmp[i]);
-          tmp[i] = tao_CORBA_ValueDef_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ValueDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::ValueDef **, this->buffer_);
-  
-  CORBA::ValueDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_ValueDef_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::ValueDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::ValueDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ValueDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ValueDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ValueDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ValueDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEDEFSEQ_CI_)
-#define _CORBA_VALUEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::ValueDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::ValueDefSeq_var (ValueDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::ValueDefSeq_var (const ::CORBA::ValueDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ValueDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::~ValueDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var &
-CORBA::ValueDefSeq_var::operator= (ValueDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq_var &
-CORBA::ValueDefSeq_var::operator= (const ::CORBA::ValueDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ValueDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ValueDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ValueDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::operator const ::CORBA::ValueDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::operator ::CORBA::ValueDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_var::operator ::CORBA::ValueDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ValueDefSeq_var::operator ::CORBA::ValueDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ValueDef, CORBA::ValueDef_var>
-CORBA::ValueDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ValueDefSeq &
-CORBA::ValueDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq &
-CORBA::ValueDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq *&
-CORBA::ValueDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_var::_retn (void)
-{
-  ::CORBA::ValueDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDefSeq_out::ValueDefSeq_out (ValueDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_out::ValueDefSeq_out (ValueDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_out::ValueDefSeq_out (const ::CORBA::ValueDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ValueDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ValueDefSeq_out &
-CORBA::ValueDefSeq_out::operator= (const ::CORBA::ValueDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ValueDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq_out &
-CORBA::ValueDefSeq_out::operator= (ValueDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ValueDefSeq_out::operator ::CORBA::ValueDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq *&
-CORBA::ValueDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueDefSeq *
-CORBA::ValueDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ValueDef, CORBA::ValueDef_var>
-CORBA::ValueDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::AbstractInterfaceDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::AbstractInterfaceDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::AbstractInterfaceDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_AbstractInterfaceDef_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (CORBA::AbstractInterfaceDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::AbstractInterfaceDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::AbstractInterfaceDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::AbstractInterfaceDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_AbstractInterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::AbstractInterfaceDef **tmp =
-        ACE_reinterpret_cast (CORBA::AbstractInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
-          tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::AbstractInterfaceDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::AbstractInterfaceDef **, this->buffer_);
-  
-  CORBA::AbstractInterfaceDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_AbstractInterfaceDef_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::AbstractInterfaceDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::AbstractInterfaceDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::AbstractInterfaceDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::AbstractInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::AbstractInterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var::AbstractInterfaceDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var::AbstractInterfaceDefSeq_var (AbstractInterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var::AbstractInterfaceDefSeq_var (const ::CORBA::AbstractInterfaceDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::AbstractInterfaceDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var::~AbstractInterfaceDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var &
-CORBA::AbstractInterfaceDefSeq_var::operator= (AbstractInterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq_var &
-CORBA::AbstractInterfaceDefSeq_var::operator= (const ::CORBA::AbstractInterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          AbstractInterfaceDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              AbstractInterfaceDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              AbstractInterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::AbstractInterfaceDefSeq *
-CORBA::AbstractInterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq *
-CORBA::AbstractInterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var::operator const ::CORBA::AbstractInterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var::operator ::CORBA::AbstractInterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var::operator ::CORBA::AbstractInterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_var::operator ::CORBA::AbstractInterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::AbstractInterfaceDef, CORBA::AbstractInterfaceDef_var>
-CORBA::AbstractInterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::AbstractInterfaceDefSeq &
-CORBA::AbstractInterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq &
-CORBA::AbstractInterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq *&
-CORBA::AbstractInterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq *
-CORBA::AbstractInterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA::AbstractInterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq *
-CORBA::AbstractInterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::AbstractInterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_out::AbstractInterfaceDefSeq_out (AbstractInterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_out::AbstractInterfaceDefSeq_out (AbstractInterfaceDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_out::AbstractInterfaceDefSeq_out (const ::CORBA::AbstractInterfaceDefSeq_out &p)
-  : ptr_ (ACE_const_cast (AbstractInterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq_out &
-CORBA::AbstractInterfaceDefSeq_out::operator= (const ::CORBA::AbstractInterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (AbstractInterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq_out &
-CORBA::AbstractInterfaceDefSeq_out::operator= (AbstractInterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::AbstractInterfaceDefSeq_out::operator ::CORBA::AbstractInterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq *&
-CORBA::AbstractInterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AbstractInterfaceDefSeq *
-CORBA::AbstractInterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::AbstractInterfaceDef, CORBA::AbstractInterfaceDef_var>
-CORBA::AbstractInterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::LocalInterfaceDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::LocalInterfaceDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::LocalInterfaceDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_LocalInterfaceDef_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (CORBA::LocalInterfaceDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::LocalInterfaceDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::LocalInterfaceDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::LocalInterfaceDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_LocalInterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::LocalInterfaceDef **tmp =
-        ACE_reinterpret_cast (CORBA::LocalInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_LocalInterfaceDef_release (tmp[i]);
-          tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::LocalInterfaceDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::LocalInterfaceDef **, this->buffer_);
-  
-  CORBA::LocalInterfaceDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_LocalInterfaceDef_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::LocalInterfaceDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::LocalInterfaceDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::LocalInterfaceDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::LocalInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CI_)
-#define _CORBA_LOCALINTERFACEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::LocalInterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var::LocalInterfaceDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var::LocalInterfaceDefSeq_var (LocalInterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var::LocalInterfaceDefSeq_var (const ::CORBA::LocalInterfaceDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::LocalInterfaceDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var::~LocalInterfaceDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var &
-CORBA::LocalInterfaceDefSeq_var::operator= (LocalInterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq_var &
-CORBA::LocalInterfaceDefSeq_var::operator= (const ::CORBA::LocalInterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          LocalInterfaceDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              LocalInterfaceDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              LocalInterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::LocalInterfaceDefSeq *
-CORBA::LocalInterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq *
-CORBA::LocalInterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var::operator const ::CORBA::LocalInterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var::operator ::CORBA::LocalInterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var::operator ::CORBA::LocalInterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_var::operator ::CORBA::LocalInterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::LocalInterfaceDef, CORBA::LocalInterfaceDef_var>
-CORBA::LocalInterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::LocalInterfaceDefSeq &
-CORBA::LocalInterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq &
-CORBA::LocalInterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq *&
-CORBA::LocalInterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq *
-CORBA::LocalInterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA::LocalInterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq *
-CORBA::LocalInterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::LocalInterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_out::LocalInterfaceDefSeq_out (LocalInterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_out::LocalInterfaceDefSeq_out (LocalInterfaceDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_out::LocalInterfaceDefSeq_out (const ::CORBA::LocalInterfaceDefSeq_out &p)
-  : ptr_ (ACE_const_cast (LocalInterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq_out &
-CORBA::LocalInterfaceDefSeq_out::operator= (const ::CORBA::LocalInterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (LocalInterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq_out &
-CORBA::LocalInterfaceDefSeq_out::operator= (LocalInterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::LocalInterfaceDefSeq_out::operator ::CORBA::LocalInterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq *&
-CORBA::LocalInterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::LocalInterfaceDefSeq *
-CORBA::LocalInterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::LocalInterfaceDef, CORBA::LocalInterfaceDef_var>
-CORBA::LocalInterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTINTERFACEDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::ExtInterfaceDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::ExtInterfaceDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::ExtInterfaceDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_ExtInterfaceDef_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::freebuf (CORBA::ExtInterfaceDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExtInterfaceDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExtInterfaceDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::ExtInterfaceDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExtInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_ExtInterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::ExtInterfaceDef **tmp =
-        ACE_reinterpret_cast (CORBA::ExtInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_ExtInterfaceDef_release (tmp[i]);
-          tmp[i] = tao_CORBA_ExtInterfaceDef_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ExtInterfaceDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::ExtInterfaceDef **, this->buffer_);
-  
-  CORBA::ExtInterfaceDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExtInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_ExtInterfaceDef_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::ExtInterfaceDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::ExtInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::ExtInterfaceDef,CORBA::ExtInterfaceDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExtInterfaceDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExtInterfaceDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ExtInterfaceDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ExtInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtInterfaceDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExtInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTINTERFACEDEFSEQ_CI_)
-#define _CORBA_EXTINTERFACEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ExtInterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var::ExtInterfaceDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var::ExtInterfaceDefSeq_var (ExtInterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var::ExtInterfaceDefSeq_var (const ::CORBA::ExtInterfaceDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtInterfaceDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var::~ExtInterfaceDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var &
-CORBA::ExtInterfaceDefSeq_var::operator= (ExtInterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq_var &
-CORBA::ExtInterfaceDefSeq_var::operator= (const ::CORBA::ExtInterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtInterfaceDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtInterfaceDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtInterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ExtInterfaceDefSeq *
-CORBA::ExtInterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq *
-CORBA::ExtInterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var::operator const ::CORBA::ExtInterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var::operator ::CORBA::ExtInterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var::operator ::CORBA::ExtInterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_var::operator ::CORBA::ExtInterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtInterfaceDef, CORBA::ExtInterfaceDef_var>
-CORBA::ExtInterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ExtInterfaceDefSeq &
-CORBA::ExtInterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq &
-CORBA::ExtInterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq *&
-CORBA::ExtInterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq *
-CORBA::ExtInterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA::ExtInterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq *
-CORBA::ExtInterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ExtInterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_out::ExtInterfaceDefSeq_out (ExtInterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_out::ExtInterfaceDefSeq_out (ExtInterfaceDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_out::ExtInterfaceDefSeq_out (const ::CORBA::ExtInterfaceDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ExtInterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq_out &
-CORBA::ExtInterfaceDefSeq_out::operator= (const ::CORBA::ExtInterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtInterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq_out &
-CORBA::ExtInterfaceDefSeq_out::operator= (ExtInterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtInterfaceDefSeq_out::operator ::CORBA::ExtInterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq *&
-CORBA::ExtInterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInterfaceDefSeq *
-CORBA::ExtInterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtInterfaceDef, CORBA::ExtInterfaceDef_var>
-CORBA::ExtInterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTVALUEDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::ExtValueDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::ExtValueDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::ExtValueDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_ExtValueDef_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::freebuf (CORBA::ExtValueDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExtValueDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExtValueDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (this->maximum_);
-      CORBA::ExtValueDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExtValueDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_ExtValueDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::ExtValueDef **tmp =
-        ACE_reinterpret_cast (CORBA::ExtValueDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_ExtValueDef_release (tmp[i]);
-          tmp[i] = tao_CORBA_ExtValueDef_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ExtValueDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::ExtValueDef **, this->buffer_);
-  
-  CORBA::ExtValueDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExtValueDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_ExtValueDef_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtValueDef,CORBA::ExtValueDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::ExtValueDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::ExtValueDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::ExtValueDef,CORBA::ExtValueDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::ExtValueDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExtValueDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExtValueDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ExtValueDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ExtValueDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtValueDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExtValueDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTVALUEDEFSEQ_CI_)
-#define _CORBA_EXTVALUEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ExtValueDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_var::ExtValueDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_var::ExtValueDefSeq_var (ExtValueDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_var::ExtValueDefSeq_var (const ::CORBA::ExtValueDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtValueDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_var::~ExtValueDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_var &
-CORBA::ExtValueDefSeq_var::operator= (ExtValueDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq_var &
-CORBA::ExtValueDefSeq_var::operator= (const ::CORBA::ExtValueDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtValueDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtValueDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtValueDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ExtValueDefSeq *
-CORBA::ExtValueDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq *
-CORBA::ExtValueDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_var::operator const ::CORBA::ExtValueDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_var::operator ::CORBA::ExtValueDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_var::operator ::CORBA::ExtValueDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtValueDefSeq_var::operator ::CORBA::ExtValueDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtValueDef, CORBA::ExtValueDef_var>
-CORBA::ExtValueDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ExtValueDefSeq &
-CORBA::ExtValueDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq &
-CORBA::ExtValueDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq *&
-CORBA::ExtValueDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq *
-CORBA::ExtValueDefSeq_var::_retn (void)
-{
-  ::CORBA::ExtValueDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq *
-CORBA::ExtValueDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ExtValueDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_out::ExtValueDefSeq_out (ExtValueDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_out::ExtValueDefSeq_out (ExtValueDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_out::ExtValueDefSeq_out (const ::CORBA::ExtValueDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ExtValueDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq_out &
-CORBA::ExtValueDefSeq_out::operator= (const ::CORBA::ExtValueDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtValueDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq_out &
-CORBA::ExtValueDefSeq_out::operator= (ExtValueDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtValueDefSeq_out::operator ::CORBA::ExtValueDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq *&
-CORBA::ExtValueDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDefSeq *
-CORBA::ExtValueDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtValueDef, CORBA::ExtValueDef_var>
-CORBA::ExtValueDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::ExtAbstractInterfaceDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::ExtAbstractInterfaceDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_ExtAbstractInterfaceDef_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::freebuf (CORBA::ExtAbstractInterfaceDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExtAbstractInterfaceDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExtAbstractInterfaceDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::ExtAbstractInterfaceDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_ExtAbstractInterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::ExtAbstractInterfaceDef **tmp =
-        ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_ExtAbstractInterfaceDef_release (tmp[i]);
-          tmp[i] = tao_CORBA_ExtAbstractInterfaceDef_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ExtAbstractInterfaceDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef **, this->buffer_);
-  
-  CORBA::ExtAbstractInterfaceDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_ExtAbstractInterfaceDef_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::ExtAbstractInterfaceDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef,CORBA::ExtAbstractInterfaceDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExtAbstractInterfaceDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExtAbstractInterfaceDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ExtAbstractInterfaceDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ExtAbstractInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtAbstractInterfaceDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExtAbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CI_)
-#define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ExtAbstractInterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var::ExtAbstractInterfaceDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var::ExtAbstractInterfaceDefSeq_var (ExtAbstractInterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var::ExtAbstractInterfaceDefSeq_var (const ::CORBA::ExtAbstractInterfaceDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtAbstractInterfaceDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var::~ExtAbstractInterfaceDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var &
-CORBA::ExtAbstractInterfaceDefSeq_var::operator= (ExtAbstractInterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq_var &
-CORBA::ExtAbstractInterfaceDefSeq_var::operator= (const ::CORBA::ExtAbstractInterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtAbstractInterfaceDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtAbstractInterfaceDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtAbstractInterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ExtAbstractInterfaceDefSeq *
-CORBA::ExtAbstractInterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq *
-CORBA::ExtAbstractInterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var::operator const ::CORBA::ExtAbstractInterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var::operator ::CORBA::ExtAbstractInterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var::operator ::CORBA::ExtAbstractInterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_var::operator ::CORBA::ExtAbstractInterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef, CORBA::ExtAbstractInterfaceDef_var>
-CORBA::ExtAbstractInterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ExtAbstractInterfaceDefSeq &
-CORBA::ExtAbstractInterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq &
-CORBA::ExtAbstractInterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq *&
-CORBA::ExtAbstractInterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq *
-CORBA::ExtAbstractInterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA::ExtAbstractInterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq *
-CORBA::ExtAbstractInterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ExtAbstractInterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_out::ExtAbstractInterfaceDefSeq_out (ExtAbstractInterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_out::ExtAbstractInterfaceDefSeq_out (ExtAbstractInterfaceDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_out::ExtAbstractInterfaceDefSeq_out (const ::CORBA::ExtAbstractInterfaceDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ExtAbstractInterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq_out &
-CORBA::ExtAbstractInterfaceDefSeq_out::operator= (const ::CORBA::ExtAbstractInterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtAbstractInterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq_out &
-CORBA::ExtAbstractInterfaceDefSeq_out::operator= (ExtAbstractInterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtAbstractInterfaceDefSeq_out::operator ::CORBA::ExtAbstractInterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq *&
-CORBA::ExtAbstractInterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAbstractInterfaceDefSeq *
-CORBA::ExtAbstractInterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtAbstractInterfaceDef, CORBA::ExtAbstractInterfaceDef_var>
-CORBA::ExtAbstractInterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXTLOCALINTERFACEDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::ExtLocalInterfaceDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::ExtLocalInterfaceDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_ExtLocalInterfaceDef_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::freebuf (CORBA::ExtLocalInterfaceDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExtLocalInterfaceDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExtLocalInterfaceDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::ExtLocalInterfaceDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_ExtLocalInterfaceDef_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::ExtLocalInterfaceDef **tmp =
-        ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_ExtLocalInterfaceDef_release (tmp[i]);
-          tmp[i] = tao_CORBA_ExtLocalInterfaceDef_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ExtLocalInterfaceDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef **, this->buffer_);
-  
-  CORBA::ExtLocalInterfaceDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_ExtLocalInterfaceDef_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::ExtLocalInterfaceDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::ExtLocalInterfaceDef,CORBA::ExtLocalInterfaceDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExtLocalInterfaceDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExtLocalInterfaceDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ExtLocalInterfaceDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ExtLocalInterfaceDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExtLocalInterfaceDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExtLocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CI_)
-#define _CORBA_EXTLOCALINTERFACEDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ExtLocalInterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var::ExtLocalInterfaceDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var::ExtLocalInterfaceDefSeq_var (ExtLocalInterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var::ExtLocalInterfaceDefSeq_var (const ::CORBA::ExtLocalInterfaceDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtLocalInterfaceDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var::~ExtLocalInterfaceDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var &
-CORBA::ExtLocalInterfaceDefSeq_var::operator= (ExtLocalInterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq_var &
-CORBA::ExtLocalInterfaceDefSeq_var::operator= (const ::CORBA::ExtLocalInterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtLocalInterfaceDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtLocalInterfaceDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtLocalInterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ExtLocalInterfaceDefSeq *
-CORBA::ExtLocalInterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq *
-CORBA::ExtLocalInterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var::operator const ::CORBA::ExtLocalInterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var::operator ::CORBA::ExtLocalInterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var::operator ::CORBA::ExtLocalInterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_var::operator ::CORBA::ExtLocalInterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtLocalInterfaceDef, CORBA::ExtLocalInterfaceDef_var>
-CORBA::ExtLocalInterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ExtLocalInterfaceDefSeq &
-CORBA::ExtLocalInterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq &
-CORBA::ExtLocalInterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq *&
-CORBA::ExtLocalInterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq *
-CORBA::ExtLocalInterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA::ExtLocalInterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq *
-CORBA::ExtLocalInterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ExtLocalInterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_out::ExtLocalInterfaceDefSeq_out (ExtLocalInterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_out::ExtLocalInterfaceDefSeq_out (ExtLocalInterfaceDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_out::ExtLocalInterfaceDefSeq_out (const ::CORBA::ExtLocalInterfaceDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ExtLocalInterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq_out &
-CORBA::ExtLocalInterfaceDefSeq_out::operator= (const ::CORBA::ExtLocalInterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtLocalInterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq_out &
-CORBA::ExtLocalInterfaceDefSeq_out::operator= (ExtLocalInterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtLocalInterfaceDefSeq_out::operator ::CORBA::ExtLocalInterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq *&
-CORBA::ExtLocalInterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtLocalInterfaceDefSeq *
-CORBA::ExtLocalInterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExtLocalInterfaceDef, CORBA::ExtLocalInterfaceDef_var>
-CORBA::ExtLocalInterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_
-
-ACE_INLINE
-CORBA::Contained **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::Contained **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::Contained*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::Contained::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (CORBA::Contained **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Contained* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::Contained **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-      CORBA::Contained ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::Contained::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::Contained **tmp =
-        ACE_reinterpret_cast (CORBA::Contained **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = CORBA::Contained::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::Contained **tmp1 =
-    ACE_reinterpret_cast (CORBA::Contained **, this->buffer_);
-  
-  CORBA::Contained ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::Contained::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::Contained ** const tmp =
-    ACE_reinterpret_cast (CORBA::Contained ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::Contained* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Contained **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::Contained**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::Contained**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::Contained* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Contained ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_CONTAINEDSEQ_CI_)
-#define _CORBA_CONTAINEDSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ContainedSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContainedSeq_var::ContainedSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::ContainedSeq_var (ContainedSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::ContainedSeq_var (const ::CORBA::ContainedSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ContainedSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::~ContainedSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var &
-CORBA::ContainedSeq_var::operator= (ContainedSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq_var &
-CORBA::ContainedSeq_var::operator= (const ::CORBA::ContainedSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ContainedSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ContainedSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ContainedSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::operator const ::CORBA::ContainedSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ContainedSeq_var::operator ::CORBA::ContainedSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
-CORBA::ContainedSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ContainedSeq &
-CORBA::ContainedSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq &
-CORBA::ContainedSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *&
-CORBA::ContainedSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::_retn (void)
-{
-  ::CORBA::ContainedSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *
-CORBA::ContainedSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ContainedSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContainedSeq_out::ContainedSeq_out (ContainedSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_out::ContainedSeq_out (ContainedSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_out::ContainedSeq_out (const ::CORBA::ContainedSeq_out &p)
-  : ptr_ (ACE_const_cast (ContainedSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ContainedSeq_out &
-CORBA::ContainedSeq_out::operator= (const ::CORBA::ContainedSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ContainedSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq_out &
-CORBA::ContainedSeq_out::operator= (ContainedSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ContainedSeq_out::operator ::CORBA::ContainedSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *&
-CORBA::ContainedSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContainedSeq *
-CORBA::ContainedSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
-CORBA::ContainedSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::Contained>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::StructMember_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructMember_var::StructMember_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::StructMember_var::StructMember_var (StructMember *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::StructMember_var::StructMember_var (const ::CORBA::StructMember_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::StructMember (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::StructMember_var::~StructMember_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMember_var &
-CORBA::StructMember_var::operator= (StructMember *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::StructMember_var &
-CORBA::StructMember_var::operator= (const ::CORBA::StructMember_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          StructMember *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              StructMember (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              StructMember *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::StructMember *
-CORBA::StructMember_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::StructMember *
-CORBA::StructMember_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMember_var::operator const ::CORBA::StructMember &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMember_var::operator ::CORBA::StructMember &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMember_var::operator ::CORBA::StructMember &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::StructMember_var::operator ::CORBA::StructMember *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::StructMember &
-CORBA::StructMember_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::StructMember &
-CORBA::StructMember_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::StructMember *&
-CORBA::StructMember_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::StructMember *
-CORBA::StructMember_var::_retn (void)
-{
-  ::CORBA::StructMember *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::StructMember *
-CORBA::StructMember_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::StructMember_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructMember_out::StructMember_out (::CORBA::StructMember *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMember_out::StructMember_out (StructMember_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMember_out::StructMember_out (const ::CORBA::StructMember_out &p)
-  : ptr_ (ACE_const_cast (StructMember_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::StructMember_out &
-CORBA::StructMember_out::operator= (const ::CORBA::StructMember_out &p)
-{
-  this->ptr_ = ACE_const_cast (StructMember_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::StructMember_out &
-CORBA::StructMember_out::operator= (StructMember *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::StructMember_out::operator ::CORBA::StructMember *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::StructMember *&
-CORBA::StructMember_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::StructMember *
-CORBA::StructMember_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CI_
-
-ACE_INLINE
-CORBA::StructMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::StructMember *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::StructMember[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (CORBA::StructMember *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::StructMember *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (
-    const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::StructMember *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (this->maximum_);
-      CORBA::StructMember * const tmp2 =
-        ACE_reinterpret_cast (CORBA::StructMember * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_StructMemberSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::StructMember *tmp =
-            ACE_reinterpret_cast (CORBA::StructMember *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::StructMember *tmp1 =
-    ACE_reinterpret_cast (CORBA::StructMember *, this->buffer_);
-  CORBA::StructMember * const tmp2 =
-    ACE_reinterpret_cast (CORBA::StructMember * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::StructMember &
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::StructMember* tmp =
-    ACE_reinterpret_cast (CORBA::StructMember*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::StructMember &
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::StructMember * const tmp =
-    ACE_reinterpret_cast (CORBA::StructMember* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::StructMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::StructMember *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::StructMember*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::StructMember*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::StructMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::StructMember * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_StructMemberSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::StructMember *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::StructMember *tmp =
-        ACE_reinterpret_cast (CORBA::StructMember*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ_CI_)
-#define _CORBA_STRUCTMEMBERSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::StructMemberSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::StructMemberSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::StructMemberSeq_var (StructMemberSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::StructMemberSeq_var (const ::CORBA::StructMemberSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::StructMemberSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::~StructMemberSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var &
-CORBA::StructMemberSeq_var::operator= (StructMemberSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq_var &
-CORBA::StructMemberSeq_var::operator= (const ::CORBA::StructMemberSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          StructMemberSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              StructMemberSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              StructMemberSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::operator const ::CORBA::StructMemberSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::operator ::CORBA::StructMemberSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_var::operator ::CORBA::StructMemberSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::StructMemberSeq_var::operator ::CORBA::StructMemberSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMember &
-CORBA::StructMemberSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::StructMember &
-CORBA::StructMemberSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::StructMember &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::StructMemberSeq &
-CORBA::StructMemberSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq &
-CORBA::StructMemberSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq *&
-CORBA::StructMemberSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_var::_retn (void)
-{
-  ::CORBA::StructMemberSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::StructMemberSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::StructMemberSeq_out::StructMemberSeq_out (StructMemberSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_out::StructMemberSeq_out (StructMemberSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_out::StructMemberSeq_out (const ::CORBA::StructMemberSeq_out &p)
-  : ptr_ (ACE_const_cast (StructMemberSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::StructMemberSeq_out &
-CORBA::StructMemberSeq_out::operator= (const ::CORBA::StructMemberSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (StructMemberSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq_out &
-CORBA::StructMemberSeq_out::operator= (StructMemberSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::StructMemberSeq_out::operator ::CORBA::StructMemberSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq *&
-CORBA::StructMemberSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StructMemberSeq *
-CORBA::StructMemberSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StructMember &
-CORBA::StructMemberSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::Initializer_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Initializer_var::Initializer_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Initializer_var::Initializer_var (Initializer *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Initializer_var::Initializer_var (const ::CORBA::Initializer_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::Initializer (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::Initializer_var::~Initializer_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Initializer_var &
-CORBA::Initializer_var::operator= (Initializer *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::Initializer_var &
-CORBA::Initializer_var::operator= (const ::CORBA::Initializer_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Initializer *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Initializer (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Initializer *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::Initializer *
-CORBA::Initializer_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Initializer *
-CORBA::Initializer_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Initializer_var::operator const ::CORBA::Initializer &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Initializer_var::operator ::CORBA::Initializer &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Initializer_var::operator ::CORBA::Initializer &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::Initializer_var::operator ::CORBA::Initializer *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::Initializer &
-CORBA::Initializer_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Initializer &
-CORBA::Initializer_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::Initializer *&
-CORBA::Initializer_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Initializer *
-CORBA::Initializer_var::_retn (void)
-{
-  ::CORBA::Initializer *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::Initializer *
-CORBA::Initializer_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::Initializer_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Initializer_out::Initializer_out (::CORBA::Initializer *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Initializer_out::Initializer_out (Initializer_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Initializer_out::Initializer_out (const ::CORBA::Initializer_out &p)
-  : ptr_ (ACE_const_cast (Initializer_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::Initializer_out &
-CORBA::Initializer_out::operator= (const ::CORBA::Initializer_out &p)
-{
-  this->ptr_ = ACE_const_cast (Initializer_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Initializer_out &
-CORBA::Initializer_out::operator= (Initializer *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Initializer_out::operator ::CORBA::Initializer *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Initializer *&
-CORBA::Initializer_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Initializer *
-CORBA::Initializer_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INITIALIZERSEQ_CI_
-
-ACE_INLINE
-CORBA::Initializer *
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::Initializer *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::Initializer[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (CORBA::Initializer *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Initializer *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::_TAO_Unbounded_Sequence_CORBA_InitializerSeq (
-    const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::Initializer *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (this->maximum_);
-      CORBA::Initializer * const tmp2 =
-        ACE_reinterpret_cast (CORBA::Initializer * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_InitializerSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::Initializer *tmp =
-            ACE_reinterpret_cast (CORBA::Initializer *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::Initializer *tmp1 =
-    ACE_reinterpret_cast (CORBA::Initializer *, this->buffer_);
-  CORBA::Initializer * const tmp2 =
-    ACE_reinterpret_cast (CORBA::Initializer * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::Initializer &
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::Initializer* tmp =
-    ACE_reinterpret_cast (CORBA::Initializer*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::Initializer &
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::Initializer * const tmp =
-    ACE_reinterpret_cast (CORBA::Initializer* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::Initializer *
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Initializer *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::Initializer*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::Initializer*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::Initializer *
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Initializer * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_InitializerSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Initializer *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Initializer *tmp =
-        ACE_reinterpret_cast (CORBA::Initializer*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INITIALIZERSEQ_CI_)
-#define _CORBA_INITIALIZERSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::InitializerSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InitializerSeq_var::InitializerSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::InitializerSeq_var (InitializerSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::InitializerSeq_var (const ::CORBA::InitializerSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::InitializerSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::~InitializerSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_var &
-CORBA::InitializerSeq_var::operator= (InitializerSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq_var &
-CORBA::InitializerSeq_var::operator= (const ::CORBA::InitializerSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          InitializerSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              InitializerSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              InitializerSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::InitializerSeq *
-CORBA::InitializerSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq *
-CORBA::InitializerSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::operator const ::CORBA::InitializerSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::operator ::CORBA::InitializerSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_var::operator ::CORBA::InitializerSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::InitializerSeq_var::operator ::CORBA::InitializerSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Initializer &
-CORBA::InitializerSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::Initializer &
-CORBA::InitializerSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Initializer &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::InitializerSeq &
-CORBA::InitializerSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq &
-CORBA::InitializerSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq *&
-CORBA::InitializerSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq *
-CORBA::InitializerSeq_var::_retn (void)
-{
-  ::CORBA::InitializerSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq *
-CORBA::InitializerSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::InitializerSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InitializerSeq_out::InitializerSeq_out (InitializerSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_out::InitializerSeq_out (InitializerSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_out::InitializerSeq_out (const ::CORBA::InitializerSeq_out &p)
-  : ptr_ (ACE_const_cast (InitializerSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::InitializerSeq_out &
-CORBA::InitializerSeq_out::operator= (const ::CORBA::InitializerSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (InitializerSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq_out &
-CORBA::InitializerSeq_out::operator= (InitializerSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::InitializerSeq_out::operator ::CORBA::InitializerSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq *&
-CORBA::InitializerSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::InitializerSeq *
-CORBA::InitializerSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Initializer &
-CORBA::InitializerSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::ExceptionDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::ExceptionDescription_var (ExceptionDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::ExceptionDescription_var (const ::CORBA::ExceptionDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExceptionDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::~ExceptionDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var &
-CORBA::ExceptionDescription_var::operator= (ExceptionDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDescription_var &
-CORBA::ExceptionDescription_var::operator= (const ::CORBA::ExceptionDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExceptionDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExceptionDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExceptionDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::operator const ::CORBA::ExceptionDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExceptionDescription_var::operator ::CORBA::ExceptionDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ExceptionDescription &
-CORBA::ExceptionDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription &
-CORBA::ExceptionDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ExceptionDescription *&
-CORBA::ExceptionDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::_retn (void)
-{
-  ::CORBA::ExceptionDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDescription_out::ExceptionDescription_out (::CORBA::ExceptionDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out::ExceptionDescription_out (ExceptionDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out::ExceptionDescription_out (const ::CORBA::ExceptionDescription_out &p)
-  : ptr_ (ACE_const_cast (ExceptionDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out &
-CORBA::ExceptionDescription_out::operator= (const ::CORBA::ExceptionDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExceptionDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription_out &
-CORBA::ExceptionDescription_out::operator= (ExceptionDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExceptionDescription_out::operator ::CORBA::ExceptionDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *&
-CORBA::ExceptionDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExceptionDescription *
-CORBA::ExceptionDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::ExceptionDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ExceptionDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ExceptionDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (CORBA::ExceptionDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExceptionDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExceptionDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ExceptionDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ExceptionDescription *tmp =
-            ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ExceptionDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-  CORBA::ExceptionDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ExceptionDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ExceptionDescription* tmp =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ExceptionDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ExceptionDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::ExceptionDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ExceptionDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExceptionDescription *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ExceptionDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ExceptionDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExceptionDescription * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExceptionDescription *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ExceptionDescription *tmp =
-        ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ_CI_)
-#define _CORBA_EXCDESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ExcDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (ExcDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::ExcDescriptionSeq_var (const ::CORBA::ExcDescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExcDescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::~ExcDescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var &
-CORBA::ExcDescriptionSeq_var::operator= (ExcDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq_var &
-CORBA::ExcDescriptionSeq_var::operator= (const ::CORBA::ExcDescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExcDescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExcDescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExcDescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::operator const ::CORBA::ExcDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExcDescriptionSeq_var::operator ::CORBA::ExcDescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription &
-CORBA::ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ExceptionDescription &
-CORBA::ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ExceptionDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ExcDescriptionSeq &
-CORBA::ExcDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq &
-CORBA::ExcDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *&
-CORBA::ExcDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::_retn (void)
-{
-  ::CORBA::ExcDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ExcDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_out::ExcDescriptionSeq_out (const ::CORBA::ExcDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq_out &
-CORBA::ExcDescriptionSeq_out::operator= (const ::CORBA::ExcDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq_out &
-CORBA::ExcDescriptionSeq_out::operator= (ExcDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExcDescriptionSeq_out::operator ::CORBA::ExcDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *&
-CORBA::ExcDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExcDescriptionSeq *
-CORBA::ExcDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDescription &
-CORBA::ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ExtInitializer_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtInitializer_var::ExtInitializer_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtInitializer_var::ExtInitializer_var (ExtInitializer *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtInitializer_var::ExtInitializer_var (const ::CORBA::ExtInitializer_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtInitializer (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtInitializer_var::~ExtInitializer_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer_var &
-CORBA::ExtInitializer_var::operator= (ExtInitializer *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializer_var &
-CORBA::ExtInitializer_var::operator= (const ::CORBA::ExtInitializer_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtInitializer *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtInitializer (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtInitializer *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ExtInitializer *
-CORBA::ExtInitializer_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtInitializer *
-CORBA::ExtInitializer_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer_var::operator const ::CORBA::ExtInitializer &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer_var::operator ::CORBA::ExtInitializer &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer_var::operator ::CORBA::ExtInitializer &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtInitializer_var::operator ::CORBA::ExtInitializer *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ExtInitializer &
-CORBA::ExtInitializer_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtInitializer &
-CORBA::ExtInitializer_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ExtInitializer *&
-CORBA::ExtInitializer_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtInitializer *
-CORBA::ExtInitializer_var::_retn (void)
-{
-  ::CORBA::ExtInitializer *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ExtInitializer *
-CORBA::ExtInitializer_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ExtInitializer_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtInitializer_out::ExtInitializer_out (::CORBA::ExtInitializer *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer_out::ExtInitializer_out (ExtInitializer_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer_out::ExtInitializer_out (const ::CORBA::ExtInitializer_out &p)
-  : ptr_ (ACE_const_cast (ExtInitializer_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ExtInitializer_out &
-CORBA::ExtInitializer_out::operator= (const ::CORBA::ExtInitializer_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtInitializer_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer_out &
-CORBA::ExtInitializer_out::operator= (ExtInitializer *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExtInitializer_out::operator ::CORBA::ExtInitializer *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtInitializer *&
-CORBA::ExtInitializer_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtInitializer *
-CORBA::ExtInitializer_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTINITIALIZERSEQ_CI_
-
-ACE_INLINE
-CORBA::ExtInitializer *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ExtInitializer *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ExtInitializer[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (CORBA::ExtInitializer *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExtInitializer *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExtInitializer *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (this->maximum_);
-      CORBA::ExtInitializer * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExtInitializer * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ExtInitializer *tmp =
-            ACE_reinterpret_cast (CORBA::ExtInitializer *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ExtInitializer *tmp1 =
-    ACE_reinterpret_cast (CORBA::ExtInitializer *, this->buffer_);
-  CORBA::ExtInitializer * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExtInitializer * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ExtInitializer &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ExtInitializer* tmp =
-    ACE_reinterpret_cast (CORBA::ExtInitializer*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ExtInitializer &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ExtInitializer * const tmp =
-    ACE_reinterpret_cast (CORBA::ExtInitializer* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ExtInitializer *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExtInitializer *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExtInitializer*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ExtInitializer*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ExtInitializer *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExtInitializer * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtInitializer *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ExtInitializer *tmp =
-        ACE_reinterpret_cast (CORBA::ExtInitializer*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ExtInitializerSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ_CI_)
-#define _CORBA_EXTINITIALIZERSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ExtInitializerSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_var::ExtInitializerSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_var::ExtInitializerSeq_var (ExtInitializerSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_var::ExtInitializerSeq_var (const ::CORBA::ExtInitializerSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtInitializerSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_var::~ExtInitializerSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_var &
-CORBA::ExtInitializerSeq_var::operator= (ExtInitializerSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq_var &
-CORBA::ExtInitializerSeq_var::operator= (const ::CORBA::ExtInitializerSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtInitializerSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtInitializerSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtInitializerSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ExtInitializerSeq *
-CORBA::ExtInitializerSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq *
-CORBA::ExtInitializerSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_var::operator const ::CORBA::ExtInitializerSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_var::operator ::CORBA::ExtInitializerSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_var::operator ::CORBA::ExtInitializerSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtInitializerSeq_var::operator ::CORBA::ExtInitializerSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer &
-CORBA::ExtInitializerSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ExtInitializer &
-CORBA::ExtInitializerSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ExtInitializer &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ExtInitializerSeq &
-CORBA::ExtInitializerSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq &
-CORBA::ExtInitializerSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq *&
-CORBA::ExtInitializerSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq *
-CORBA::ExtInitializerSeq_var::_retn (void)
-{
-  ::CORBA::ExtInitializerSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq *
-CORBA::ExtInitializerSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ExtInitializerSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_out::ExtInitializerSeq_out (ExtInitializerSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_out::ExtInitializerSeq_out (ExtInitializerSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_out::ExtInitializerSeq_out (const ::CORBA::ExtInitializerSeq_out &p)
-  : ptr_ (ACE_const_cast (ExtInitializerSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq_out &
-CORBA::ExtInitializerSeq_out::operator= (const ::CORBA::ExtInitializerSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtInitializerSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq_out &
-CORBA::ExtInitializerSeq_out::operator= (ExtInitializerSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtInitializerSeq_out::operator ::CORBA::ExtInitializerSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq *&
-CORBA::ExtInitializerSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtInitializerSeq *
-CORBA::ExtInitializerSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtInitializer &
-CORBA::ExtInitializerSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::UnionMember_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionMember_var::UnionMember_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::UnionMember_var::UnionMember_var (UnionMember *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::UnionMember_var::UnionMember_var (const ::CORBA::UnionMember_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::UnionMember (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::UnionMember_var::~UnionMember_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMember_var &
-CORBA::UnionMember_var::operator= (UnionMember *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::UnionMember_var &
-CORBA::UnionMember_var::operator= (const ::CORBA::UnionMember_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          UnionMember *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              UnionMember (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              UnionMember *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::UnionMember *
-CORBA::UnionMember_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::UnionMember *
-CORBA::UnionMember_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMember_var::operator const ::CORBA::UnionMember &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMember_var::operator ::CORBA::UnionMember &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMember_var::operator ::CORBA::UnionMember &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::UnionMember_var::operator ::CORBA::UnionMember *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::UnionMember &
-CORBA::UnionMember_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::UnionMember &
-CORBA::UnionMember_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::UnionMember *&
-CORBA::UnionMember_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::UnionMember *
-CORBA::UnionMember_var::_retn (void)
-{
-  ::CORBA::UnionMember *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::UnionMember *
-CORBA::UnionMember_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::UnionMember_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionMember_out::UnionMember_out (::CORBA::UnionMember *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMember_out::UnionMember_out (UnionMember_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMember_out::UnionMember_out (const ::CORBA::UnionMember_out &p)
-  : ptr_ (ACE_const_cast (UnionMember_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::UnionMember_out &
-CORBA::UnionMember_out::operator= (const ::CORBA::UnionMember_out &p)
-{
-  this->ptr_ = ACE_const_cast (UnionMember_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::UnionMember_out &
-CORBA::UnionMember_out::operator= (UnionMember *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::UnionMember_out::operator ::CORBA::UnionMember *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::UnionMember *&
-CORBA::UnionMember_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::UnionMember *
-CORBA::UnionMember_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_UNIONMEMBERSEQ_CI_
-
-ACE_INLINE
-CORBA::UnionMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::UnionMember *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::UnionMember[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (CORBA::UnionMember *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::UnionMember *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (
-    const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::UnionMember *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (this->maximum_);
-      CORBA::UnionMember * const tmp2 =
-        ACE_reinterpret_cast (CORBA::UnionMember * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::UnionMember *tmp =
-            ACE_reinterpret_cast (CORBA::UnionMember *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::UnionMember *tmp1 =
-    ACE_reinterpret_cast (CORBA::UnionMember *, this->buffer_);
-  CORBA::UnionMember * const tmp2 =
-    ACE_reinterpret_cast (CORBA::UnionMember * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::UnionMember &
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::UnionMember* tmp =
-    ACE_reinterpret_cast (CORBA::UnionMember*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::UnionMember &
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::UnionMember * const tmp =
-    ACE_reinterpret_cast (CORBA::UnionMember* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::UnionMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::UnionMember *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::UnionMember*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::UnionMember*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::UnionMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::UnionMember * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::UnionMember *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::UnionMember *tmp =
-        ACE_reinterpret_cast (CORBA::UnionMember*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_UNIONMEMBERSEQ_CI_)
-#define _CORBA_UNIONMEMBERSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::UnionMemberSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::UnionMemberSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::UnionMemberSeq_var (UnionMemberSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::UnionMemberSeq_var (const ::CORBA::UnionMemberSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::UnionMemberSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::~UnionMemberSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var &
-CORBA::UnionMemberSeq_var::operator= (UnionMemberSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq_var &
-CORBA::UnionMemberSeq_var::operator= (const ::CORBA::UnionMemberSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          UnionMemberSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              UnionMemberSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              UnionMemberSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::operator const ::CORBA::UnionMemberSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::operator ::CORBA::UnionMemberSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_var::operator ::CORBA::UnionMemberSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::UnionMemberSeq_var::operator ::CORBA::UnionMemberSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMember &
-CORBA::UnionMemberSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::UnionMember &
-CORBA::UnionMemberSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::UnionMember &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::UnionMemberSeq &
-CORBA::UnionMemberSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq &
-CORBA::UnionMemberSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq *&
-CORBA::UnionMemberSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_var::_retn (void)
-{
-  ::CORBA::UnionMemberSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::UnionMemberSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::UnionMemberSeq_out::UnionMemberSeq_out (UnionMemberSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_out::UnionMemberSeq_out (UnionMemberSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_out::UnionMemberSeq_out (const ::CORBA::UnionMemberSeq_out &p)
-  : ptr_ (ACE_const_cast (UnionMemberSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq_out &
-CORBA::UnionMemberSeq_out::operator= (const ::CORBA::UnionMemberSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (UnionMemberSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq_out &
-CORBA::UnionMemberSeq_out::operator= (UnionMemberSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::UnionMemberSeq_out::operator ::CORBA::UnionMemberSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq *&
-CORBA::UnionMemberSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::UnionMemberSeq *
-CORBA::UnionMemberSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::UnionMember &
-CORBA::UnionMemberSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMMEMBERSEQ_CI_)
-#define _CORBA_ENUMMEMBERSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::EnumMemberSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::EnumMemberSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::EnumMemberSeq_var (EnumMemberSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::EnumMemberSeq_var (const ::CORBA::EnumMemberSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::EnumMemberSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::~EnumMemberSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var &
-CORBA::EnumMemberSeq_var::operator= (EnumMemberSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq_var &
-CORBA::EnumMemberSeq_var::operator= (const ::CORBA::EnumMemberSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          EnumMemberSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              EnumMemberSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              EnumMemberSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::operator const ::CORBA::EnumMemberSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::operator ::CORBA::EnumMemberSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_var::operator ::CORBA::EnumMemberSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::EnumMemberSeq_var::operator ::CORBA::EnumMemberSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::EnumMemberSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::EnumMemberSeq &
-CORBA::EnumMemberSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq &
-CORBA::EnumMemberSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq *&
-CORBA::EnumMemberSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_var::_retn (void)
-{
-  ::CORBA::EnumMemberSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::EnumMemberSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::EnumMemberSeq_out::EnumMemberSeq_out (EnumMemberSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_out::EnumMemberSeq_out (EnumMemberSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_out::EnumMemberSeq_out (const ::CORBA::EnumMemberSeq_out &p)
-  : ptr_ (ACE_const_cast (EnumMemberSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq_out &
-CORBA::EnumMemberSeq_out::operator= (const ::CORBA::EnumMemberSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (EnumMemberSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq_out &
-CORBA::EnumMemberSeq_out::operator= (EnumMemberSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::EnumMemberSeq_out::operator ::CORBA::EnumMemberSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq *&
-CORBA::EnumMemberSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::EnumMemberSeq *
-CORBA::EnumMemberSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::EnumMemberSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::Container::Description_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container::Description_var::Description_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Container::Description_var::Description_var (Description *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Container::Description_var::Description_var (const ::CORBA::Container::Description_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::Container::Description (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::Container::Description_var::~Description_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::Description_var &
-CORBA::Container::Description_var::operator= (Description *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::Container::Description_var &
-CORBA::Container::Description_var::operator= (const ::CORBA::Container::Description_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Description *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Description (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Description *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::Container::Description *
-CORBA::Container::Description_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Container::Description *
-CORBA::Container::Description_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::Description_var::operator const ::CORBA::Container::Description &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::Description_var::operator ::CORBA::Container::Description &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::Description_var::operator ::CORBA::Container::Description &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::Container::Description_var::operator ::CORBA::Container::Description *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::Container::Description &
-CORBA::Container::Description_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Container::Description &
-CORBA::Container::Description_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::Container::Description *&
-CORBA::Container::Description_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Container::Description *
-CORBA::Container::Description_var::_retn (void)
-{
-  ::CORBA::Container::Description *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::Container::Description *
-CORBA::Container::Description_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::Container::Description_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container::Description_out::Description_out (::CORBA::Container::Description *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::Description_out::Description_out (Description_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::Description_out::Description_out (const ::CORBA::Container::Description_out &p)
-  : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::Container::Description_out &
-CORBA::Container::Description_out::operator= (const ::CORBA::Container::Description_out &p)
-{
-  this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Container::Description_out &
-CORBA::Container::Description_out::operator= (Description *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::Container::Description_out::operator ::CORBA::Container::Description *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Container::Description *&
-CORBA::Container::Description_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::Container::Description *
-CORBA::Container::Description_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::Container::Description *
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::Container::Description *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::Container::Description[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (CORBA::Container::Description *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Container::Description *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::Container::Description *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->maximum_);
-      CORBA::Container::Description * const tmp2 =
-        ACE_reinterpret_cast (CORBA::Container::Description * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::Container::Description *tmp =
-            ACE_reinterpret_cast (CORBA::Container::Description *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::Container::Description *tmp1 =
-    ACE_reinterpret_cast (CORBA::Container::Description *, this->buffer_);
-  CORBA::Container::Description * const tmp2 =
-    ACE_reinterpret_cast (CORBA::Container::Description * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::Container::Description &
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::Container::Description* tmp =
-    ACE_reinterpret_cast (CORBA::Container::Description*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::Container::Description &
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::Container::Description * const tmp =
-    ACE_reinterpret_cast (CORBA::Container::Description* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::Container::Description *
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Container::Description *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::Container::Description*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::Container::Description*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::Container::Description *
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Container::Description * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Container::Description *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Container::Description *tmp =
-        ACE_reinterpret_cast (CORBA::Container::Description*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::Container::DescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (DescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (const ::CORBA::Container::DescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::Container::DescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::~DescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var &
-CORBA::Container::DescriptionSeq_var::operator= (DescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq_var &
-CORBA::Container::DescriptionSeq_var::operator= (const ::CORBA::Container::DescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          DescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              DescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              DescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::operator const ::CORBA::Container::DescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::operator ::CORBA::Container::DescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::operator ::CORBA::Container::DescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::Container::DescriptionSeq_var::operator ::CORBA::Container::DescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::Description &
-CORBA::Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::Container::Description &
-CORBA::Container::DescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Container::Description &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::Container::DescriptionSeq &
-CORBA::Container::DescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq &
-CORBA::Container::DescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq *&
-CORBA::Container::DescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::_retn (void)
-{
-  ::CORBA::Container::DescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::Container::DescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (const ::CORBA::Container::DescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (DescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq_out &
-CORBA::Container::DescriptionSeq_out::operator= (const ::CORBA::Container::DescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (DescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq_out &
-CORBA::Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Container::DescriptionSeq_out::operator ::CORBA::Container::DescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq *&
-CORBA::Container::DescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Container::Description &
-CORBA::Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -8462,13 +86,6 @@ CORBA::Container::Container (
   this->CORBA_Container_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::Container::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -8483,18 +100,11 @@ CORBA::IDLType::IDLType (
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
-  : ACE_NESTED_CLASS (CORBA, Object)(objref, _tao_collocated, servant)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
   this->CORBA_IDLType_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::IDLType::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -8525,13 +135,6 @@ CORBA::TypedefDef::TypedefDef (
   this->CORBA_TypedefDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::TypedefDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -8546,217 +149,6 @@ TAO::Any_Impl_T<CORBA::TypedefDef>::to_object (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::TypeDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::TypeDescription_var::TypeDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::TypeDescription_var::TypeDescription_var (TypeDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::TypeDescription_var::TypeDescription_var (const ::CORBA::TypeDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::TypeDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::TypeDescription_var::~TypeDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_var &
-CORBA::TypeDescription_var::operator= (TypeDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::TypeDescription_var &
-CORBA::TypeDescription_var::operator= (const ::CORBA::TypeDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          TypeDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              TypeDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              TypeDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::TypeDescription *
-CORBA::TypeDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::TypeDescription *
-CORBA::TypeDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_var::operator const ::CORBA::TypeDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_var::operator ::CORBA::TypeDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_var::operator ::CORBA::TypeDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::TypeDescription_var::operator ::CORBA::TypeDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::TypeDescription &
-CORBA::TypeDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::TypeDescription &
-CORBA::TypeDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::TypeDescription *&
-CORBA::TypeDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::TypeDescription *
-CORBA::TypeDescription_var::_retn (void)
-{
-  ::CORBA::TypeDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::TypeDescription *
-CORBA::TypeDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::TypeDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::TypeDescription_out::TypeDescription_out (::CORBA::TypeDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_out::TypeDescription_out (TypeDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_out::TypeDescription_out (const ::CORBA::TypeDescription_out &p)
-  : ptr_ (ACE_const_cast (TypeDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::TypeDescription_out &
-CORBA::TypeDescription_out::operator= (const ::CORBA::TypeDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (TypeDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::TypeDescription_out &
-CORBA::TypeDescription_out::operator= (TypeDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::TypeDescription_out::operator ::CORBA::TypeDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::TypeDescription *&
-CORBA::TypeDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::TypeDescription *
-CORBA::TypeDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
@@ -8771,12 +163,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::DefinitionKind &_tao_enumv
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (CORBA::DefinitionKind, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -8833,7 +225,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -9270,7 +662,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ContainedSeq_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -9331,7 +723,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -9390,7 +782,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -9455,7 +847,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -9516,7 +908,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ExtInitializerSeq_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -9597,7 +989,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -9671,7 +1063,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -9716,5 +1108,3 @@ CORBA::Boolean operator>> (
       return 0;
     }
 }
-
-
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index ca87f284a62..40a7d5b7e41 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -58,6 +58,8 @@
 
 module CORBA 
 {
+  typeprefix CORBA "omg.org";
+
   interface PrimitiveDef;
   interface StringDef;
   interface SequenceDef;
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index f5e06f30937..cb7d09826df 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -51,107 +50,107 @@ static const CORBA::Long _oc_CORBA_PrimitiveKind[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5072), 
-  ACE_NTOHL (0x696d6974), 
-  ACE_NTOHL (0x6976654b), 
-  ACE_NTOHL (0x696e643a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5072),
+  ACE_NTOHL (0x696d6974),
+  ACE_NTOHL (0x6976654b),
+  ACE_NTOHL (0x696e643a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PrimitiveKind:1.0
   14,
-  ACE_NTOHL (0x5072696d), 
-  ACE_NTOHL (0x69746976), 
-  ACE_NTOHL (0x654b696e), 
+  ACE_NTOHL (0x5072696d),
+  ACE_NTOHL (0x69746976),
+  ACE_NTOHL (0x654b696e),
   ACE_NTOHL (0x64000000),  // name = PrimitiveKind
   22, // member count
   8,
-  ACE_NTOHL (0x706b5f6e), 
+  ACE_NTOHL (0x706b5f6e),
   ACE_NTOHL (0x756c6c00),  // name = pk_null
   8,
-  ACE_NTOHL (0x706b5f76), 
+  ACE_NTOHL (0x706b5f76),
   ACE_NTOHL (0x6f696400),  // name = pk_void
   9,
-  ACE_NTOHL (0x706b5f73), 
-  ACE_NTOHL (0x686f7274), 
+  ACE_NTOHL (0x706b5f73),
+  ACE_NTOHL (0x686f7274),
   ACE_NTOHL (0x0),  // name = pk_short
   8,
-  ACE_NTOHL (0x706b5f6c), 
+  ACE_NTOHL (0x706b5f6c),
   ACE_NTOHL (0x6f6e6700),  // name = pk_long
   10,
-  ACE_NTOHL (0x706b5f75), 
-  ACE_NTOHL (0x73686f72), 
+  ACE_NTOHL (0x706b5f75),
+  ACE_NTOHL (0x73686f72),
   ACE_NTOHL (0x74000000),  // name = pk_ushort
   9,
-  ACE_NTOHL (0x706b5f75), 
-  ACE_NTOHL (0x6c6f6e67), 
+  ACE_NTOHL (0x706b5f75),
+  ACE_NTOHL (0x6c6f6e67),
   ACE_NTOHL (0x0),  // name = pk_ulong
   9,
-  ACE_NTOHL (0x706b5f66), 
-  ACE_NTOHL (0x6c6f6174), 
+  ACE_NTOHL (0x706b5f66),
+  ACE_NTOHL (0x6c6f6174),
   ACE_NTOHL (0x0),  // name = pk_float
   10,
-  ACE_NTOHL (0x706b5f64), 
-  ACE_NTOHL (0x6f75626c), 
+  ACE_NTOHL (0x706b5f64),
+  ACE_NTOHL (0x6f75626c),
   ACE_NTOHL (0x65000000),  // name = pk_double
   11,
-  ACE_NTOHL (0x706b5f62), 
-  ACE_NTOHL (0x6f6f6c65), 
+  ACE_NTOHL (0x706b5f62),
+  ACE_NTOHL (0x6f6f6c65),
   ACE_NTOHL (0x616e0000),  // name = pk_boolean
   8,
-  ACE_NTOHL (0x706b5f63), 
+  ACE_NTOHL (0x706b5f63),
   ACE_NTOHL (0x68617200),  // name = pk_char
   9,
-  ACE_NTOHL (0x706b5f6f), 
-  ACE_NTOHL (0x63746574), 
+  ACE_NTOHL (0x706b5f6f),
+  ACE_NTOHL (0x63746574),
   ACE_NTOHL (0x0),  // name = pk_octet
   7,
-  ACE_NTOHL (0x706b5f61), 
+  ACE_NTOHL (0x706b5f61),
   ACE_NTOHL (0x6e790000),  // name = pk_any
   12,
-  ACE_NTOHL (0x706b5f54), 
-  ACE_NTOHL (0x79706543), 
+  ACE_NTOHL (0x706b5f54),
+  ACE_NTOHL (0x79706543),
   ACE_NTOHL (0x6f646500),  // name = pk_TypeCode
   13,
-  ACE_NTOHL (0x706b5f50), 
-  ACE_NTOHL (0x72696e63), 
-  ACE_NTOHL (0x6970616c), 
+  ACE_NTOHL (0x706b5f50),
+  ACE_NTOHL (0x72696e63),
+  ACE_NTOHL (0x6970616c),
   ACE_NTOHL (0x0),  // name = pk_Principal
   10,
-  ACE_NTOHL (0x706b5f73), 
-  ACE_NTOHL (0x7472696e), 
+  ACE_NTOHL (0x706b5f73),
+  ACE_NTOHL (0x7472696e),
   ACE_NTOHL (0x67000000),  // name = pk_string
   10,
-  ACE_NTOHL (0x706b5f6f), 
-  ACE_NTOHL (0x626a7265), 
+  ACE_NTOHL (0x706b5f6f),
+  ACE_NTOHL (0x626a7265),
   ACE_NTOHL (0x66000000),  // name = pk_objref
   12,
-  ACE_NTOHL (0x706b5f6c), 
-  ACE_NTOHL (0x6f6e676c), 
+  ACE_NTOHL (0x706b5f6c),
+  ACE_NTOHL (0x6f6e676c),
   ACE_NTOHL (0x6f6e6700),  // name = pk_longlong
   13,
-  ACE_NTOHL (0x706b5f75), 
-  ACE_NTOHL (0x6c6f6e67), 
-  ACE_NTOHL (0x6c6f6e67), 
+  ACE_NTOHL (0x706b5f75),
+  ACE_NTOHL (0x6c6f6e67),
+  ACE_NTOHL (0x6c6f6e67),
   ACE_NTOHL (0x0),  // name = pk_ulonglong
   14,
-  ACE_NTOHL (0x706b5f6c), 
-  ACE_NTOHL (0x6f6e6764), 
-  ACE_NTOHL (0x6f75626c), 
+  ACE_NTOHL (0x706b5f6c),
+  ACE_NTOHL (0x6f6e6764),
+  ACE_NTOHL (0x6f75626c),
   ACE_NTOHL (0x65000000),  // name = pk_longdouble
   9,
-  ACE_NTOHL (0x706b5f77), 
-  ACE_NTOHL (0x63686172), 
+  ACE_NTOHL (0x706b5f77),
+  ACE_NTOHL (0x63686172),
   ACE_NTOHL (0x0),  // name = pk_wchar
   11,
-  ACE_NTOHL (0x706b5f77), 
-  ACE_NTOHL (0x73747269), 
+  ACE_NTOHL (0x706b5f77),
+  ACE_NTOHL (0x73747269),
   ACE_NTOHL (0x6e670000),  // name = pk_wstring
   14,
-  ACE_NTOHL (0x706b5f76), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x5f626173), 
+  ACE_NTOHL (0x706b5f76),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x5f626173),
   ACE_NTOHL (0x65000000),  // name = pk_value_base
   };
 
@@ -178,7 +177,7 @@ TAO_NAMESPACE_END
 int CORBA::Repository::_tao_class_id = 0;
 
 CORBA::Repository_ptr
-tao_CORBA_Repository_duplicate (
+CORBA::tao_Repository_life::tao_duplicate (
     CORBA::Repository_ptr p
   )
 {
@@ -186,7 +185,7 @@ tao_CORBA_Repository_duplicate (
 }
 
 void
-tao_CORBA_Repository_release (
+CORBA::tao_Repository_life::tao_release (
     CORBA::Repository_ptr p
   )
 {
@@ -194,228 +193,64 @@ tao_CORBA_Repository_release (
 }
 
 CORBA::Repository_ptr
-tao_CORBA_Repository_nil (
+CORBA::tao_Repository_life::tao_nil (
     void
   )
 {
   return CORBA::Repository::_nil ();
 }
 
-CORBA::Repository_ptr
-tao_CORBA_Repository_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_Repository_upcast (
-    void *src
-  )
-{
-  CORBA::Repository **tmp =
-    ACE_static_cast (CORBA::Repository **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_Repository_marshal (
+CORBA::tao_Repository_life::tao_marshal (
     CORBA::Repository_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::Repository_var
-// *************************************************************
-
-CORBA::Repository_var::Repository_var (void)
-  : ptr_ (Repository::_nil ())
-{}
-
-::CORBA::Repository_ptr
-CORBA::Repository_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::Repository_var::Repository_var (const ::CORBA::Repository_var &p)
-  : TAO_Base_var (),
-    ptr_ (Repository::_duplicate (p.ptr ()))
-{}
-
-CORBA::Repository_var::~Repository_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::Repository_var &
-CORBA::Repository_var::operator= (Repository_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Repository_var &
-CORBA::Repository_var::operator= (const ::CORBA::Repository_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::Repository::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::Repository_var::operator const ::CORBA::Repository_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::Repository_var::operator ::CORBA::Repository_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::Repository_ptr
-CORBA::Repository_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Repository_ptr
-CORBA::Repository_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Repository_ptr &
-CORBA::Repository_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Repository_ptr &
-CORBA::Repository_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Repository::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::Repository_ptr
-CORBA::Repository_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::Repository_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::Repository::_nil ();
-  return val;
-}
-
-::CORBA::Repository_ptr
-CORBA::Repository_var::tao_duplicate (Repository_ptr p)
-{
-  return ::CORBA::Repository::_duplicate (p);
-}
-
-void
-CORBA::Repository_var::tao_release (Repository_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::Repository_ptr
-CORBA::Repository_var::tao_nil (void)
-{
-  return ::CORBA::Repository::_nil ();
+  return p->marshal (cdr);
 }
 
-::CORBA::Repository_ptr
-CORBA::Repository_var::tao_narrow (
+CORBA::Repository_ptr
+CORBA::tao_Repository_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::Repository_var::tao_upcast (void *src)
+CORBA::tao_Repository_cast::tao_upcast (
+    void *src
+  )
 {
-  Repository **tmp =
-    ACE_static_cast (Repository **, src);
+  CORBA::Repository **tmp =
+    ACE_static_cast (CORBA::Repository **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::Repository_out
-// *************************************************************
-
-CORBA::Repository_out::Repository_out (Repository_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::Repository::_nil ();
-}
-
-CORBA::Repository_out::Repository_out (Repository_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Repository::_nil ();
-}
-
-CORBA::Repository_out::Repository_out (const ::CORBA::Repository_out &p)
-  : ptr_ (ACE_const_cast (Repository_out &, p).ptr_)
-{}
-
-::CORBA::Repository_out &
-CORBA::Repository_out::operator= (const ::CORBA::Repository_out &p)
-{
-  this->ptr_ = ACE_const_cast (Repository_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::Repository_out &
-CORBA::Repository_out::operator= (const ::CORBA::Repository_var &p)
-{
-  this->ptr_ = ::CORBA::Repository::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::Repository_out &
-CORBA::Repository_out::operator= (Repository_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Repository_out::operator ::CORBA::Repository_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::Repository_ptr &
-CORBA::Repository_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Repository_ptr
-CORBA::Repository_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::Repository,
+        CORBA::tao_Repository_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::Repository,
+        CORBA::tao_Repository_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::Repository, \
+        CORBA::tao_Repository_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::Repository, \
+        CORBA::tao_Repository_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -436,31 +271,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Contained_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Repository_lookup_id (const TAO_ClientRequestInfo_CORBA_Repository_lookup_id &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Repository_lookup_id &);
     const char * search_id_;
-    
+
     ::CORBA::Contained_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Repository_lookup_id::TAO_ClientRequestInfo_CORBA_Repository_lookup_id (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * search_id
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       search_id_ (search_id)
@@ -474,15 +309,15 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (ACE_ENV_SINGLE_ARG_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= search_id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -494,11 +329,11 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (ACE_ENV_SINGLE_ARG
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -507,17 +342,17 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (ACE_ENV_SINGLE_ARG_DEC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (::CORBA::Contained_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -535,31 +370,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode (const TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode &);
     CORBA::TypeCode_ptr tc_;
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::TypeCode_ptr tc
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       tc_ (tc)
@@ -573,15 +408,15 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= tc_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -593,11 +428,11 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -606,17 +441,17 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -634,31 +469,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::PrimitiveDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Repository_get_primitive (const TAO_ClientRequestInfo_CORBA_Repository_get_primitive &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Repository_get_primitive &);
     const CORBA::PrimitiveKind & kind_;
-    
+
     ::CORBA::PrimitiveDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Repository_get_primitive::TAO_ClientRequestInfo_CORBA_Repository_get_primitive (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::PrimitiveKind & kind
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       kind_ (kind)
@@ -672,15 +507,15 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->kind_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -692,11 +527,11 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -705,17 +540,17 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (::CORBA::PrimitiveDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -733,31 +568,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::StringDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Repository_create_string (const TAO_ClientRequestInfo_CORBA_Repository_create_string &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_string &);
     const CORBA::ULong & bound_;
-    
+
     ::CORBA::StringDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Repository_create_string::TAO_ClientRequestInfo_CORBA_Repository_create_string (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       bound_ (bound)
@@ -771,15 +606,15 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= bound_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -791,11 +626,11 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_string::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -804,17 +639,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_string::result (::CORBA::StringDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -832,31 +667,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::WstringDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Repository_create_wstring (const TAO_ClientRequestInfo_CORBA_Repository_create_wstring &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_wstring &);
     const CORBA::ULong & bound_;
-    
+
     ::CORBA::WstringDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Repository_create_wstring::TAO_ClientRequestInfo_CORBA_Repository_create_wstring (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       bound_ (bound)
@@ -870,15 +705,15 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= bound_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -890,11 +725,11 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -903,17 +738,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (::CORBA::WstringDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -932,33 +767,33 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::SequenceDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Repository_create_sequence (const TAO_ClientRequestInfo_CORBA_Repository_create_sequence &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_sequence &);
     const CORBA::ULong & bound_;
     CORBA::IDLType_ptr element_type_;
-    
+
     ::CORBA::SequenceDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CORBA_Repository_create_sequence (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       bound_ (bound),
@@ -973,19 +808,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (ACE_ENV_SINGL
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= bound_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->element_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -997,11 +832,11 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (ACE_ENV_SING
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1010,17 +845,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (ACE_ENV_SINGLE_A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (::CORBA::SequenceDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -1039,33 +874,33 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ArrayDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Repository_create_array (const TAO_ClientRequestInfo_CORBA_Repository_create_array &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_array &);
     const CORBA::ULong & length_;
     CORBA::IDLType_ptr element_type_;
-    
+
     ::CORBA::ArrayDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA_Repository_create_array (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & length,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       length_ (length),
@@ -1080,19 +915,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= length_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->element_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1104,11 +939,11 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_array::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1117,17 +952,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_array::result (::CORBA::ArrayDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -1146,33 +981,33 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::FixedDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Repository_create_fixed (const TAO_ClientRequestInfo_CORBA_Repository_create_fixed &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_fixed &);
     const CORBA::UShort & digits_;
     const CORBA::Short & scale_;
-    
+
     ::CORBA::FixedDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA_Repository_create_fixed (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::UShort & digits,
       const CORBA::Short & scale
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       digits_ (digits),
@@ -1187,19 +1022,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= digits_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= scale_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1211,11 +1046,11 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1224,17 +1059,17 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (::CORBA::FixedDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -1244,7 +1079,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (::CORBA::FixedDef_p
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
@@ -1269,12 +1104,12 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
 {
   CORBA::Contained_var _tao_retval (CORBA::Contained::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "lookup_id",
@@ -1282,22 +1117,22 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_lookup_id _tao_ri (
           &_tao_call,
@@ -1306,14 +1141,14 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1321,91 +1156,95 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << search_id)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << search_id)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Contained_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Contained_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -1415,59 +1254,57 @@ CORBA::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (voi
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -1484,12 +1321,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_canonical_typecode",
@@ -1497,22 +1334,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode _tao_ri (
           &_tao_call,
@@ -1521,14 +1358,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1536,91 +1373,95 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << tc)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << tc)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -1630,59 +1471,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -1699,12 +1538,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
 {
   CORBA::PrimitiveDef_var _tao_retval (CORBA::PrimitiveDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "get_primitive",
@@ -1712,22 +1551,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_get_primitive _tao_ri (
           &_tao_call,
@@ -1736,14 +1575,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1751,91 +1590,95 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << kind)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << kind)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::PrimitiveDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::PrimitiveDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -1845,59 +1688,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -1914,12 +1755,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
 {
   CORBA::StringDef_var _tao_retval (CORBA::StringDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_string",
@@ -1927,22 +1768,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_string _tao_ri (
           &_tao_call,
@@ -1951,14 +1792,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1966,91 +1807,95 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << bound)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << bound)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::StringDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::StringDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -2060,59 +1905,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -2129,12 +1972,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
 {
   CORBA::WstringDef_var _tao_retval (CORBA::WstringDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_wstring",
@@ -2142,22 +1985,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_wstring _tao_ri (
           &_tao_call,
@@ -2166,14 +2009,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -2181,91 +2024,95 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << bound)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << bound)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::WstringDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::WstringDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -2275,59 +2122,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -2345,12 +2190,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
 {
   CORBA::SequenceDef_var _tao_retval (CORBA::SequenceDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_sequence",
@@ -2358,22 +2203,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
       2,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_sequence _tao_ri (
           &_tao_call,
@@ -2383,14 +2228,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -2398,92 +2243,96 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << bound) &&
-              (_tao_out << element_type)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << bound) &&
+                  (_tao_out << element_type)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::SequenceDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::SequenceDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -2493,59 +2342,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -2563,12 +2410,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
 {
   CORBA::ArrayDef_var _tao_retval (CORBA::ArrayDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_array",
@@ -2576,22 +2423,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
       2,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_array _tao_ri (
           &_tao_call,
@@ -2601,14 +2448,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -2616,92 +2463,96 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << length) &&
-              (_tao_out << element_type)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << length) &&
+                  (_tao_out << element_type)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ArrayDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ArrayDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -2711,59 +2562,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -2779,14 +2628,17 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
     CORBA::SystemException
   ))
 {
-  CORBA::FixedDef_var _tao_retval ( tao_CORBA_FixedDef_nil ());
+  CORBA::FixedDef_var _tao_retval (
+      CORBA::tao_FixedDef_life::tao_nil ()
+    );
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_fixed",
@@ -2794,22 +2646,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
       2,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Repository_create_fixed _tao_ri (
           &_tao_call,
@@ -2819,14 +2671,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -2834,92 +2686,96 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << digits) &&
-              (_tao_out << scale)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << digits) &&
+                  (_tao_out << scale)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::FixedDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::FixedDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -2929,63 +2785,61 @@ CORBA::TypeCode_ptr CORBA::_TAO_Repository_Remote_Proxy_Impl::get_canonical_type
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -3036,8 +2890,8 @@ CORBA::_TAO_Repository_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::Repository::Repository (int collocated)
 {
@@ -3053,14 +2907,14 @@ CORBA::Repository::CORBA_Repository_setup_collocation (int collocated)
   else
     this->the_TAO_Repository_Proxy_Broker_ =
       ::CORBA::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Container_setup_collocation (collocated);
 }
 
 CORBA::Repository::~Repository (void)
 {}
 
-void 
+void
 CORBA::Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
   Repository *tmp = ACE_static_cast (Repository *, _tao_void_pointer);
@@ -3077,7 +2931,7 @@ CORBA::Repository::_narrow (
     {
       return Repository::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -3086,17 +2940,17 @@ CORBA::Repository::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Repository::_nil ());
-      
+
       if (is_a == 0)
         {
           return Repository::_nil ();
         }
     }
-  
+
   return Repository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Repository_ptr 
+CORBA::Repository_ptr
 CORBA::Repository::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3106,18 +2960,18 @@ CORBA::Repository::_unchecked_narrow (
     {
       return Repository::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       Repository_ptr default_proxy = Repository::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -3135,7 +2989,7 @@ CORBA::Repository::_unchecked_narrow (
               Repository::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -3148,10 +3002,10 @@ CORBA::Repository::_unchecked_narrow (
               Repository::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           Repository_ptr,
@@ -3171,7 +3025,7 @@ CORBA::Repository::_duplicate (Repository_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3214,7 +3068,7 @@ CORBA::Repository::_is_a (
 void *CORBA::Repository::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, Repository)::_tao_class_id)
@@ -3261,12 +3115,12 @@ void *CORBA::Repository::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3275,6 +3129,12 @@ const char* CORBA::Repository::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Repository:1.0";
 }
 
+CORBA::Boolean
+CORBA::Repository::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -3286,10 +3146,10 @@ const char* CORBA::Repository::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
+  _TAO_Repository_Proxy_Impl &proxy =
     this->the_TAO_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.lookup_id (
       this,
       search_id
@@ -3308,10 +3168,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
+  _TAO_Repository_Proxy_Impl &proxy =
     this->the_TAO_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.get_canonical_typecode (
       this,
       tc
@@ -3330,10 +3190,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
+  _TAO_Repository_Proxy_Impl &proxy =
     this->the_TAO_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.get_primitive (
       this,
       kind
@@ -3352,10 +3212,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
+  _TAO_Repository_Proxy_Impl &proxy =
     this->the_TAO_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_string (
       this,
       bound
@@ -3374,10 +3234,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
+  _TAO_Repository_Proxy_Impl &proxy =
     this->the_TAO_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_wstring (
       this,
       bound
@@ -3397,10 +3257,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
+  _TAO_Repository_Proxy_Impl &proxy =
     this->the_TAO_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_sequence (
       this,
       bound,
@@ -3421,10 +3281,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
+  _TAO_Repository_Proxy_Impl &proxy =
     this->the_TAO_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_array (
       this,
       length,
@@ -3445,10 +3305,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
+  _TAO_Repository_Proxy_Impl &proxy =
     this->the_TAO_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_fixed (
       this,
       digits,
@@ -3464,18 +3324,18 @@ static const CORBA::Long _oc_CORBA_Repository[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Repository:1.0
     11,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
+  ACE_NTOHL (0x5265706f),
+  ACE_NTOHL (0x7369746f),
   ACE_NTOHL (0x72790000),  // name = Repository
   };
 
@@ -3502,7 +3362,7 @@ TAO_NAMESPACE_END
 int CORBA::ModuleDef::_tao_class_id = 0;
 
 CORBA::ModuleDef_ptr
-tao_CORBA_ModuleDef_duplicate (
+CORBA::tao_ModuleDef_life::tao_duplicate (
     CORBA::ModuleDef_ptr p
   )
 {
@@ -3510,7 +3370,7 @@ tao_CORBA_ModuleDef_duplicate (
 }
 
 void
-tao_CORBA_ModuleDef_release (
+CORBA::tao_ModuleDef_life::tao_release (
     CORBA::ModuleDef_ptr p
   )
 {
@@ -3518,228 +3378,64 @@ tao_CORBA_ModuleDef_release (
 }
 
 CORBA::ModuleDef_ptr
-tao_CORBA_ModuleDef_nil (
+CORBA::tao_ModuleDef_life::tao_nil (
     void
   )
 {
   return CORBA::ModuleDef::_nil ();
 }
 
-CORBA::ModuleDef_ptr
-tao_CORBA_ModuleDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ModuleDef_upcast (
-    void *src
-  )
-{
-  CORBA::ModuleDef **tmp =
-    ACE_static_cast (CORBA::ModuleDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ModuleDef_marshal (
+CORBA::tao_ModuleDef_life::tao_marshal (
     CORBA::ModuleDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ModuleDef_var
-// *************************************************************
-
-CORBA::ModuleDef_var::ModuleDef_var (void)
-  : ptr_ (ModuleDef::_nil ())
-{}
-
-::CORBA::ModuleDef_ptr
-CORBA::ModuleDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ModuleDef_var::ModuleDef_var (const ::CORBA::ModuleDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ModuleDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ModuleDef_var::~ModuleDef_var (void)
-{
-  CORBA::release (this->ptr_);
+  return p->marshal (cdr);
 }
 
-CORBA::ModuleDef_var &
-CORBA::ModuleDef_var::operator= (ModuleDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ModuleDef_var &
-CORBA::ModuleDef_var::operator= (const ::CORBA::ModuleDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ModuleDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ModuleDef_var::operator const ::CORBA::ModuleDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ModuleDef_var::operator ::CORBA::ModuleDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ModuleDef_ptr
-CORBA::ModuleDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ModuleDef_ptr
-CORBA::ModuleDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ModuleDef_ptr &
-CORBA::ModuleDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ModuleDef_ptr &
-CORBA::ModuleDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ModuleDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ModuleDef_ptr
-CORBA::ModuleDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ModuleDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ModuleDef::_nil ();
-  return val;
-}
-
-::CORBA::ModuleDef_ptr
-CORBA::ModuleDef_var::tao_duplicate (ModuleDef_ptr p)
-{
-  return ::CORBA::ModuleDef::_duplicate (p);
-}
-
-void
-CORBA::ModuleDef_var::tao_release (ModuleDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ModuleDef_ptr
-CORBA::ModuleDef_var::tao_nil (void)
-{
-  return ::CORBA::ModuleDef::_nil ();
-}
-
-::CORBA::ModuleDef_ptr
-CORBA::ModuleDef_var::tao_narrow (
+CORBA::ModuleDef_ptr
+CORBA::tao_ModuleDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ModuleDef_var::tao_upcast (void *src)
+CORBA::tao_ModuleDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ModuleDef **tmp =
-    ACE_static_cast (ModuleDef **, src);
+  CORBA::ModuleDef **tmp =
+    ACE_static_cast (CORBA::ModuleDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ModuleDef_out
-// *************************************************************
-
-CORBA::ModuleDef_out::ModuleDef_out (ModuleDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ModuleDef::_nil ();
-}
-
-CORBA::ModuleDef_out::ModuleDef_out (ModuleDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ModuleDef::_nil ();
-}
-
-CORBA::ModuleDef_out::ModuleDef_out (const ::CORBA::ModuleDef_out &p)
-  : ptr_ (ACE_const_cast (ModuleDef_out &, p).ptr_)
-{}
-
-::CORBA::ModuleDef_out &
-CORBA::ModuleDef_out::operator= (const ::CORBA::ModuleDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ModuleDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ModuleDef_out &
-CORBA::ModuleDef_out::operator= (const ::CORBA::ModuleDef_var &p)
-{
-  this->ptr_ = ::CORBA::ModuleDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ModuleDef_out &
-CORBA::ModuleDef_out::operator= (ModuleDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ModuleDef_out::operator ::CORBA::ModuleDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ModuleDef_ptr &
-CORBA::ModuleDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ModuleDef_ptr
-CORBA::ModuleDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ModuleDef,
+        CORBA::tao_ModuleDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ModuleDef,
+        CORBA::tao_ModuleDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ModuleDef, \
+        CORBA::tao_ModuleDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ModuleDef, \
+        CORBA::tao_ModuleDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -3752,7 +3448,7 @@ CORBA::ModuleDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
@@ -3764,7 +3460,7 @@ CORBA::_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -3815,8 +3511,8 @@ CORBA::_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ModuleDef::ModuleDef (int collocated)
 {
@@ -3832,7 +3528,7 @@ CORBA::ModuleDef::CORBA_ModuleDef_setup_collocation (int collocated)
   else
     this->the_TAO_ModuleDef_Proxy_Broker_ =
       ::CORBA::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Container_setup_collocation (collocated);
   this->CORBA_Contained_setup_collocation (collocated);
 }
@@ -3840,7 +3536,7 @@ CORBA::ModuleDef::CORBA_ModuleDef_setup_collocation (int collocated)
 CORBA::ModuleDef::~ModuleDef (void)
 {}
 
-void 
+void
 CORBA::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ModuleDef *tmp = ACE_static_cast (ModuleDef *, _tao_void_pointer);
@@ -3857,7 +3553,7 @@ CORBA::ModuleDef::_narrow (
     {
       return ModuleDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -3866,17 +3562,17 @@ CORBA::ModuleDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ModuleDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ModuleDef::_nil ();
         }
     }
-  
+
   return ModuleDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ModuleDef_ptr 
+CORBA::ModuleDef_ptr
 CORBA::ModuleDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3886,18 +3582,18 @@ CORBA::ModuleDef::_unchecked_narrow (
     {
       return ModuleDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ModuleDef_ptr default_proxy = ModuleDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -3915,7 +3611,7 @@ CORBA::ModuleDef::_unchecked_narrow (
               ModuleDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -3928,10 +3624,10 @@ CORBA::ModuleDef::_unchecked_narrow (
               ModuleDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ModuleDef_ptr,
@@ -3951,7 +3647,7 @@ CORBA::ModuleDef::_duplicate (ModuleDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3998,7 +3694,7 @@ CORBA::ModuleDef::_is_a (
 void *CORBA::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ModuleDef)::_tao_class_id)
@@ -4059,12 +3755,12 @@ void *CORBA::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4073,6 +3769,12 @@ const char* CORBA::ModuleDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ModuleDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ModuleDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4080,17 +3782,17 @@ static const CORBA::Long _oc_CORBA_ModuleDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4d6f), 
-  ACE_NTOHL (0x64756c65), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4d6f),
+  ACE_NTOHL (0x64756c65),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDef:1.0
     10,
-  ACE_NTOHL (0x4d6f6475), 
-  ACE_NTOHL (0x6c654465), 
+  ACE_NTOHL (0x4d6f6475),
+  ACE_NTOHL (0x6c654465),
   ACE_NTOHL (0x66000000),  // name = ModuleDef
   };
 
@@ -4118,44 +3820,44 @@ static const CORBA::Long _oc_CORBA_ModuleDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4d6f), 
-  ACE_NTOHL (0x64756c65), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4d6f),
+  ACE_NTOHL (0x64756c65),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ModuleDescription:1.0
     18,
-  ACE_NTOHL (0x4d6f6475), 
-  ACE_NTOHL (0x6c654465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x4d6f6475),
+  ACE_NTOHL (0x6c654465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
   ACE_NTOHL (0x6e000000),  // name = ModuleDescription
   4, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -4164,50 +3866,50 @@ static const CORBA::Long _oc_CORBA_ModuleDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
 };
@@ -4229,7 +3931,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ModuleDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -4239,12 +3941,43 @@ void CORBA::ModuleDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ModuleDescription
+    >;
+
+template class
+  TAO_Out_T<
+      ModuleDescription,
+      ModuleDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ModuleDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ModuleDescription, \
+      ModuleDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ConstantDef::_tao_class_id = 0;
 
 CORBA::ConstantDef_ptr
-tao_CORBA_ConstantDef_duplicate (
+CORBA::tao_ConstantDef_life::tao_duplicate (
     CORBA::ConstantDef_ptr p
   )
 {
@@ -4252,7 +3985,7 @@ tao_CORBA_ConstantDef_duplicate (
 }
 
 void
-tao_CORBA_ConstantDef_release (
+CORBA::tao_ConstantDef_life::tao_release (
     CORBA::ConstantDef_ptr p
   )
 {
@@ -4260,228 +3993,64 @@ tao_CORBA_ConstantDef_release (
 }
 
 CORBA::ConstantDef_ptr
-tao_CORBA_ConstantDef_nil (
+CORBA::tao_ConstantDef_life::tao_nil (
     void
   )
 {
   return CORBA::ConstantDef::_nil ();
 }
 
-CORBA::ConstantDef_ptr
-tao_CORBA_ConstantDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ConstantDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ConstantDef_upcast (
-    void *src
-  )
-{
-  CORBA::ConstantDef **tmp =
-    ACE_static_cast (CORBA::ConstantDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ConstantDef_marshal (
+CORBA::tao_ConstantDef_life::tao_marshal (
     CORBA::ConstantDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ConstantDef_var
-// *************************************************************
-
-CORBA::ConstantDef_var::ConstantDef_var (void)
-  : ptr_ (ConstantDef::_nil ())
-{}
-
-::CORBA::ConstantDef_ptr
-CORBA::ConstantDef_var::ptr (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-CORBA::ConstantDef_var::ConstantDef_var (const ::CORBA::ConstantDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ConstantDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ConstantDef_var::~ConstantDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ConstantDef_var &
-CORBA::ConstantDef_var::operator= (ConstantDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ConstantDef_var &
-CORBA::ConstantDef_var::operator= (const ::CORBA::ConstantDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ConstantDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ConstantDef_var::operator const ::CORBA::ConstantDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ConstantDef_var::operator ::CORBA::ConstantDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstantDef_ptr
-CORBA::ConstantDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstantDef_ptr
-CORBA::ConstantDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstantDef_ptr &
-CORBA::ConstantDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstantDef_ptr &
-CORBA::ConstantDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ConstantDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ConstantDef_ptr
-CORBA::ConstantDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ConstantDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ConstantDef::_nil ();
-  return val;
-}
-
-::CORBA::ConstantDef_ptr
-CORBA::ConstantDef_var::tao_duplicate (ConstantDef_ptr p)
-{
-  return ::CORBA::ConstantDef::_duplicate (p);
-}
-
-void
-CORBA::ConstantDef_var::tao_release (ConstantDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ConstantDef_ptr
-CORBA::ConstantDef_var::tao_nil (void)
-{
-  return ::CORBA::ConstantDef::_nil ();
-}
-
-::CORBA::ConstantDef_ptr
-CORBA::ConstantDef_var::tao_narrow (
+CORBA::ConstantDef_ptr
+CORBA::tao_ConstantDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ConstantDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ConstantDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ConstantDef_var::tao_upcast (void *src)
+CORBA::tao_ConstantDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ConstantDef **tmp =
-    ACE_static_cast (ConstantDef **, src);
+  CORBA::ConstantDef **tmp =
+    ACE_static_cast (CORBA::ConstantDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ConstantDef_out
-// *************************************************************
-
-CORBA::ConstantDef_out::ConstantDef_out (ConstantDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ConstantDef::_nil ();
-}
-
-CORBA::ConstantDef_out::ConstantDef_out (ConstantDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ConstantDef::_nil ();
-}
-
-CORBA::ConstantDef_out::ConstantDef_out (const ::CORBA::ConstantDef_out &p)
-  : ptr_ (ACE_const_cast (ConstantDef_out &, p).ptr_)
-{}
-
-::CORBA::ConstantDef_out &
-CORBA::ConstantDef_out::operator= (const ::CORBA::ConstantDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ConstantDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ConstantDef_out &
-CORBA::ConstantDef_out::operator= (const ::CORBA::ConstantDef_var &p)
-{
-  this->ptr_ = ::CORBA::ConstantDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ConstantDef_out &
-CORBA::ConstantDef_out::operator= (ConstantDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ConstantDef_out::operator ::CORBA::ConstantDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstantDef_ptr &
-CORBA::ConstantDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ConstantDef_ptr
-CORBA::ConstantDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ConstantDef,
+        CORBA::tao_ConstantDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ConstantDef,
+        CORBA::tao_ConstantDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ConstantDef, \
+        CORBA::tao_ConstantDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ConstantDef, \
+        CORBA::tao_ConstantDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -4501,29 +4070,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_get &);
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -4536,7 +4105,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::arguments (ACE_ENV_SINGLE_ARG_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4548,11 +4117,11 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (ACE_ENV_SINGLE_ARG
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4561,17 +4130,17 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (ACE_ENV_SINGLE_ARG_DEC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -4588,29 +4157,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -4623,7 +4192,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4635,11 +4204,11 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4648,17 +4217,17 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -4676,10 +4245,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4688,15 +4257,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set &);
     CORBA::IDLType_ptr type_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       type_def_ (type_def)
@@ -4710,15 +4279,15 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -4730,11 +4299,11 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4743,7 +4312,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4762,29 +4331,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Any * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (const TAO_ClientRequestInfo_CORBA_ConstantDef_value_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_value_get &);
-    
+
     ::CORBA::Any * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -4797,7 +4366,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4809,11 +4378,11 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4822,17 +4391,17 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Any * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -4850,10 +4419,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4862,15 +4431,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_value_set &);
     const CORBA::Any & value_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::TAO_ClientRequestInfo_CORBA_ConstantDef_value_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       value_ (value)
@@ -4884,15 +4453,15 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -4904,11 +4473,11 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4917,7 +4486,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4929,7 +4498,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DE
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_Proxy_Impl (void)
@@ -4953,12 +4522,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -4966,22 +4535,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_get _tao_ri (
           &_tao_call,
@@ -4989,14 +4558,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5004,78 +4573,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -5085,59 +4661,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -5153,12 +4727,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type_def",
@@ -5166,22 +4740,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get _tao_ri (
           &_tao_call,
@@ -5189,14 +4763,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5204,78 +4778,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -5285,59 +4866,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -5353,12 +4932,12 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_type_def",
@@ -5366,22 +4945,22 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set _tao_ri (
           &_tao_call,
@@ -5390,14 +4969,14 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5405,70 +4984,76 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -5478,56 +5063,54 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -5544,18 +5127,18 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
 {
   CORBA::Any_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::Any *tmp;
     ACE_NEW_RETURN (tmp, CORBA::Any, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_value",
@@ -5563,22 +5146,22 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_value_get _tao_ri (
           &_tao_call,
@@ -5586,14 +5169,14 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5601,78 +5184,85 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Any * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Any * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -5682,59 +5272,57 @@ CORBA::Any * CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -5750,12 +5338,12 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_value",
@@ -5763,22 +5351,22 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_value_set _tao_ri (
           &_tao_call,
@@ -5787,14 +5375,14 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5802,70 +5390,76 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << value)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << value)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -5875,61 +5469,59 @@ void CORBA::_TAO_ConstantDef_Remote_Proxy_Impl::value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -5980,8 +5572,8 @@ CORBA::_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ConstantDef::ConstantDef (int collocated)
 {
@@ -5997,14 +5589,14 @@ CORBA::ConstantDef::CORBA_ConstantDef_setup_collocation (int collocated)
   else
     this->the_TAO_ConstantDef_Proxy_Broker_ =
       ::CORBA::_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
 CORBA::ConstantDef::~ConstantDef (void)
 {}
 
-void 
+void
 CORBA::ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstantDef *tmp = ACE_static_cast (ConstantDef *, _tao_void_pointer);
@@ -6021,7 +5613,7 @@ CORBA::ConstantDef::_narrow (
     {
       return ConstantDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -6030,17 +5622,17 @@ CORBA::ConstantDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ConstantDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ConstantDef::_nil ();
         }
     }
-  
+
   return ConstantDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ConstantDef_ptr 
+CORBA::ConstantDef_ptr
 CORBA::ConstantDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6050,18 +5642,18 @@ CORBA::ConstantDef::_unchecked_narrow (
     {
       return ConstantDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ConstantDef_ptr default_proxy = ConstantDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -6079,7 +5671,7 @@ CORBA::ConstantDef::_unchecked_narrow (
               ConstantDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -6092,10 +5684,10 @@ CORBA::ConstantDef::_unchecked_narrow (
               ConstantDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ConstantDef_ptr,
@@ -6115,7 +5707,7 @@ CORBA::ConstantDef::_duplicate (ConstantDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -6158,7 +5750,7 @@ CORBA::ConstantDef::_is_a (
 void *CORBA::ConstantDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ConstantDef)::_tao_class_id)
@@ -6205,12 +5797,12 @@ void *CORBA::ConstantDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -6219,6 +5811,12 @@ const char* CORBA::ConstantDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ConstantDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ConstantDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -6229,10 +5827,10 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -6249,10 +5847,10 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -6270,10 +5868,10 @@ void CORBA::ConstantDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.type_def (
       this,
       type_def
@@ -6291,10 +5889,10 @@ CORBA::Any * CORBA::ConstantDef::value (
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.value (
       this
       ACE_ENV_ARG_PARAMETER
@@ -6312,10 +5910,10 @@ void CORBA::ConstantDef::value (
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
+  _TAO_ConstantDef_Proxy_Impl &proxy =
     this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.value (
       this,
       value
@@ -6330,18 +5928,18 @@ static const CORBA::Long _oc_CORBA_ConstantDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e737461), 
-  ACE_NTOHL (0x6e744465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e737461),
+  ACE_NTOHL (0x6e744465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDef:1.0
     12,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x74616e74), 
+  ACE_NTOHL (0x436f6e73),
+  ACE_NTOHL (0x74616e74),
   ACE_NTOHL (0x44656600),  // name = ConstantDef
   };
 
@@ -6369,45 +5967,45 @@ static const CORBA::Long _oc_CORBA_ConstantDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e737461), 
-  ACE_NTOHL (0x6e744465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e737461),
+  ACE_NTOHL (0x6e744465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ConstantDescription:1.0
     20,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x74616e74), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x436f6e73),
+  ACE_NTOHL (0x74616e74),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = ConstantDescription
   6, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -6416,59 +6014,59 @@ static const CORBA::Long _oc_CORBA_ConstantDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
     CORBA::tk_any,
 
@@ -6491,7 +6089,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ConstantDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -6501,12 +6099,43 @@ void CORBA::ConstantDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ConstantDescription
+    >;
+
+template class
+  TAO_Out_T<
+      ConstantDescription,
+      ConstantDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ConstantDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ConstantDescription, \
+      ConstantDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::StructDef::_tao_class_id = 0;
 
 CORBA::StructDef_ptr
-tao_CORBA_StructDef_duplicate (
+CORBA::tao_StructDef_life::tao_duplicate (
     CORBA::StructDef_ptr p
   )
 {
@@ -6514,7 +6143,7 @@ tao_CORBA_StructDef_duplicate (
 }
 
 void
-tao_CORBA_StructDef_release (
+CORBA::tao_StructDef_life::tao_release (
     CORBA::StructDef_ptr p
   )
 {
@@ -6522,228 +6151,64 @@ tao_CORBA_StructDef_release (
 }
 
 CORBA::StructDef_ptr
-tao_CORBA_StructDef_nil (
+CORBA::tao_StructDef_life::tao_nil (
     void
   )
 {
   return CORBA::StructDef::_nil ();
 }
 
-CORBA::StructDef_ptr
-tao_CORBA_StructDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::StructDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_StructDef_upcast (
-    void *src
-  )
-{
-  CORBA::StructDef **tmp =
-    ACE_static_cast (CORBA::StructDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_StructDef_marshal (
+CORBA::tao_StructDef_life::tao_marshal (
     CORBA::StructDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::StructDef_var
-// *************************************************************
-
-CORBA::StructDef_var::StructDef_var (void)
-  : ptr_ (StructDef::_nil ())
-{}
-
-::CORBA::StructDef_ptr
-CORBA::StructDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::StructDef_var::StructDef_var (const ::CORBA::StructDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (StructDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::StructDef_var::~StructDef_var (void)
-{
-  CORBA::release (this->ptr_);
+  return p->marshal (cdr);
 }
 
-CORBA::StructDef_var &
-CORBA::StructDef_var::operator= (StructDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::StructDef_var &
-CORBA::StructDef_var::operator= (const ::CORBA::StructDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::StructDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::StructDef_var::operator const ::CORBA::StructDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::StructDef_var::operator ::CORBA::StructDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::StructDef_ptr
-CORBA::StructDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::StructDef_ptr
-CORBA::StructDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::StructDef_ptr &
-CORBA::StructDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::StructDef_ptr &
-CORBA::StructDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::StructDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::StructDef_ptr
-CORBA::StructDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::StructDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::StructDef::_nil ();
-  return val;
-}
-
-::CORBA::StructDef_ptr
-CORBA::StructDef_var::tao_duplicate (StructDef_ptr p)
-{
-  return ::CORBA::StructDef::_duplicate (p);
-}
-
-void
-CORBA::StructDef_var::tao_release (StructDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::StructDef_ptr
-CORBA::StructDef_var::tao_nil (void)
-{
-  return ::CORBA::StructDef::_nil ();
-}
-
-::CORBA::StructDef_ptr
-CORBA::StructDef_var::tao_narrow (
+CORBA::StructDef_ptr
+CORBA::tao_StructDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::StructDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::StructDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::StructDef_var::tao_upcast (void *src)
+CORBA::tao_StructDef_cast::tao_upcast (
+    void *src
+  )
 {
-  StructDef **tmp =
-    ACE_static_cast (StructDef **, src);
+  CORBA::StructDef **tmp =
+    ACE_static_cast (CORBA::StructDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::StructDef_out
-// *************************************************************
-
-CORBA::StructDef_out::StructDef_out (StructDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::StructDef::_nil ();
-}
-
-CORBA::StructDef_out::StructDef_out (StructDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::StructDef::_nil ();
-}
-
-CORBA::StructDef_out::StructDef_out (const ::CORBA::StructDef_out &p)
-  : ptr_ (ACE_const_cast (StructDef_out &, p).ptr_)
-{}
-
-::CORBA::StructDef_out &
-CORBA::StructDef_out::operator= (const ::CORBA::StructDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (StructDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::StructDef_out &
-CORBA::StructDef_out::operator= (const ::CORBA::StructDef_var &p)
-{
-  this->ptr_ = ::CORBA::StructDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::StructDef_out &
-CORBA::StructDef_out::operator= (StructDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::StructDef_out::operator ::CORBA::StructDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::StructDef_ptr &
-CORBA::StructDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::StructDef_ptr
-CORBA::StructDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::StructDef,
+        CORBA::tao_StructDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::StructDef,
+        CORBA::tao_StructDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::StructDef, \
+        CORBA::tao_StructDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::StructDef, \
+        CORBA::tao_StructDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -6763,29 +6228,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::StructMemberSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_StructDef_members_get (const TAO_ClientRequestInfo_CORBA_StructDef_members_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_StructDef_members_get &);
-    
+
     ::CORBA::StructMemberSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_StructDef_members_get::TAO_ClientRequestInfo_CORBA_StructDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -6798,7 +6263,7 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -6810,11 +6275,11 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6823,17 +6288,17 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (::CORBA::StructMemberSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -6851,10 +6316,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6863,15 +6328,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_StructDef_members_set &);
     const CORBA::StructMemberSeq & members_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_StructDef_members_set::TAO_ClientRequestInfo_CORBA_StructDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       members_ (members)
@@ -6885,15 +6350,15 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -6905,11 +6370,11 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6918,7 +6383,7 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -6930,7 +6395,7 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DE
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_StructDef_Proxy_Impl::_TAO_StructDef_Proxy_Impl (void)
@@ -6954,18 +6419,18 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
 {
   CORBA::StructMemberSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::StructMemberSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::StructMemberSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_members",
@@ -6973,22 +6438,22 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StructDef_members_get _tao_ri (
           &_tao_call,
@@ -6996,14 +6461,14 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7011,78 +6476,85 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::StructMemberSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::StructMemberSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -7092,59 +6564,57 @@ CORBA::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -7160,12 +6630,12 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_members",
@@ -7173,22 +6643,22 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StructDef_members_set _tao_ri (
           &_tao_call,
@@ -7197,14 +6667,14 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7212,70 +6682,76 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << members)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << members)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7285,61 +6761,59 @@ void CORBA::_TAO_StructDef_Remote_Proxy_Impl::members (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -7390,8 +6864,8 @@ CORBA::_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::StructDef::StructDef (int collocated)
 {
@@ -7407,7 +6881,7 @@ CORBA::StructDef::CORBA_StructDef_setup_collocation (int collocated)
   else
     this->the_TAO_StructDef_Proxy_Broker_ =
       ::CORBA::_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
   this->CORBA_Container_setup_collocation (collocated);
 }
@@ -7415,7 +6889,7 @@ CORBA::StructDef::CORBA_StructDef_setup_collocation (int collocated)
 CORBA::StructDef::~StructDef (void)
 {}
 
-void 
+void
 CORBA::StructDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StructDef *tmp = ACE_static_cast (StructDef *, _tao_void_pointer);
@@ -7432,7 +6906,7 @@ CORBA::StructDef::_narrow (
     {
       return StructDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -7441,17 +6915,17 @@ CORBA::StructDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (StructDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return StructDef::_nil ();
         }
     }
-  
+
   return StructDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::StructDef_ptr 
+CORBA::StructDef_ptr
 CORBA::StructDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -7461,18 +6935,18 @@ CORBA::StructDef::_unchecked_narrow (
     {
       return StructDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       StructDef_ptr default_proxy = StructDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -7490,7 +6964,7 @@ CORBA::StructDef::_unchecked_narrow (
               StructDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -7503,10 +6977,10 @@ CORBA::StructDef::_unchecked_narrow (
               StructDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           StructDef_ptr,
@@ -7526,7 +7000,7 @@ CORBA::StructDef::_duplicate (StructDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -7581,7 +7055,7 @@ CORBA::StructDef::_is_a (
 void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, StructDef)::_tao_class_id)
@@ -7670,12 +7144,12 @@ void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -7684,6 +7158,12 @@ const char* CORBA::StructDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/StructDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::StructDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -7694,10 +7174,10 @@ const char* CORBA::StructDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_StructDef_Proxy_Impl &proxy = 
+  _TAO_StructDef_Proxy_Impl &proxy =
     this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.members (
       this
       ACE_ENV_ARG_PARAMETER
@@ -7715,10 +7195,10 @@ void CORBA::StructDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_StructDef_Proxy_Impl &proxy = 
+  _TAO_StructDef_Proxy_Impl &proxy =
     this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.members (
       this,
       members
@@ -7733,17 +7213,17 @@ static const CORBA::Long _oc_CORBA_StructDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5374), 
-  ACE_NTOHL (0x72756374), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5374),
+  ACE_NTOHL (0x72756374),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StructDef:1.0
     10,
-  ACE_NTOHL (0x53747275), 
-  ACE_NTOHL (0x63744465), 
+  ACE_NTOHL (0x53747275),
+  ACE_NTOHL (0x63744465),
   ACE_NTOHL (0x66000000),  // name = StructDef
   };
 
@@ -7770,7 +7250,7 @@ TAO_NAMESPACE_END
 int CORBA::UnionDef::_tao_class_id = 0;
 
 CORBA::UnionDef_ptr
-tao_CORBA_UnionDef_duplicate (
+CORBA::tao_UnionDef_life::tao_duplicate (
     CORBA::UnionDef_ptr p
   )
 {
@@ -7778,7 +7258,7 @@ tao_CORBA_UnionDef_duplicate (
 }
 
 void
-tao_CORBA_UnionDef_release (
+CORBA::tao_UnionDef_life::tao_release (
     CORBA::UnionDef_ptr p
   )
 {
@@ -7786,228 +7266,64 @@ tao_CORBA_UnionDef_release (
 }
 
 CORBA::UnionDef_ptr
-tao_CORBA_UnionDef_nil (
+CORBA::tao_UnionDef_life::tao_nil (
     void
   )
 {
   return CORBA::UnionDef::_nil ();
 }
 
-CORBA::UnionDef_ptr
-tao_CORBA_UnionDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::UnionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_UnionDef_upcast (
-    void *src
-  )
-{
-  CORBA::UnionDef **tmp =
-    ACE_static_cast (CORBA::UnionDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_UnionDef_marshal (
+CORBA::tao_UnionDef_life::tao_marshal (
     CORBA::UnionDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::UnionDef_var
-// *************************************************************
-
-CORBA::UnionDef_var::UnionDef_var (void)
-  : ptr_ (UnionDef::_nil ())
-{}
-
-::CORBA::UnionDef_ptr
-CORBA::UnionDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::UnionDef_var::UnionDef_var (const ::CORBA::UnionDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (UnionDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::UnionDef_var::~UnionDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::UnionDef_var &
-CORBA::UnionDef_var::operator= (UnionDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::UnionDef_var &
-CORBA::UnionDef_var::operator= (const ::CORBA::UnionDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::UnionDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::UnionDef_var::operator const ::CORBA::UnionDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::UnionDef_var::operator ::CORBA::UnionDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::UnionDef_ptr
-CORBA::UnionDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::UnionDef_ptr
-CORBA::UnionDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::UnionDef_ptr &
-CORBA::UnionDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::UnionDef_ptr &
-CORBA::UnionDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::UnionDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::UnionDef_ptr
-CORBA::UnionDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::UnionDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::UnionDef::_nil ();
-  return val;
+  return p->marshal (cdr);
 }
 
-::CORBA::UnionDef_ptr
-CORBA::UnionDef_var::tao_duplicate (UnionDef_ptr p)
-{
-  return ::CORBA::UnionDef::_duplicate (p);
-}
-
-void
-CORBA::UnionDef_var::tao_release (UnionDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::UnionDef_ptr
-CORBA::UnionDef_var::tao_nil (void)
-{
-  return ::CORBA::UnionDef::_nil ();
-}
-
-::CORBA::UnionDef_ptr
-CORBA::UnionDef_var::tao_narrow (
+CORBA::UnionDef_ptr
+CORBA::tao_UnionDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::UnionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::UnionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::UnionDef_var::tao_upcast (void *src)
+CORBA::tao_UnionDef_cast::tao_upcast (
+    void *src
+  )
 {
-  UnionDef **tmp =
-    ACE_static_cast (UnionDef **, src);
+  CORBA::UnionDef **tmp =
+    ACE_static_cast (CORBA::UnionDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::UnionDef_out
-// *************************************************************
-
-CORBA::UnionDef_out::UnionDef_out (UnionDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::UnionDef::_nil ();
-}
-
-CORBA::UnionDef_out::UnionDef_out (UnionDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::UnionDef::_nil ();
-}
-
-CORBA::UnionDef_out::UnionDef_out (const ::CORBA::UnionDef_out &p)
-  : ptr_ (ACE_const_cast (UnionDef_out &, p).ptr_)
-{}
-
-::CORBA::UnionDef_out &
-CORBA::UnionDef_out::operator= (const ::CORBA::UnionDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (UnionDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::UnionDef_out &
-CORBA::UnionDef_out::operator= (const ::CORBA::UnionDef_var &p)
-{
-  this->ptr_ = ::CORBA::UnionDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::UnionDef_out &
-CORBA::UnionDef_out::operator= (UnionDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::UnionDef_out::operator ::CORBA::UnionDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::UnionDef_ptr &
-CORBA::UnionDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::UnionDef_ptr
-CORBA::UnionDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::UnionDef,
+        CORBA::tao_UnionDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::UnionDef,
+        CORBA::tao_UnionDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::UnionDef, \
+        CORBA::tao_UnionDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::UnionDef, \
+        CORBA::tao_UnionDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -8027,29 +7343,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get &);
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -8062,7 +7378,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (ACE_ENV_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -8074,11 +7390,11 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (ACE_ENV
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8087,17 +7403,17 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (ACE_ENV_SIN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -8114,29 +7430,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -8149,7 +7465,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -8161,11 +7477,11 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8174,17 +7490,17 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (ACE_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -8202,10 +7518,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -8214,15 +7530,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set &);
     CORBA::IDLType_ptr discriminator_type_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr discriminator_type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       discriminator_type_def_ (discriminator_type_def)
@@ -8236,15 +7552,15 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->discriminator_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -8256,11 +7572,11 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8269,7 +7585,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (ACE_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -8288,29 +7604,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::UnionMemberSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_UnionDef_members_get (const TAO_ClientRequestInfo_CORBA_UnionDef_members_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_members_get &);
-    
+
     ::CORBA::UnionMemberSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_UnionDef_members_get::TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -8323,7 +7639,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -8335,11 +7651,11 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8348,17 +7664,17 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (ACE_ENV_SINGLE_ARG_DEC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (::CORBA::UnionMemberSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -8376,10 +7692,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -8388,15 +7704,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_members_set &);
     const CORBA::UnionMemberSeq & members_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_UnionDef_members_set::TAO_ClientRequestInfo_CORBA_UnionDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::UnionMemberSeq & members
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       members_ (members)
@@ -8410,15 +7726,15 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -8430,11 +7746,11 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -8443,7 +7759,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DEC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -8455,7 +7771,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DEC
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_UnionDef_Proxy_Impl::_TAO_UnionDef_Proxy_Impl (void)
@@ -8479,12 +7795,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_discriminator_type",
@@ -8492,22 +7808,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get _tao_ri (
           &_tao_call,
@@ -8515,14 +7831,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8530,78 +7846,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -8611,59 +7934,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -8679,12 +8000,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_discriminator_type_def",
@@ -8692,22 +8013,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get _tao_ri (
           &_tao_call,
@@ -8715,14 +8036,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8730,78 +8051,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -8811,59 +8139,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -8879,12 +8205,12 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_discriminator_type_def",
@@ -8892,22 +8218,22 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set _tao_ri (
           &_tao_call,
@@ -8916,14 +8242,14 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8931,70 +8257,76 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << discriminator_type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << discriminator_type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -9004,56 +8336,54 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -9070,18 +8400,18 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
 {
   CORBA::UnionMemberSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::UnionMemberSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::UnionMemberSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_members",
@@ -9089,22 +8419,22 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_members_get _tao_ri (
           &_tao_call,
@@ -9112,14 +8442,14 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9127,78 +8457,85 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::UnionMemberSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::UnionMemberSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -9208,59 +8545,57 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -9276,12 +8611,12 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_members",
@@ -9289,22 +8624,22 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_members_set _tao_ri (
           &_tao_call,
@@ -9313,14 +8648,14 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9328,70 +8663,76 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << members)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << members)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -9401,61 +8742,59 @@ void CORBA::_TAO_UnionDef_Remote_Proxy_Impl::members (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -9506,8 +8845,8 @@ CORBA::_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::UnionDef::UnionDef (int collocated)
 {
@@ -9523,7 +8862,7 @@ CORBA::UnionDef::CORBA_UnionDef_setup_collocation (int collocated)
   else
     this->the_TAO_UnionDef_Proxy_Broker_ =
       ::CORBA::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
   this->CORBA_Container_setup_collocation (collocated);
 }
@@ -9531,7 +8870,7 @@ CORBA::UnionDef::CORBA_UnionDef_setup_collocation (int collocated)
 CORBA::UnionDef::~UnionDef (void)
 {}
 
-void 
+void
 CORBA::UnionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnionDef *tmp = ACE_static_cast (UnionDef *, _tao_void_pointer);
@@ -9548,7 +8887,7 @@ CORBA::UnionDef::_narrow (
     {
       return UnionDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -9557,17 +8896,17 @@ CORBA::UnionDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (UnionDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return UnionDef::_nil ();
         }
     }
-  
+
   return UnionDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::UnionDef_ptr 
+CORBA::UnionDef_ptr
 CORBA::UnionDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -9577,18 +8916,18 @@ CORBA::UnionDef::_unchecked_narrow (
     {
       return UnionDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       UnionDef_ptr default_proxy = UnionDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -9606,7 +8945,7 @@ CORBA::UnionDef::_unchecked_narrow (
               UnionDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -9619,10 +8958,10 @@ CORBA::UnionDef::_unchecked_narrow (
               UnionDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           UnionDef_ptr,
@@ -9642,7 +8981,7 @@ CORBA::UnionDef::_duplicate (UnionDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -9697,7 +9036,7 @@ CORBA::UnionDef::_is_a (
 void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, UnionDef)::_tao_class_id)
@@ -9786,12 +9125,12 @@ void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -9800,6 +9139,12 @@ const char* CORBA::UnionDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/UnionDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::UnionDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -9810,10 +9155,10 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
+  _TAO_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.discriminator_type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -9830,10 +9175,10 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
+  _TAO_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.discriminator_type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -9851,10 +9196,10 @@ void CORBA::UnionDef::discriminator_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
+  _TAO_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.discriminator_type_def (
       this,
       discriminator_type_def
@@ -9872,10 +9217,10 @@ void CORBA::UnionDef::discriminator_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
+  _TAO_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.members (
       this
       ACE_ENV_ARG_PARAMETER
@@ -9893,10 +9238,10 @@ void CORBA::UnionDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
+  _TAO_UnionDef_Proxy_Impl &proxy =
     this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.members (
       this,
       members
@@ -9911,17 +9256,17 @@ static const CORBA::Long _oc_CORBA_UnionDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f556e), 
-  ACE_NTOHL (0x696f6e44), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f556e),
+  ACE_NTOHL (0x696f6e44),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/UnionDef:1.0
     9,
-  ACE_NTOHL (0x556e696f), 
-  ACE_NTOHL (0x6e446566), 
+  ACE_NTOHL (0x556e696f),
+  ACE_NTOHL (0x6e446566),
   ACE_NTOHL (0x0),  // name = UnionDef
   };
 
@@ -9948,7 +9293,7 @@ TAO_NAMESPACE_END
 int CORBA::EnumDef::_tao_class_id = 0;
 
 CORBA::EnumDef_ptr
-tao_CORBA_EnumDef_duplicate (
+CORBA::tao_EnumDef_life::tao_duplicate (
     CORBA::EnumDef_ptr p
   )
 {
@@ -9956,7 +9301,7 @@ tao_CORBA_EnumDef_duplicate (
 }
 
 void
-tao_CORBA_EnumDef_release (
+CORBA::tao_EnumDef_life::tao_release (
     CORBA::EnumDef_ptr p
   )
 {
@@ -9964,228 +9309,64 @@ tao_CORBA_EnumDef_release (
 }
 
 CORBA::EnumDef_ptr
-tao_CORBA_EnumDef_nil (
+CORBA::tao_EnumDef_life::tao_nil (
     void
   )
 {
   return CORBA::EnumDef::_nil ();
 }
 
-CORBA::EnumDef_ptr
-tao_CORBA_EnumDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::EnumDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_EnumDef_upcast (
-    void *src
-  )
-{
-  CORBA::EnumDef **tmp =
-    ACE_static_cast (CORBA::EnumDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_EnumDef_marshal (
+CORBA::tao_EnumDef_life::tao_marshal (
     CORBA::EnumDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::EnumDef_var
-// *************************************************************
-
-CORBA::EnumDef_var::EnumDef_var (void)
-  : ptr_ (EnumDef::_nil ())
-{}
-
-::CORBA::EnumDef_ptr
-CORBA::EnumDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::EnumDef_var::EnumDef_var (const ::CORBA::EnumDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (EnumDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::EnumDef_var::~EnumDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::EnumDef_var &
-CORBA::EnumDef_var::operator= (EnumDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::EnumDef_var &
-CORBA::EnumDef_var::operator= (const ::CORBA::EnumDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::EnumDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::EnumDef_var::operator const ::CORBA::EnumDef_ptr &() const // cast
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-CORBA::EnumDef_var::operator ::CORBA::EnumDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::EnumDef_ptr
-CORBA::EnumDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::EnumDef_ptr
-CORBA::EnumDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::EnumDef_ptr &
-CORBA::EnumDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::EnumDef_ptr &
-CORBA::EnumDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::EnumDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::EnumDef_ptr
-CORBA::EnumDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::EnumDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::EnumDef::_nil ();
-  return val;
-}
-
-::CORBA::EnumDef_ptr
-CORBA::EnumDef_var::tao_duplicate (EnumDef_ptr p)
-{
-  return ::CORBA::EnumDef::_duplicate (p);
-}
-
-void
-CORBA::EnumDef_var::tao_release (EnumDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::EnumDef_ptr
-CORBA::EnumDef_var::tao_nil (void)
-{
-  return ::CORBA::EnumDef::_nil ();
-}
-
-::CORBA::EnumDef_ptr
-CORBA::EnumDef_var::tao_narrow (
+CORBA::EnumDef_ptr
+CORBA::tao_EnumDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::EnumDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::EnumDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::EnumDef_var::tao_upcast (void *src)
+CORBA::tao_EnumDef_cast::tao_upcast (
+    void *src
+  )
 {
-  EnumDef **tmp =
-    ACE_static_cast (EnumDef **, src);
+  CORBA::EnumDef **tmp =
+    ACE_static_cast (CORBA::EnumDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::EnumDef_out
-// *************************************************************
-
-CORBA::EnumDef_out::EnumDef_out (EnumDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::EnumDef::_nil ();
-}
-
-CORBA::EnumDef_out::EnumDef_out (EnumDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::EnumDef::_nil ();
-}
-
-CORBA::EnumDef_out::EnumDef_out (const ::CORBA::EnumDef_out &p)
-  : ptr_ (ACE_const_cast (EnumDef_out &, p).ptr_)
-{}
-
-::CORBA::EnumDef_out &
-CORBA::EnumDef_out::operator= (const ::CORBA::EnumDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (EnumDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::EnumDef_out &
-CORBA::EnumDef_out::operator= (const ::CORBA::EnumDef_var &p)
-{
-  this->ptr_ = ::CORBA::EnumDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::EnumDef_out &
-CORBA::EnumDef_out::operator= (EnumDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::EnumDef_out::operator ::CORBA::EnumDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::EnumDef_ptr &
-CORBA::EnumDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::EnumDef_ptr
-CORBA::EnumDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::EnumDef,
+        CORBA::tao_EnumDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::EnumDef,
+        CORBA::tao_EnumDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::EnumDef, \
+        CORBA::tao_EnumDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::EnumDef, \
+        CORBA::tao_EnumDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -10205,29 +9386,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::EnumMemberSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_EnumDef_members_get (const TAO_ClientRequestInfo_CORBA_EnumDef_members_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_EnumDef_members_get &);
-    
+
     ::CORBA::EnumMemberSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_EnumDef_members_get::TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -10240,7 +9421,7 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -10252,11 +9433,11 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10265,17 +9446,17 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (::CORBA::EnumMemberSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -10293,10 +9474,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -10305,15 +9486,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_EnumDef_members_set &);
     const CORBA::EnumMemberSeq & members_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_EnumDef_members_set::TAO_ClientRequestInfo_CORBA_EnumDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::EnumMemberSeq & members
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       members_ (members)
@@ -10327,15 +9508,15 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -10347,11 +9528,11 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -10360,7 +9541,7 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -10372,7 +9553,7 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_EnumDef_Proxy_Impl::_TAO_EnumDef_Proxy_Impl (void)
@@ -10396,18 +9577,18 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
 {
   CORBA::EnumMemberSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::EnumMemberSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::EnumMemberSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_members",
@@ -10415,22 +9596,22 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_EnumDef_members_get _tao_ri (
           &_tao_call,
@@ -10438,14 +9619,14 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -10453,78 +9634,85 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::EnumMemberSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::EnumMemberSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -10534,59 +9722,57 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -10602,12 +9788,12 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_members",
@@ -10615,22 +9801,22 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_EnumDef_members_set _tao_ri (
           &_tao_call,
@@ -10639,14 +9825,14 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -10654,70 +9840,76 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << members)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << members)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -10727,61 +9919,59 @@ void CORBA::_TAO_EnumDef_Remote_Proxy_Impl::members (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -10832,8 +10022,8 @@ CORBA::_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::EnumDef::EnumDef (int collocated)
 {
@@ -10849,14 +10039,14 @@ CORBA::EnumDef::CORBA_EnumDef_setup_collocation (int collocated)
   else
     this->the_TAO_EnumDef_Proxy_Broker_ =
       ::CORBA::_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
 CORBA::EnumDef::~EnumDef (void)
 {}
 
-void 
+void
 CORBA::EnumDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EnumDef *tmp = ACE_static_cast (EnumDef *, _tao_void_pointer);
@@ -10873,7 +10063,7 @@ CORBA::EnumDef::_narrow (
     {
       return EnumDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -10882,17 +10072,17 @@ CORBA::EnumDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (EnumDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return EnumDef::_nil ();
         }
     }
-  
+
   return EnumDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::EnumDef_ptr 
+CORBA::EnumDef_ptr
 CORBA::EnumDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -10902,18 +10092,18 @@ CORBA::EnumDef::_unchecked_narrow (
     {
       return EnumDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       EnumDef_ptr default_proxy = EnumDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -10931,7 +10121,7 @@ CORBA::EnumDef::_unchecked_narrow (
               EnumDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -10944,10 +10134,10 @@ CORBA::EnumDef::_unchecked_narrow (
               EnumDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           EnumDef_ptr,
@@ -10967,7 +10157,7 @@ CORBA::EnumDef::_duplicate (EnumDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -11018,7 +10208,7 @@ CORBA::EnumDef::_is_a (
 void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, EnumDef)::_tao_class_id)
@@ -11093,12 +10283,12 @@ void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -11107,6 +10297,12 @@ const char* CORBA::EnumDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/EnumDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::EnumDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -11117,10 +10313,10 @@ const char* CORBA::EnumDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_EnumDef_Proxy_Impl &proxy = 
+  _TAO_EnumDef_Proxy_Impl &proxy =
     this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.members (
       this
       ACE_ENV_ARG_PARAMETER
@@ -11138,10 +10334,10 @@ void CORBA::EnumDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_EnumDef_Proxy_Impl &proxy = 
+  _TAO_EnumDef_Proxy_Impl &proxy =
     this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.members (
       this,
       members
@@ -11156,16 +10352,16 @@ static const CORBA::Long _oc_CORBA_EnumDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f456e), 
-  ACE_NTOHL (0x756d4465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f456e),
+  ACE_NTOHL (0x756d4465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/EnumDef:1.0
     8,
-  ACE_NTOHL (0x456e756d), 
+  ACE_NTOHL (0x456e756d),
   ACE_NTOHL (0x44656600),  // name = EnumDef
   };
 
@@ -11192,7 +10388,7 @@ TAO_NAMESPACE_END
 int CORBA::AliasDef::_tao_class_id = 0;
 
 CORBA::AliasDef_ptr
-tao_CORBA_AliasDef_duplicate (
+CORBA::tao_AliasDef_life::tao_duplicate (
     CORBA::AliasDef_ptr p
   )
 {
@@ -11200,7 +10396,7 @@ tao_CORBA_AliasDef_duplicate (
 }
 
 void
-tao_CORBA_AliasDef_release (
+CORBA::tao_AliasDef_life::tao_release (
     CORBA::AliasDef_ptr p
   )
 {
@@ -11208,228 +10404,64 @@ tao_CORBA_AliasDef_release (
 }
 
 CORBA::AliasDef_ptr
-tao_CORBA_AliasDef_nil (
+CORBA::tao_AliasDef_life::tao_nil (
     void
   )
 {
   return CORBA::AliasDef::_nil ();
 }
 
-CORBA::AliasDef_ptr
-tao_CORBA_AliasDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::AliasDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_AliasDef_upcast (
-    void *src
-  )
-{
-  CORBA::AliasDef **tmp =
-    ACE_static_cast (CORBA::AliasDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_AliasDef_marshal (
+CORBA::tao_AliasDef_life::tao_marshal (
     CORBA::AliasDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::AliasDef_var
-// *************************************************************
-
-CORBA::AliasDef_var::AliasDef_var (void)
-  : ptr_ (AliasDef::_nil ())
-{}
-
-::CORBA::AliasDef_ptr
-CORBA::AliasDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::AliasDef_var::AliasDef_var (const ::CORBA::AliasDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (AliasDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::AliasDef_var::~AliasDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::AliasDef_var &
-CORBA::AliasDef_var::operator= (AliasDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return p->marshal (cdr);
 }
 
-CORBA::AliasDef_var &
-CORBA::AliasDef_var::operator= (const ::CORBA::AliasDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::AliasDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::AliasDef_var::operator const ::CORBA::AliasDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::AliasDef_var::operator ::CORBA::AliasDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::AliasDef_ptr
-CORBA::AliasDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::AliasDef_ptr
-CORBA::AliasDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::AliasDef_ptr &
-CORBA::AliasDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::AliasDef_ptr &
-CORBA::AliasDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::AliasDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::AliasDef_ptr
-CORBA::AliasDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::AliasDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::AliasDef::_nil ();
-  return val;
-}
-
-::CORBA::AliasDef_ptr
-CORBA::AliasDef_var::tao_duplicate (AliasDef_ptr p)
-{
-  return ::CORBA::AliasDef::_duplicate (p);
-}
-
-void
-CORBA::AliasDef_var::tao_release (AliasDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::AliasDef_ptr
-CORBA::AliasDef_var::tao_nil (void)
-{
-  return ::CORBA::AliasDef::_nil ();
-}
-
-::CORBA::AliasDef_ptr
-CORBA::AliasDef_var::tao_narrow (
+CORBA::AliasDef_ptr
+CORBA::tao_AliasDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::AliasDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::AliasDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::AliasDef_var::tao_upcast (void *src)
+CORBA::tao_AliasDef_cast::tao_upcast (
+    void *src
+  )
 {
-  AliasDef **tmp =
-    ACE_static_cast (AliasDef **, src);
+  CORBA::AliasDef **tmp =
+    ACE_static_cast (CORBA::AliasDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::AliasDef_out
-// *************************************************************
-
-CORBA::AliasDef_out::AliasDef_out (AliasDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::AliasDef::_nil ();
-}
-
-CORBA::AliasDef_out::AliasDef_out (AliasDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::AliasDef::_nil ();
-}
-
-CORBA::AliasDef_out::AliasDef_out (const ::CORBA::AliasDef_out &p)
-  : ptr_ (ACE_const_cast (AliasDef_out &, p).ptr_)
-{}
-
-::CORBA::AliasDef_out &
-CORBA::AliasDef_out::operator= (const ::CORBA::AliasDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (AliasDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::AliasDef_out &
-CORBA::AliasDef_out::operator= (const ::CORBA::AliasDef_var &p)
-{
-  this->ptr_ = ::CORBA::AliasDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::AliasDef_out &
-CORBA::AliasDef_out::operator= (AliasDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::AliasDef_out::operator ::CORBA::AliasDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::AliasDef_ptr &
-CORBA::AliasDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::AliasDef_ptr
-CORBA::AliasDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::AliasDef,
+        CORBA::tao_AliasDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::AliasDef,
+        CORBA::tao_AliasDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::AliasDef, \
+        CORBA::tao_AliasDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::AliasDef, \
+        CORBA::tao_AliasDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -11449,29 +10481,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (const TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -11484,7 +10516,7 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (ACE_ENV_S
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -11496,11 +10528,11 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (ACE_ENV_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11509,17 +10541,17 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (ACE_ENV_SING
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11537,10 +10569,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -11549,15 +10581,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set &);
     CORBA::IDLType_ptr original_type_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       original_type_def_ (original_type_def)
@@ -11571,15 +10603,15 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (ACE_ENV_S
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->original_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11591,11 +10623,11 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (ACE_ENV_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11604,7 +10636,7 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SING
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -11616,7 +10648,7 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SING
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
@@ -11640,12 +10672,12 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_original_type_def",
@@ -11653,22 +10685,22 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get _tao_ri (
           &_tao_call,
@@ -11676,14 +10708,14 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -11691,78 +10723,85 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -11772,59 +10811,57 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -11840,12 +10877,12 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_original_type_def",
@@ -11853,22 +10890,22 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set _tao_ri (
           &_tao_call,
@@ -11877,14 +10914,14 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -11892,70 +10929,76 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << original_type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << original_type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -11965,61 +11008,59 @@ void CORBA::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -12070,8 +11111,8 @@ CORBA::_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::AliasDef::AliasDef (int collocated)
 {
@@ -12087,14 +11128,14 @@ CORBA::AliasDef::CORBA_AliasDef_setup_collocation (int collocated)
   else
     this->the_TAO_AliasDef_Proxy_Broker_ =
       ::CORBA::_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
 CORBA::AliasDef::~AliasDef (void)
 {}
 
-void 
+void
 CORBA::AliasDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AliasDef *tmp = ACE_static_cast (AliasDef *, _tao_void_pointer);
@@ -12111,7 +11152,7 @@ CORBA::AliasDef::_narrow (
     {
       return AliasDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -12120,17 +11161,17 @@ CORBA::AliasDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (AliasDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return AliasDef::_nil ();
         }
     }
-  
+
   return AliasDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::AliasDef_ptr 
+CORBA::AliasDef_ptr
 CORBA::AliasDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -12140,18 +11181,18 @@ CORBA::AliasDef::_unchecked_narrow (
     {
       return AliasDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       AliasDef_ptr default_proxy = AliasDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -12169,7 +11210,7 @@ CORBA::AliasDef::_unchecked_narrow (
               AliasDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -12182,10 +11223,10 @@ CORBA::AliasDef::_unchecked_narrow (
               AliasDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           AliasDef_ptr,
@@ -12205,7 +11246,7 @@ CORBA::AliasDef::_duplicate (AliasDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -12256,7 +11297,7 @@ CORBA::AliasDef::_is_a (
 void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, AliasDef)::_tao_class_id)
@@ -12331,12 +11372,12 @@ void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -12345,6 +11386,12 @@ const char* CORBA::AliasDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/AliasDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::AliasDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -12355,10 +11402,10 @@ const char* CORBA::AliasDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_AliasDef_Proxy_Impl &proxy = 
+  _TAO_AliasDef_Proxy_Impl &proxy =
     this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.original_type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -12376,10 +11423,10 @@ void CORBA::AliasDef::original_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_AliasDef_Proxy_Impl &proxy = 
+  _TAO_AliasDef_Proxy_Impl &proxy =
     this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.original_type_def (
       this,
       original_type_def
@@ -12394,17 +11441,17 @@ static const CORBA::Long _oc_CORBA_AliasDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f416c), 
-  ACE_NTOHL (0x69617344), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f416c),
+  ACE_NTOHL (0x69617344),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AliasDef:1.0
     9,
-  ACE_NTOHL (0x416c6961), 
-  ACE_NTOHL (0x73446566), 
+  ACE_NTOHL (0x416c6961),
+  ACE_NTOHL (0x73446566),
   ACE_NTOHL (0x0),  // name = AliasDef
   };
 
@@ -12431,7 +11478,7 @@ TAO_NAMESPACE_END
 int CORBA::NativeDef::_tao_class_id = 0;
 
 CORBA::NativeDef_ptr
-tao_CORBA_NativeDef_duplicate (
+CORBA::tao_NativeDef_life::tao_duplicate (
     CORBA::NativeDef_ptr p
   )
 {
@@ -12439,7 +11486,7 @@ tao_CORBA_NativeDef_duplicate (
 }
 
 void
-tao_CORBA_NativeDef_release (
+CORBA::tao_NativeDef_life::tao_release (
     CORBA::NativeDef_ptr p
   )
 {
@@ -12447,228 +11494,64 @@ tao_CORBA_NativeDef_release (
 }
 
 CORBA::NativeDef_ptr
-tao_CORBA_NativeDef_nil (
+CORBA::tao_NativeDef_life::tao_nil (
     void
   )
 {
   return CORBA::NativeDef::_nil ();
 }
 
-CORBA::NativeDef_ptr
-tao_CORBA_NativeDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::NativeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_NativeDef_upcast (
-    void *src
-  )
-{
-  CORBA::NativeDef **tmp =
-    ACE_static_cast (CORBA::NativeDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_NativeDef_marshal (
+CORBA::tao_NativeDef_life::tao_marshal (
     CORBA::NativeDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::NativeDef_var
-// *************************************************************
-
-CORBA::NativeDef_var::NativeDef_var (void)
-  : ptr_ (NativeDef::_nil ())
-{}
-
-::CORBA::NativeDef_ptr
-CORBA::NativeDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::NativeDef_var::NativeDef_var (const ::CORBA::NativeDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (NativeDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::NativeDef_var::~NativeDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::NativeDef_var &
-CORBA::NativeDef_var::operator= (NativeDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::NativeDef_var &
-CORBA::NativeDef_var::operator= (const ::CORBA::NativeDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::NativeDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::NativeDef_var::operator const ::CORBA::NativeDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::NativeDef_var::operator ::CORBA::NativeDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::NativeDef_ptr
-CORBA::NativeDef_var::operator-> (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::NativeDef_ptr
-CORBA::NativeDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::NativeDef_ptr &
-CORBA::NativeDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::NativeDef_ptr &
-CORBA::NativeDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::NativeDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::NativeDef_ptr
-CORBA::NativeDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::NativeDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::NativeDef::_nil ();
-  return val;
-}
-
-::CORBA::NativeDef_ptr
-CORBA::NativeDef_var::tao_duplicate (NativeDef_ptr p)
-{
-  return ::CORBA::NativeDef::_duplicate (p);
-}
-
-void
-CORBA::NativeDef_var::tao_release (NativeDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::NativeDef_ptr
-CORBA::NativeDef_var::tao_nil (void)
-{
-  return ::CORBA::NativeDef::_nil ();
-}
-
-::CORBA::NativeDef_ptr
-CORBA::NativeDef_var::tao_narrow (
+CORBA::NativeDef_ptr
+CORBA::tao_NativeDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::NativeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::NativeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::NativeDef_var::tao_upcast (void *src)
+CORBA::tao_NativeDef_cast::tao_upcast (
+    void *src
+  )
 {
-  NativeDef **tmp =
-    ACE_static_cast (NativeDef **, src);
+  CORBA::NativeDef **tmp =
+    ACE_static_cast (CORBA::NativeDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::NativeDef_out
-// *************************************************************
-
-CORBA::NativeDef_out::NativeDef_out (NativeDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::NativeDef::_nil ();
-}
-
-CORBA::NativeDef_out::NativeDef_out (NativeDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::NativeDef::_nil ();
-}
-
-CORBA::NativeDef_out::NativeDef_out (const ::CORBA::NativeDef_out &p)
-  : ptr_ (ACE_const_cast (NativeDef_out &, p).ptr_)
-{}
-
-::CORBA::NativeDef_out &
-CORBA::NativeDef_out::operator= (const ::CORBA::NativeDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (NativeDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::NativeDef_out &
-CORBA::NativeDef_out::operator= (const ::CORBA::NativeDef_var &p)
-{
-  this->ptr_ = ::CORBA::NativeDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::NativeDef_out &
-CORBA::NativeDef_out::operator= (NativeDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::NativeDef_out::operator ::CORBA::NativeDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::NativeDef_ptr &
-CORBA::NativeDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::NativeDef_ptr
-CORBA::NativeDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::NativeDef,
+        CORBA::tao_NativeDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::NativeDef,
+        CORBA::tao_NativeDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::NativeDef, \
+        CORBA::tao_NativeDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::NativeDef, \
+        CORBA::tao_NativeDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -12681,7 +11564,7 @@ CORBA::NativeDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
@@ -12693,7 +11576,7 @@ CORBA::_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -12744,8 +11627,8 @@ CORBA::_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::NativeDef::NativeDef (int collocated)
 {
@@ -12761,14 +11644,14 @@ CORBA::NativeDef::CORBA_NativeDef_setup_collocation (int collocated)
   else
     this->the_TAO_NativeDef_Proxy_Broker_ =
       ::CORBA::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
 CORBA::NativeDef::~NativeDef (void)
 {}
 
-void 
+void
 CORBA::NativeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   NativeDef *tmp = ACE_static_cast (NativeDef *, _tao_void_pointer);
@@ -12785,7 +11668,7 @@ CORBA::NativeDef::_narrow (
     {
       return NativeDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -12794,17 +11677,17 @@ CORBA::NativeDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (NativeDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return NativeDef::_nil ();
         }
     }
-  
+
   return NativeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::NativeDef_ptr 
+CORBA::NativeDef_ptr
 CORBA::NativeDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -12814,18 +11697,18 @@ CORBA::NativeDef::_unchecked_narrow (
     {
       return NativeDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       NativeDef_ptr default_proxy = NativeDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -12843,7 +11726,7 @@ CORBA::NativeDef::_unchecked_narrow (
               NativeDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -12856,10 +11739,10 @@ CORBA::NativeDef::_unchecked_narrow (
               NativeDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           NativeDef_ptr,
@@ -12879,7 +11762,7 @@ CORBA::NativeDef::_duplicate (NativeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -12930,7 +11813,7 @@ CORBA::NativeDef::_is_a (
 void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, NativeDef)::_tao_class_id)
@@ -13005,12 +11888,12 @@ void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -13019,6 +11902,12 @@ const char* CORBA::NativeDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/NativeDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::NativeDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -13026,17 +11915,17 @@ static const CORBA::Long _oc_CORBA_NativeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4e61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4e61),
+  ACE_NTOHL (0x74697665),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/NativeDef:1.0
     10,
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76654465), 
+  ACE_NTOHL (0x4e617469),
+  ACE_NTOHL (0x76654465),
   ACE_NTOHL (0x66000000),  // name = NativeDef
   };
 
@@ -13063,7 +11952,7 @@ TAO_NAMESPACE_END
 int CORBA::PrimitiveDef::_tao_class_id = 0;
 
 CORBA::PrimitiveDef_ptr
-tao_CORBA_PrimitiveDef_duplicate (
+CORBA::tao_PrimitiveDef_life::tao_duplicate (
     CORBA::PrimitiveDef_ptr p
   )
 {
@@ -13071,7 +11960,7 @@ tao_CORBA_PrimitiveDef_duplicate (
 }
 
 void
-tao_CORBA_PrimitiveDef_release (
+CORBA::tao_PrimitiveDef_life::tao_release (
     CORBA::PrimitiveDef_ptr p
   )
 {
@@ -13079,228 +11968,64 @@ tao_CORBA_PrimitiveDef_release (
 }
 
 CORBA::PrimitiveDef_ptr
-tao_CORBA_PrimitiveDef_nil (
+CORBA::tao_PrimitiveDef_life::tao_nil (
     void
   )
 {
   return CORBA::PrimitiveDef::_nil ();
 }
 
-CORBA::PrimitiveDef_ptr
-tao_CORBA_PrimitiveDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::PrimitiveDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_PrimitiveDef_upcast (
-    void *src
-  )
-{
-  CORBA::PrimitiveDef **tmp =
-    ACE_static_cast (CORBA::PrimitiveDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_PrimitiveDef_marshal (
+CORBA::tao_PrimitiveDef_life::tao_marshal (
     CORBA::PrimitiveDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::PrimitiveDef_var
-// *************************************************************
-
-CORBA::PrimitiveDef_var::PrimitiveDef_var (void)
-  : ptr_ (PrimitiveDef::_nil ())
-{}
-
-::CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::PrimitiveDef_var::PrimitiveDef_var (const ::CORBA::PrimitiveDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (PrimitiveDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::PrimitiveDef_var::~PrimitiveDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::PrimitiveDef_var &
-CORBA::PrimitiveDef_var::operator= (PrimitiveDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::PrimitiveDef_var &
-CORBA::PrimitiveDef_var::operator= (const ::CORBA::PrimitiveDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::PrimitiveDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::PrimitiveDef_var::operator const ::CORBA::PrimitiveDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::PrimitiveDef_var::operator ::CORBA::PrimitiveDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::PrimitiveDef_ptr &
-CORBA::PrimitiveDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::PrimitiveDef_ptr &
-CORBA::PrimitiveDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::PrimitiveDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::PrimitiveDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::PrimitiveDef::_nil ();
-  return val;
-}
-
-::CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_var::tao_duplicate (PrimitiveDef_ptr p)
-{
-  return ::CORBA::PrimitiveDef::_duplicate (p);
+  return p->marshal (cdr);
 }
 
-void
-CORBA::PrimitiveDef_var::tao_release (PrimitiveDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_var::tao_nil (void)
-{
-  return ::CORBA::PrimitiveDef::_nil ();
-}
-
-::CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_var::tao_narrow (
+CORBA::PrimitiveDef_ptr
+CORBA::tao_PrimitiveDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::PrimitiveDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::PrimitiveDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::PrimitiveDef_var::tao_upcast (void *src)
+CORBA::tao_PrimitiveDef_cast::tao_upcast (
+    void *src
+  )
 {
-  PrimitiveDef **tmp =
-    ACE_static_cast (PrimitiveDef **, src);
+  CORBA::PrimitiveDef **tmp =
+    ACE_static_cast (CORBA::PrimitiveDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::PrimitiveDef_out
-// *************************************************************
-
-CORBA::PrimitiveDef_out::PrimitiveDef_out (PrimitiveDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::PrimitiveDef::_nil ();
-}
-
-CORBA::PrimitiveDef_out::PrimitiveDef_out (PrimitiveDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::PrimitiveDef::_nil ();
-}
-
-CORBA::PrimitiveDef_out::PrimitiveDef_out (const ::CORBA::PrimitiveDef_out &p)
-  : ptr_ (ACE_const_cast (PrimitiveDef_out &, p).ptr_)
-{}
-
-::CORBA::PrimitiveDef_out &
-CORBA::PrimitiveDef_out::operator= (const ::CORBA::PrimitiveDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (PrimitiveDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::PrimitiveDef_out &
-CORBA::PrimitiveDef_out::operator= (const ::CORBA::PrimitiveDef_var &p)
-{
-  this->ptr_ = ::CORBA::PrimitiveDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::PrimitiveDef_out &
-CORBA::PrimitiveDef_out::operator= (PrimitiveDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::PrimitiveDef_out::operator ::CORBA::PrimitiveDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::PrimitiveDef_ptr &
-CORBA::PrimitiveDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::PrimitiveDef,
+        CORBA::tao_PrimitiveDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::PrimitiveDef,
+        CORBA::tao_PrimitiveDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::PrimitiveDef, \
+        CORBA::tao_PrimitiveDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::PrimitiveDef, \
+        CORBA::tao_PrimitiveDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -13320,29 +12045,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::PrimitiveKind result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (const TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get &);
-    
+
     ::CORBA::PrimitiveKind _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -13355,7 +12080,7 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -13367,11 +12092,11 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -13380,17 +12105,17 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (::CORBA::PrimitiveKind result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -13400,7 +12125,7 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (::CORBA::PrimitiveKin
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_Proxy_Impl (void)
@@ -13424,12 +12149,12 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
 {
   CORBA::PrimitiveKind _tao_retval = (CORBA::PrimitiveKind)0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_kind",
@@ -13437,22 +12162,22 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get _tao_ri (
           &_tao_call,
@@ -13460,14 +12185,14 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13475,77 +12200,84 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::PrimitiveKind _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::PrimitiveKind _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -13555,63 +12287,61 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -13662,8 +12392,8 @@ CORBA::_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::PrimitiveDef::PrimitiveDef (int collocated)
 {
@@ -13679,14 +12409,14 @@ CORBA::PrimitiveDef::CORBA_PrimitiveDef_setup_collocation (int collocated)
   else
     this->the_TAO_PrimitiveDef_Proxy_Broker_ =
       ::CORBA::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
 CORBA::PrimitiveDef::~PrimitiveDef (void)
 {}
 
-void 
+void
 CORBA::PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrimitiveDef *tmp = ACE_static_cast (PrimitiveDef *, _tao_void_pointer);
@@ -13703,7 +12433,7 @@ CORBA::PrimitiveDef::_narrow (
     {
       return PrimitiveDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -13712,17 +12442,17 @@ CORBA::PrimitiveDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (PrimitiveDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return PrimitiveDef::_nil ();
         }
     }
-  
+
   return PrimitiveDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::PrimitiveDef_ptr 
+CORBA::PrimitiveDef_ptr
 CORBA::PrimitiveDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -13732,18 +12462,18 @@ CORBA::PrimitiveDef::_unchecked_narrow (
     {
       return PrimitiveDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       PrimitiveDef_ptr default_proxy = PrimitiveDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -13761,7 +12491,7 @@ CORBA::PrimitiveDef::_unchecked_narrow (
               PrimitiveDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -13774,10 +12504,10 @@ CORBA::PrimitiveDef::_unchecked_narrow (
               PrimitiveDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           PrimitiveDef_ptr,
@@ -13797,7 +12527,7 @@ CORBA::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -13840,7 +12570,7 @@ CORBA::PrimitiveDef::_is_a (
 void *CORBA::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, PrimitiveDef)::_tao_class_id)
@@ -13887,12 +12617,12 @@ void *CORBA::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -13901,6 +12631,12 @@ const char* CORBA::PrimitiveDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -13911,10 +12647,10 @@ const char* CORBA::PrimitiveDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_PrimitiveDef_Proxy_Impl &proxy = 
+  _TAO_PrimitiveDef_Proxy_Impl &proxy =
     this->the_TAO_PrimitiveDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::PrimitiveKind)0);
-  
+
   return proxy.kind (
       this
       ACE_ENV_ARG_PARAMETER
@@ -13928,19 +12664,19 @@ static const CORBA::Long _oc_CORBA_PrimitiveDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5072), 
-  ACE_NTOHL (0x696d6974), 
-  ACE_NTOHL (0x69766544), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5072),
+  ACE_NTOHL (0x696d6974),
+  ACE_NTOHL (0x69766544),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/PrimitiveDef:1.0
     13,
-  ACE_NTOHL (0x5072696d), 
-  ACE_NTOHL (0x69746976), 
-  ACE_NTOHL (0x65446566), 
+  ACE_NTOHL (0x5072696d),
+  ACE_NTOHL (0x69746976),
+  ACE_NTOHL (0x65446566),
   ACE_NTOHL (0x0),  // name = PrimitiveDef
   };
 
@@ -13967,7 +12703,7 @@ TAO_NAMESPACE_END
 int CORBA::StringDef::_tao_class_id = 0;
 
 CORBA::StringDef_ptr
-tao_CORBA_StringDef_duplicate (
+CORBA::tao_StringDef_life::tao_duplicate (
     CORBA::StringDef_ptr p
   )
 {
@@ -13975,7 +12711,7 @@ tao_CORBA_StringDef_duplicate (
 }
 
 void
-tao_CORBA_StringDef_release (
+CORBA::tao_StringDef_life::tao_release (
     CORBA::StringDef_ptr p
   )
 {
@@ -13983,228 +12719,64 @@ tao_CORBA_StringDef_release (
 }
 
 CORBA::StringDef_ptr
-tao_CORBA_StringDef_nil (
+CORBA::tao_StringDef_life::tao_nil (
     void
   )
 {
   return CORBA::StringDef::_nil ();
 }
 
-CORBA::StringDef_ptr
-tao_CORBA_StringDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::StringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_StringDef_upcast (
-    void *src
-  )
-{
-  CORBA::StringDef **tmp =
-    ACE_static_cast (CORBA::StringDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_StringDef_marshal (
+CORBA::tao_StringDef_life::tao_marshal (
     CORBA::StringDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::StringDef_var
-// *************************************************************
-
-CORBA::StringDef_var::StringDef_var (void)
-  : ptr_ (StringDef::_nil ())
-{}
-
-::CORBA::StringDef_ptr
-CORBA::StringDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::StringDef_var::StringDef_var (const ::CORBA::StringDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (StringDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::StringDef_var::~StringDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::StringDef_var &
-CORBA::StringDef_var::operator= (StringDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return p->marshal (cdr);
 }
 
-CORBA::StringDef_var &
-CORBA::StringDef_var::operator= (const ::CORBA::StringDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::StringDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::StringDef_var::operator const ::CORBA::StringDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::StringDef_var::operator ::CORBA::StringDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::StringDef_ptr
-CORBA::StringDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::StringDef_ptr
-CORBA::StringDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::StringDef_ptr &
-CORBA::StringDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::StringDef_ptr &
-CORBA::StringDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::StringDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::StringDef_ptr
-CORBA::StringDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::StringDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::StringDef::_nil ();
-  return val;
-}
-
-::CORBA::StringDef_ptr
-CORBA::StringDef_var::tao_duplicate (StringDef_ptr p)
-{
-  return ::CORBA::StringDef::_duplicate (p);
-}
-
-void
-CORBA::StringDef_var::tao_release (StringDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::StringDef_ptr
-CORBA::StringDef_var::tao_nil (void)
-{
-  return ::CORBA::StringDef::_nil ();
-}
-
-::CORBA::StringDef_ptr
-CORBA::StringDef_var::tao_narrow (
+CORBA::StringDef_ptr
+CORBA::tao_StringDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::StringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::StringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::StringDef_var::tao_upcast (void *src)
+CORBA::tao_StringDef_cast::tao_upcast (
+    void *src
+  )
 {
-  StringDef **tmp =
-    ACE_static_cast (StringDef **, src);
+  CORBA::StringDef **tmp =
+    ACE_static_cast (CORBA::StringDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::StringDef_out
-// *************************************************************
-
-CORBA::StringDef_out::StringDef_out (StringDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::StringDef::_nil ();
-}
-
-CORBA::StringDef_out::StringDef_out (StringDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::StringDef::_nil ();
-}
-
-CORBA::StringDef_out::StringDef_out (const ::CORBA::StringDef_out &p)
-  : ptr_ (ACE_const_cast (StringDef_out &, p).ptr_)
-{}
-
-::CORBA::StringDef_out &
-CORBA::StringDef_out::operator= (const ::CORBA::StringDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (StringDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::StringDef_out &
-CORBA::StringDef_out::operator= (const ::CORBA::StringDef_var &p)
-{
-  this->ptr_ = ::CORBA::StringDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::StringDef_out &
-CORBA::StringDef_out::operator= (StringDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::StringDef_out::operator ::CORBA::StringDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::StringDef_ptr &
-CORBA::StringDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::StringDef_ptr
-CORBA::StringDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::StringDef,
+        CORBA::tao_StringDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::StringDef,
+        CORBA::tao_StringDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::StringDef, \
+        CORBA::tao_StringDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::StringDef, \
+        CORBA::tao_StringDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -14224,29 +12796,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ULong result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_StringDef_bound_get (const TAO_ClientRequestInfo_CORBA_StringDef_bound_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_StringDef_bound_get &);
-    
+
     ::CORBA::ULong _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_StringDef_bound_get::TAO_ClientRequestInfo_CORBA_StringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -14259,7 +12831,7 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -14271,11 +12843,11 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -14284,17 +12856,17 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (CORBA::ULong result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -14312,10 +12884,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -14324,15 +12896,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_StringDef_bound_set &);
     const CORBA::ULong & bound_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_StringDef_bound_set::TAO_ClientRequestInfo_CORBA_StringDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       bound_ (bound)
@@ -14346,15 +12918,15 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= bound_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -14366,11 +12938,11 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -14379,7 +12951,7 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -14391,7 +12963,7 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_StringDef_Proxy_Impl::_TAO_StringDef_Proxy_Impl (void)
@@ -14415,12 +12987,12 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
 {
   CORBA::ULong _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_bound",
@@ -14428,22 +13000,22 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StringDef_bound_get _tao_ri (
           &_tao_call,
@@ -14451,14 +13023,14 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -14466,77 +13038,84 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::ULong _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::ULong _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -14546,59 +13125,57 @@ CORBA::ULong CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -14614,12 +13191,12 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_bound",
@@ -14627,22 +13204,22 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StringDef_bound_set _tao_ri (
           &_tao_call,
@@ -14651,14 +13228,14 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -14666,70 +13243,76 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << bound)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << bound)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -14739,61 +13322,59 @@ void CORBA::_TAO_StringDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -14844,8 +13425,8 @@ CORBA::_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::StringDef::StringDef (int collocated)
 {
@@ -14861,14 +13442,14 @@ CORBA::StringDef::CORBA_StringDef_setup_collocation (int collocated)
   else
     this->the_TAO_StringDef_Proxy_Broker_ =
       ::CORBA::_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
 CORBA::StringDef::~StringDef (void)
 {}
 
-void 
+void
 CORBA::StringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StringDef *tmp = ACE_static_cast (StringDef *, _tao_void_pointer);
@@ -14885,7 +13466,7 @@ CORBA::StringDef::_narrow (
     {
       return StringDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -14894,17 +13475,17 @@ CORBA::StringDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (StringDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return StringDef::_nil ();
         }
     }
-  
+
   return StringDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::StringDef_ptr 
+CORBA::StringDef_ptr
 CORBA::StringDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -14914,18 +13495,18 @@ CORBA::StringDef::_unchecked_narrow (
     {
       return StringDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       StringDef_ptr default_proxy = StringDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -14943,7 +13524,7 @@ CORBA::StringDef::_unchecked_narrow (
               StringDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -14956,10 +13537,10 @@ CORBA::StringDef::_unchecked_narrow (
               StringDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           StringDef_ptr,
@@ -14979,7 +13560,7 @@ CORBA::StringDef::_duplicate (StringDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -15022,7 +13603,7 @@ CORBA::StringDef::_is_a (
 void *CORBA::StringDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, StringDef)::_tao_class_id)
@@ -15069,12 +13650,12 @@ void *CORBA::StringDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -15083,6 +13664,12 @@ const char* CORBA::StringDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/StringDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::StringDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -15093,10 +13680,10 @@ CORBA::ULong CORBA::StringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_StringDef_Proxy_Impl &proxy = 
+  _TAO_StringDef_Proxy_Impl &proxy =
     this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.bound (
       this
       ACE_ENV_ARG_PARAMETER
@@ -15114,10 +13701,10 @@ void CORBA::StringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_StringDef_Proxy_Impl &proxy = 
+  _TAO_StringDef_Proxy_Impl &proxy =
     this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.bound (
       this,
       bound
@@ -15132,17 +13719,17 @@ static const CORBA::Long _oc_CORBA_StringDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5374), 
-  ACE_NTOHL (0x72696e67), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5374),
+  ACE_NTOHL (0x72696e67),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringDef:1.0
     10,
-  ACE_NTOHL (0x53747269), 
-  ACE_NTOHL (0x6e674465), 
+  ACE_NTOHL (0x53747269),
+  ACE_NTOHL (0x6e674465),
   ACE_NTOHL (0x66000000),  // name = StringDef
   };
 
@@ -15169,7 +13756,7 @@ TAO_NAMESPACE_END
 int CORBA::WstringDef::_tao_class_id = 0;
 
 CORBA::WstringDef_ptr
-tao_CORBA_WstringDef_duplicate (
+CORBA::tao_WstringDef_life::tao_duplicate (
     CORBA::WstringDef_ptr p
   )
 {
@@ -15177,7 +13764,7 @@ tao_CORBA_WstringDef_duplicate (
 }
 
 void
-tao_CORBA_WstringDef_release (
+CORBA::tao_WstringDef_life::tao_release (
     CORBA::WstringDef_ptr p
   )
 {
@@ -15185,228 +13772,64 @@ tao_CORBA_WstringDef_release (
 }
 
 CORBA::WstringDef_ptr
-tao_CORBA_WstringDef_nil (
+CORBA::tao_WstringDef_life::tao_nil (
     void
   )
 {
   return CORBA::WstringDef::_nil ();
 }
 
-CORBA::WstringDef_ptr
-tao_CORBA_WstringDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::WstringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_WstringDef_upcast (
-    void *src
-  )
-{
-  CORBA::WstringDef **tmp =
-    ACE_static_cast (CORBA::WstringDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_WstringDef_marshal (
+CORBA::tao_WstringDef_life::tao_marshal (
     CORBA::WstringDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::WstringDef_var
-// *************************************************************
-
-CORBA::WstringDef_var::WstringDef_var (void)
-  : ptr_ (WstringDef::_nil ())
-{}
-
-::CORBA::WstringDef_ptr
-CORBA::WstringDef_var::ptr (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-CORBA::WstringDef_var::WstringDef_var (const ::CORBA::WstringDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (WstringDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::WstringDef_var::~WstringDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::WstringDef_var &
-CORBA::WstringDef_var::operator= (WstringDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::WstringDef_var &
-CORBA::WstringDef_var::operator= (const ::CORBA::WstringDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::WstringDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::WstringDef_var::operator const ::CORBA::WstringDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::WstringDef_var::operator ::CORBA::WstringDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::WstringDef_ptr
-CORBA::WstringDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::WstringDef_ptr
-CORBA::WstringDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::WstringDef_ptr &
-CORBA::WstringDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::WstringDef_ptr &
-CORBA::WstringDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::WstringDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::WstringDef_ptr
-CORBA::WstringDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::WstringDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::WstringDef::_nil ();
-  return val;
-}
-
-::CORBA::WstringDef_ptr
-CORBA::WstringDef_var::tao_duplicate (WstringDef_ptr p)
-{
-  return ::CORBA::WstringDef::_duplicate (p);
-}
-
-void
-CORBA::WstringDef_var::tao_release (WstringDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::WstringDef_ptr
-CORBA::WstringDef_var::tao_nil (void)
-{
-  return ::CORBA::WstringDef::_nil ();
-}
-
-::CORBA::WstringDef_ptr
-CORBA::WstringDef_var::tao_narrow (
+CORBA::WstringDef_ptr
+CORBA::tao_WstringDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::WstringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::WstringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::WstringDef_var::tao_upcast (void *src)
+CORBA::tao_WstringDef_cast::tao_upcast (
+    void *src
+  )
 {
-  WstringDef **tmp =
-    ACE_static_cast (WstringDef **, src);
+  CORBA::WstringDef **tmp =
+    ACE_static_cast (CORBA::WstringDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::WstringDef_out
-// *************************************************************
-
-CORBA::WstringDef_out::WstringDef_out (WstringDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::WstringDef::_nil ();
-}
-
-CORBA::WstringDef_out::WstringDef_out (WstringDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::WstringDef::_nil ();
-}
-
-CORBA::WstringDef_out::WstringDef_out (const ::CORBA::WstringDef_out &p)
-  : ptr_ (ACE_const_cast (WstringDef_out &, p).ptr_)
-{}
-
-::CORBA::WstringDef_out &
-CORBA::WstringDef_out::operator= (const ::CORBA::WstringDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (WstringDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::WstringDef_out &
-CORBA::WstringDef_out::operator= (const ::CORBA::WstringDef_var &p)
-{
-  this->ptr_ = ::CORBA::WstringDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::WstringDef_out &
-CORBA::WstringDef_out::operator= (WstringDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::WstringDef_out::operator ::CORBA::WstringDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::WstringDef_ptr &
-CORBA::WstringDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::WstringDef_ptr
-CORBA::WstringDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::WstringDef,
+        CORBA::tao_WstringDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::WstringDef,
+        CORBA::tao_WstringDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::WstringDef, \
+        CORBA::tao_WstringDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::WstringDef, \
+        CORBA::tao_WstringDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -15426,29 +13849,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ULong result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (const TAO_ClientRequestInfo_CORBA_WstringDef_bound_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_WstringDef_bound_get &);
-    
+
     ::CORBA::ULong _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -15461,7 +13884,7 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -15473,11 +13896,11 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15486,17 +13909,17 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DEC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::ULong result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -15514,10 +13937,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -15526,15 +13949,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_WstringDef_bound_set &);
     const CORBA::ULong & bound_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::TAO_ClientRequestInfo_CORBA_WstringDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       bound_ (bound)
@@ -15548,15 +13971,15 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= bound_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -15568,11 +13991,11 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15581,7 +14004,7 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DEC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -15593,7 +14016,7 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DEC
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_Proxy_Impl (void)
@@ -15617,12 +14040,12 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
 {
   CORBA::ULong _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_bound",
@@ -15630,22 +14053,22 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_WstringDef_bound_get _tao_ri (
           &_tao_call,
@@ -15653,14 +14076,14 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -15668,77 +14091,84 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::ULong _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::ULong _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -15748,59 +14178,57 @@ CORBA::ULong CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -15816,12 +14244,12 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_bound",
@@ -15829,22 +14257,22 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_WstringDef_bound_set _tao_ri (
           &_tao_call,
@@ -15853,14 +14281,14 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -15868,70 +14296,76 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << bound)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << bound)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -15941,61 +14375,59 @@ void CORBA::_TAO_WstringDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -16046,8 +14478,8 @@ CORBA::_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::WstringDef::WstringDef (int collocated)
 {
@@ -16063,14 +14495,14 @@ CORBA::WstringDef::CORBA_WstringDef_setup_collocation (int collocated)
   else
     this->the_TAO_WstringDef_Proxy_Broker_ =
       ::CORBA::_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
 CORBA::WstringDef::~WstringDef (void)
 {}
 
-void 
+void
 CORBA::WstringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   WstringDef *tmp = ACE_static_cast (WstringDef *, _tao_void_pointer);
@@ -16087,7 +14519,7 @@ CORBA::WstringDef::_narrow (
     {
       return WstringDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -16096,17 +14528,17 @@ CORBA::WstringDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (WstringDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return WstringDef::_nil ();
         }
     }
-  
+
   return WstringDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::WstringDef_ptr 
+CORBA::WstringDef_ptr
 CORBA::WstringDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16116,18 +14548,18 @@ CORBA::WstringDef::_unchecked_narrow (
     {
       return WstringDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       WstringDef_ptr default_proxy = WstringDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -16145,7 +14577,7 @@ CORBA::WstringDef::_unchecked_narrow (
               WstringDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -16158,10 +14590,10 @@ CORBA::WstringDef::_unchecked_narrow (
               WstringDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           WstringDef_ptr,
@@ -16181,7 +14613,7 @@ CORBA::WstringDef::_duplicate (WstringDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -16224,7 +14656,7 @@ CORBA::WstringDef::_is_a (
 void *CORBA::WstringDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, WstringDef)::_tao_class_id)
@@ -16271,12 +14703,12 @@ void *CORBA::WstringDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -16285,6 +14717,12 @@ const char* CORBA::WstringDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/WstringDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::WstringDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -16295,10 +14733,10 @@ CORBA::ULong CORBA::WstringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_WstringDef_Proxy_Impl &proxy = 
+  _TAO_WstringDef_Proxy_Impl &proxy =
     this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.bound (
       this
       ACE_ENV_ARG_PARAMETER
@@ -16316,10 +14754,10 @@ void CORBA::WstringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_WstringDef_Proxy_Impl &proxy = 
+  _TAO_WstringDef_Proxy_Impl &proxy =
     this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.bound (
       this,
       bound
@@ -16334,18 +14772,18 @@ static const CORBA::Long _oc_CORBA_WstringDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5773), 
-  ACE_NTOHL (0x7472696e), 
-  ACE_NTOHL (0x67446566), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5773),
+  ACE_NTOHL (0x7472696e),
+  ACE_NTOHL (0x67446566),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WstringDef:1.0
     11,
-  ACE_NTOHL (0x57737472), 
-  ACE_NTOHL (0x696e6744), 
+  ACE_NTOHL (0x57737472),
+  ACE_NTOHL (0x696e6744),
   ACE_NTOHL (0x65660000),  // name = WstringDef
   };
 
@@ -16372,7 +14810,7 @@ TAO_NAMESPACE_END
 int CORBA::SequenceDef::_tao_class_id = 0;
 
 CORBA::SequenceDef_ptr
-tao_CORBA_SequenceDef_duplicate (
+CORBA::tao_SequenceDef_life::tao_duplicate (
     CORBA::SequenceDef_ptr p
   )
 {
@@ -16380,7 +14818,7 @@ tao_CORBA_SequenceDef_duplicate (
 }
 
 void
-tao_CORBA_SequenceDef_release (
+CORBA::tao_SequenceDef_life::tao_release (
     CORBA::SequenceDef_ptr p
   )
 {
@@ -16388,228 +14826,64 @@ tao_CORBA_SequenceDef_release (
 }
 
 CORBA::SequenceDef_ptr
-tao_CORBA_SequenceDef_nil (
+CORBA::tao_SequenceDef_life::tao_nil (
     void
   )
 {
   return CORBA::SequenceDef::_nil ();
 }
 
-CORBA::SequenceDef_ptr
-tao_CORBA_SequenceDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::SequenceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_SequenceDef_upcast (
-    void *src
-  )
-{
-  CORBA::SequenceDef **tmp =
-    ACE_static_cast (CORBA::SequenceDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_SequenceDef_marshal (
+CORBA::tao_SequenceDef_life::tao_marshal (
     CORBA::SequenceDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::SequenceDef_var
-// *************************************************************
-
-CORBA::SequenceDef_var::SequenceDef_var (void)
-  : ptr_ (SequenceDef::_nil ())
-{}
-
-::CORBA::SequenceDef_ptr
-CORBA::SequenceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::SequenceDef_var::SequenceDef_var (const ::CORBA::SequenceDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (SequenceDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::SequenceDef_var::~SequenceDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::SequenceDef_var &
-CORBA::SequenceDef_var::operator= (SequenceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return p->marshal (cdr);
 }
 
-CORBA::SequenceDef_var &
-CORBA::SequenceDef_var::operator= (const ::CORBA::SequenceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::SequenceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::SequenceDef_var::operator const ::CORBA::SequenceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::SequenceDef_var::operator ::CORBA::SequenceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::SequenceDef_ptr
-CORBA::SequenceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::SequenceDef_ptr
-CORBA::SequenceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::SequenceDef_ptr &
-CORBA::SequenceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::SequenceDef_ptr &
-CORBA::SequenceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::SequenceDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::SequenceDef_ptr
-CORBA::SequenceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::SequenceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::SequenceDef::_nil ();
-  return val;
-}
-
-::CORBA::SequenceDef_ptr
-CORBA::SequenceDef_var::tao_duplicate (SequenceDef_ptr p)
-{
-  return ::CORBA::SequenceDef::_duplicate (p);
-}
-
-void
-CORBA::SequenceDef_var::tao_release (SequenceDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::SequenceDef_ptr
-CORBA::SequenceDef_var::tao_nil (void)
-{
-  return ::CORBA::SequenceDef::_nil ();
-}
-
-::CORBA::SequenceDef_ptr
-CORBA::SequenceDef_var::tao_narrow (
+CORBA::SequenceDef_ptr
+CORBA::tao_SequenceDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::SequenceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::SequenceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::SequenceDef_var::tao_upcast (void *src)
+CORBA::tao_SequenceDef_cast::tao_upcast (
+    void *src
+  )
 {
-  SequenceDef **tmp =
-    ACE_static_cast (SequenceDef **, src);
+  CORBA::SequenceDef **tmp =
+    ACE_static_cast (CORBA::SequenceDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::SequenceDef_out
-// *************************************************************
-
-CORBA::SequenceDef_out::SequenceDef_out (SequenceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::SequenceDef::_nil ();
-}
-
-CORBA::SequenceDef_out::SequenceDef_out (SequenceDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::SequenceDef::_nil ();
-}
-
-CORBA::SequenceDef_out::SequenceDef_out (const ::CORBA::SequenceDef_out &p)
-  : ptr_ (ACE_const_cast (SequenceDef_out &, p).ptr_)
-{}
-
-::CORBA::SequenceDef_out &
-CORBA::SequenceDef_out::operator= (const ::CORBA::SequenceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (SequenceDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::SequenceDef_out &
-CORBA::SequenceDef_out::operator= (const ::CORBA::SequenceDef_var &p)
-{
-  this->ptr_ = ::CORBA::SequenceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::SequenceDef_out &
-CORBA::SequenceDef_out::operator= (SequenceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::SequenceDef_out::operator ::CORBA::SequenceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::SequenceDef_ptr &
-CORBA::SequenceDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::SequenceDef_ptr
-CORBA::SequenceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::SequenceDef,
+        CORBA::tao_SequenceDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::SequenceDef,
+        CORBA::tao_SequenceDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::SequenceDef, \
+        CORBA::tao_SequenceDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::SequenceDef, \
+        CORBA::tao_SequenceDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -16629,29 +14903,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ULong result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (const TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get &);
-    
+
     ::CORBA::ULong _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -16664,7 +14938,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -16676,11 +14950,11 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -16689,17 +14963,17 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::ULong result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -16717,10 +14991,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -16729,15 +15003,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set &);
     const CORBA::ULong & bound_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       bound_ (bound)
@@ -16751,15 +15025,15 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= bound_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -16771,11 +15045,11 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -16784,7 +15058,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -16803,29 +15077,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get &);
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -16838,7 +15112,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::arguments (ACE_ENV_SIN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -16850,11 +15124,11 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (ACE_ENV_SI
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -16863,17 +15137,17 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (ACE_ENV_SINGLE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -16890,29 +15164,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -16925,7 +15199,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (ACE_ENV
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -16937,11 +15211,11 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (ACE_EN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -16950,17 +15224,17 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (ACE_ENV_SI
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -16978,10 +15252,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -16990,15 +15264,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set &);
     CORBA::IDLType_ptr element_type_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       element_type_def_ (element_type_def)
@@ -17012,15 +15286,15 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (ACE_ENV
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->element_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -17032,11 +15306,11 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (ACE_EN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17045,7 +15319,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SI
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -17057,7 +15331,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SI
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_Proxy_Impl (void)
@@ -17081,12 +15355,12 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
 {
   CORBA::ULong _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_bound",
@@ -17094,22 +15368,22 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get _tao_ri (
           &_tao_call,
@@ -17117,14 +15391,14 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -17132,77 +15406,84 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::ULong _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::ULong _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -17212,59 +15493,57 @@ CORBA::ULong CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -17280,12 +15559,12 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_bound",
@@ -17293,22 +15572,22 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set _tao_ri (
           &_tao_call,
@@ -17317,14 +15596,14 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -17332,70 +15611,76 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << bound)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << bound)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -17405,56 +15690,54 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -17471,12 +15754,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_element_type",
@@ -17484,22 +15767,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get _tao_ri (
           &_tao_call,
@@ -17507,14 +15790,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -17522,78 +15805,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -17603,59 +15893,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -17671,12 +15959,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_element_type_def",
@@ -17684,22 +15972,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get _tao_ri (
           &_tao_call,
@@ -17707,14 +15995,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -17722,78 +16010,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -17803,59 +16098,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -17871,12 +16164,12 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_element_type_def",
@@ -17884,22 +16177,22 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set _tao_ri (
           &_tao_call,
@@ -17908,14 +16201,14 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -17923,70 +16216,76 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << element_type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << element_type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -17996,61 +16295,59 @@ void CORBA::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -18101,8 +16398,8 @@ CORBA::_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::SequenceDef::SequenceDef (int collocated)
 {
@@ -18118,14 +16415,14 @@ CORBA::SequenceDef::CORBA_SequenceDef_setup_collocation (int collocated)
   else
     this->the_TAO_SequenceDef_Proxy_Broker_ =
       ::CORBA::_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
 CORBA::SequenceDef::~SequenceDef (void)
 {}
 
-void 
+void
 CORBA::SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   SequenceDef *tmp = ACE_static_cast (SequenceDef *, _tao_void_pointer);
@@ -18142,7 +16439,7 @@ CORBA::SequenceDef::_narrow (
     {
       return SequenceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -18151,17 +16448,17 @@ CORBA::SequenceDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (SequenceDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return SequenceDef::_nil ();
         }
     }
-  
+
   return SequenceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::SequenceDef_ptr 
+CORBA::SequenceDef_ptr
 CORBA::SequenceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -18171,18 +16468,18 @@ CORBA::SequenceDef::_unchecked_narrow (
     {
       return SequenceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       SequenceDef_ptr default_proxy = SequenceDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -18200,7 +16497,7 @@ CORBA::SequenceDef::_unchecked_narrow (
               SequenceDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -18213,10 +16510,10 @@ CORBA::SequenceDef::_unchecked_narrow (
               SequenceDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           SequenceDef_ptr,
@@ -18236,7 +16533,7 @@ CORBA::SequenceDef::_duplicate (SequenceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -18279,7 +16576,7 @@ CORBA::SequenceDef::_is_a (
 void *CORBA::SequenceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, SequenceDef)::_tao_class_id)
@@ -18326,12 +16623,12 @@ void *CORBA::SequenceDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -18340,6 +16637,12 @@ const char* CORBA::SequenceDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/SequenceDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -18350,10 +16653,10 @@ CORBA::ULong CORBA::SequenceDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.bound (
       this
       ACE_ENV_ARG_PARAMETER
@@ -18371,10 +16674,10 @@ void CORBA::SequenceDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.bound (
       this,
       bound
@@ -18392,10 +16695,10 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.element_type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -18412,10 +16715,10 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.element_type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -18433,10 +16736,10 @@ void CORBA::SequenceDef::element_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
+  _TAO_SequenceDef_Proxy_Impl &proxy =
     this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.element_type_def (
       this,
       element_type_def
@@ -18451,18 +16754,18 @@ static const CORBA::Long _oc_CORBA_SequenceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x7175656e), 
-  ACE_NTOHL (0x63654465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x7175656e),
+  ACE_NTOHL (0x63654465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SequenceDef:1.0
     12,
-  ACE_NTOHL (0x53657175), 
-  ACE_NTOHL (0x656e6365), 
+  ACE_NTOHL (0x53657175),
+  ACE_NTOHL (0x656e6365),
   ACE_NTOHL (0x44656600),  // name = SequenceDef
   };
 
@@ -18489,7 +16792,7 @@ TAO_NAMESPACE_END
 int CORBA::ArrayDef::_tao_class_id = 0;
 
 CORBA::ArrayDef_ptr
-tao_CORBA_ArrayDef_duplicate (
+CORBA::tao_ArrayDef_life::tao_duplicate (
     CORBA::ArrayDef_ptr p
   )
 {
@@ -18497,7 +16800,7 @@ tao_CORBA_ArrayDef_duplicate (
 }
 
 void
-tao_CORBA_ArrayDef_release (
+CORBA::tao_ArrayDef_life::tao_release (
     CORBA::ArrayDef_ptr p
   )
 {
@@ -18505,228 +16808,64 @@ tao_CORBA_ArrayDef_release (
 }
 
 CORBA::ArrayDef_ptr
-tao_CORBA_ArrayDef_nil (
+CORBA::tao_ArrayDef_life::tao_nil (
     void
   )
 {
   return CORBA::ArrayDef::_nil ();
 }
 
-CORBA::ArrayDef_ptr
-tao_CORBA_ArrayDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ArrayDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ArrayDef_upcast (
-    void *src
-  )
-{
-  CORBA::ArrayDef **tmp =
-    ACE_static_cast (CORBA::ArrayDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ArrayDef_marshal (
+CORBA::tao_ArrayDef_life::tao_marshal (
     CORBA::ArrayDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ArrayDef_var
-// *************************************************************
-
-CORBA::ArrayDef_var::ArrayDef_var (void)
-  : ptr_ (ArrayDef::_nil ())
-{}
-
-::CORBA::ArrayDef_ptr
-CORBA::ArrayDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ArrayDef_var::ArrayDef_var (const ::CORBA::ArrayDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ArrayDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ArrayDef_var::~ArrayDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ArrayDef_var &
-CORBA::ArrayDef_var::operator= (ArrayDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ArrayDef_var &
-CORBA::ArrayDef_var::operator= (const ::CORBA::ArrayDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ArrayDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ArrayDef_var::operator const ::CORBA::ArrayDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ArrayDef_var::operator ::CORBA::ArrayDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ArrayDef_ptr
-CORBA::ArrayDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ArrayDef_ptr
-CORBA::ArrayDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ArrayDef_ptr &
-CORBA::ArrayDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ArrayDef_ptr &
-CORBA::ArrayDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ArrayDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ArrayDef_ptr
-CORBA::ArrayDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ArrayDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ArrayDef::_nil ();
-  return val;
-}
-
-::CORBA::ArrayDef_ptr
-CORBA::ArrayDef_var::tao_duplicate (ArrayDef_ptr p)
-{
-  return ::CORBA::ArrayDef::_duplicate (p);
-}
-
-void
-CORBA::ArrayDef_var::tao_release (ArrayDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ArrayDef_ptr
-CORBA::ArrayDef_var::tao_nil (void)
-{
-  return ::CORBA::ArrayDef::_nil ();
-}
-
-::CORBA::ArrayDef_ptr
-CORBA::ArrayDef_var::tao_narrow (
+CORBA::ArrayDef_ptr
+CORBA::tao_ArrayDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ArrayDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ArrayDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ArrayDef_var::tao_upcast (void *src)
+CORBA::tao_ArrayDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ArrayDef **tmp =
-    ACE_static_cast (ArrayDef **, src);
+  CORBA::ArrayDef **tmp =
+    ACE_static_cast (CORBA::ArrayDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ArrayDef_out
-// *************************************************************
-
-CORBA::ArrayDef_out::ArrayDef_out (ArrayDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ArrayDef::_nil ();
-}
-
-CORBA::ArrayDef_out::ArrayDef_out (ArrayDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ArrayDef::_nil ();
-}
-
-CORBA::ArrayDef_out::ArrayDef_out (const ::CORBA::ArrayDef_out &p)
-  : ptr_ (ACE_const_cast (ArrayDef_out &, p).ptr_)
-{}
-
-::CORBA::ArrayDef_out &
-CORBA::ArrayDef_out::operator= (const ::CORBA::ArrayDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ArrayDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ArrayDef_out &
-CORBA::ArrayDef_out::operator= (const ::CORBA::ArrayDef_var &p)
-{
-  this->ptr_ = ::CORBA::ArrayDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ArrayDef_out &
-CORBA::ArrayDef_out::operator= (ArrayDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ArrayDef_out::operator ::CORBA::ArrayDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ArrayDef_ptr &
-CORBA::ArrayDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ArrayDef_ptr
-CORBA::ArrayDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ArrayDef,
+        CORBA::tao_ArrayDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ArrayDef,
+        CORBA::tao_ArrayDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ArrayDef, \
+        CORBA::tao_ArrayDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ArrayDef, \
+        CORBA::tao_ArrayDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -18746,29 +16885,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ULong result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (const TAO_ClientRequestInfo_CORBA_ArrayDef_length_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_length_get &);
-    
+
     ::CORBA::ULong _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -18781,7 +16920,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -18793,11 +16932,11 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18806,17 +16945,17 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::ULong result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -18834,10 +16973,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -18846,15 +16985,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_length_set &);
     const CORBA::ULong & length_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::TAO_ClientRequestInfo_CORBA_ArrayDef_length_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & length
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       length_ (length)
@@ -18868,15 +17007,15 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= length_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -18888,11 +17027,11 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18901,7 +17040,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -18920,29 +17059,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get &);
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -18955,7 +17094,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -18967,11 +17106,11 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18980,17 +17119,17 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -19007,29 +17146,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -19042,7 +17181,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (ACE_ENV_SI
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -19054,11 +17193,11 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (ACE_ENV_S
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -19067,17 +17206,17 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (ACE_ENV_SINGL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -19095,10 +17234,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -19107,15 +17246,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set &);
     CORBA::IDLType_ptr element_type_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       element_type_def_ (element_type_def)
@@ -19129,15 +17268,15 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (ACE_ENV_SI
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->element_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -19149,11 +17288,11 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (ACE_ENV_S
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -19162,7 +17301,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -19174,7 +17313,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGL
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
@@ -19198,12 +17337,12 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
 {
   CORBA::ULong _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_length",
@@ -19211,22 +17350,22 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_length_get _tao_ri (
           &_tao_call,
@@ -19234,14 +17373,14 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19249,77 +17388,84 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::ULong _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::ULong _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -19329,59 +17475,57 @@ CORBA::ULong CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -19397,12 +17541,12 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_length",
@@ -19410,22 +17554,22 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_length_set _tao_ri (
           &_tao_call,
@@ -19434,14 +17578,14 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19449,70 +17593,76 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << length)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << length)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -19522,56 +17672,54 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::length (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -19588,12 +17736,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_element_type",
@@ -19601,22 +17749,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get _tao_ri (
           &_tao_call,
@@ -19624,14 +17772,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19639,78 +17787,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -19720,59 +17875,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -19788,12 +17941,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_element_type_def",
@@ -19801,22 +17954,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get _tao_ri (
           &_tao_call,
@@ -19824,14 +17977,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19839,78 +17992,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -19920,59 +18080,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -19988,12 +18146,12 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_element_type_def",
@@ -20001,22 +18159,22 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set _tao_ri (
           &_tao_call,
@@ -20025,14 +18183,14 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -20040,70 +18198,76 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << element_type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << element_type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -20113,61 +18277,59 @@ void CORBA::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -20218,8 +18380,8 @@ CORBA::_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ArrayDef::ArrayDef (int collocated)
 {
@@ -20235,14 +18397,14 @@ CORBA::ArrayDef::CORBA_ArrayDef_setup_collocation (int collocated)
   else
     this->the_TAO_ArrayDef_Proxy_Broker_ =
       ::CORBA::_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
 CORBA::ArrayDef::~ArrayDef (void)
 {}
 
-void 
+void
 CORBA::ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ArrayDef *tmp = ACE_static_cast (ArrayDef *, _tao_void_pointer);
@@ -20259,7 +18421,7 @@ CORBA::ArrayDef::_narrow (
     {
       return ArrayDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -20268,17 +18430,17 @@ CORBA::ArrayDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ArrayDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ArrayDef::_nil ();
         }
     }
-  
+
   return ArrayDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ArrayDef_ptr 
+CORBA::ArrayDef_ptr
 CORBA::ArrayDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -20288,18 +18450,18 @@ CORBA::ArrayDef::_unchecked_narrow (
     {
       return ArrayDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ArrayDef_ptr default_proxy = ArrayDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -20317,7 +18479,7 @@ CORBA::ArrayDef::_unchecked_narrow (
               ArrayDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -20330,10 +18492,10 @@ CORBA::ArrayDef::_unchecked_narrow (
               ArrayDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ArrayDef_ptr,
@@ -20353,7 +18515,7 @@ CORBA::ArrayDef::_duplicate (ArrayDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -20396,7 +18558,7 @@ CORBA::ArrayDef::_is_a (
 void *CORBA::ArrayDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ArrayDef)::_tao_class_id)
@@ -20443,12 +18605,12 @@ void *CORBA::ArrayDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -20457,6 +18619,12 @@ const char* CORBA::ArrayDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ArrayDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -20467,10 +18635,10 @@ CORBA::ULong CORBA::ArrayDef::length (
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.length (
       this
       ACE_ENV_ARG_PARAMETER
@@ -20488,10 +18656,10 @@ void CORBA::ArrayDef::length (
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.length (
       this,
       length
@@ -20509,10 +18677,10 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.element_type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -20529,10 +18697,10 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.element_type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -20550,10 +18718,10 @@ void CORBA::ArrayDef::element_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
+  _TAO_ArrayDef_Proxy_Impl &proxy =
     this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.element_type_def (
       this,
       element_type_def
@@ -20568,17 +18736,17 @@ static const CORBA::Long _oc_CORBA_ArrayDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4172), 
-  ACE_NTOHL (0x72617944), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4172),
+  ACE_NTOHL (0x72617944),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ArrayDef:1.0
     9,
-  ACE_NTOHL (0x41727261), 
-  ACE_NTOHL (0x79446566), 
+  ACE_NTOHL (0x41727261),
+  ACE_NTOHL (0x79446566),
   ACE_NTOHL (0x0),  // name = ArrayDef
   };
 
@@ -20605,7 +18773,7 @@ TAO_NAMESPACE_END
 int CORBA::ExceptionDef::_tao_class_id = 0;
 
 CORBA::ExceptionDef_ptr
-tao_CORBA_ExceptionDef_duplicate (
+CORBA::tao_ExceptionDef_life::tao_duplicate (
     CORBA::ExceptionDef_ptr p
   )
 {
@@ -20613,7 +18781,7 @@ tao_CORBA_ExceptionDef_duplicate (
 }
 
 void
-tao_CORBA_ExceptionDef_release (
+CORBA::tao_ExceptionDef_life::tao_release (
     CORBA::ExceptionDef_ptr p
   )
 {
@@ -20621,228 +18789,64 @@ tao_CORBA_ExceptionDef_release (
 }
 
 CORBA::ExceptionDef_ptr
-tao_CORBA_ExceptionDef_nil (
+CORBA::tao_ExceptionDef_life::tao_nil (
     void
   )
 {
   return CORBA::ExceptionDef::_nil ();
 }
 
-CORBA::ExceptionDef_ptr
-tao_CORBA_ExceptionDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ExceptionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ExceptionDef_upcast (
-    void *src
-  )
-{
-  CORBA::ExceptionDef **tmp =
-    ACE_static_cast (CORBA::ExceptionDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ExceptionDef_marshal (
+CORBA::tao_ExceptionDef_life::tao_marshal (
     CORBA::ExceptionDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ExceptionDef_var
-// *************************************************************
-
-CORBA::ExceptionDef_var::ExceptionDef_var (void)
-  : ptr_ (ExceptionDef::_nil ())
-{}
-
-::CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ExceptionDef_var::ExceptionDef_var (const ::CORBA::ExceptionDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ExceptionDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ExceptionDef_var::~ExceptionDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ExceptionDef_var &
-CORBA::ExceptionDef_var::operator= (ExceptionDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExceptionDef_var &
-CORBA::ExceptionDef_var::operator= (const ::CORBA::ExceptionDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ExceptionDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ExceptionDef_var::operator const ::CORBA::ExceptionDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ExceptionDef_var::operator ::CORBA::ExceptionDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExceptionDef_ptr &
-CORBA::ExceptionDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExceptionDef_ptr &
-CORBA::ExceptionDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExceptionDef::_nil ();
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ExceptionDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ExceptionDef::_nil ();
-  return val;
-}
-
-::CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_var::tao_duplicate (ExceptionDef_ptr p)
-{
-  return ::CORBA::ExceptionDef::_duplicate (p);
-}
-
-void
-CORBA::ExceptionDef_var::tao_release (ExceptionDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_var::tao_nil (void)
-{
-  return ::CORBA::ExceptionDef::_nil ();
-}
-
-::CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_var::tao_narrow (
+CORBA::ExceptionDef_ptr
+CORBA::tao_ExceptionDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ExceptionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExceptionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ExceptionDef_var::tao_upcast (void *src)
+CORBA::tao_ExceptionDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ExceptionDef **tmp =
-    ACE_static_cast (ExceptionDef **, src);
+  CORBA::ExceptionDef **tmp =
+    ACE_static_cast (CORBA::ExceptionDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ExceptionDef_out
-// *************************************************************
-
-CORBA::ExceptionDef_out::ExceptionDef_out (ExceptionDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ExceptionDef::_nil ();
-}
-
-CORBA::ExceptionDef_out::ExceptionDef_out (ExceptionDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExceptionDef::_nil ();
-}
-
-CORBA::ExceptionDef_out::ExceptionDef_out (const ::CORBA::ExceptionDef_out &p)
-  : ptr_ (ACE_const_cast (ExceptionDef_out &, p).ptr_)
-{}
-
-::CORBA::ExceptionDef_out &
-CORBA::ExceptionDef_out::operator= (const ::CORBA::ExceptionDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExceptionDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ExceptionDef_out &
-CORBA::ExceptionDef_out::operator= (const ::CORBA::ExceptionDef_var &p)
-{
-  this->ptr_ = ::CORBA::ExceptionDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ExceptionDef_out &
-CORBA::ExceptionDef_out::operator= (ExceptionDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExceptionDef_out::operator ::CORBA::ExceptionDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ExceptionDef_ptr &
-CORBA::ExceptionDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ExceptionDef,
+        CORBA::tao_ExceptionDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ExceptionDef,
+        CORBA::tao_ExceptionDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ExceptionDef, \
+        CORBA::tao_ExceptionDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ExceptionDef, \
+        CORBA::tao_ExceptionDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -20862,29 +18866,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (const TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get &);
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -20897,7 +18901,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -20909,11 +18913,11 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -20922,17 +18926,17 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -20949,29 +18953,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::StructMemberSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (const TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get &);
-    
+
     ::CORBA::StructMemberSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -20984,7 +18988,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -20996,11 +19000,11 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -21009,17 +19013,17 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (::CORBA::StructMemberSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -21037,10 +19041,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21049,15 +19053,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set &);
     const CORBA::StructMemberSeq & members_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       members_ (members)
@@ -21071,15 +19075,15 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -21091,11 +19095,11 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -21104,7 +19108,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -21116,7 +19120,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ExceptionDef_Proxy_Impl::_TAO_ExceptionDef_Proxy_Impl (void)
@@ -21140,12 +19144,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -21153,22 +19157,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get _tao_ri (
           &_tao_call,
@@ -21176,14 +19180,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -21191,78 +19195,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -21272,59 +19283,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -21340,18 +19349,18 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
 {
   CORBA::StructMemberSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::StructMemberSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::StructMemberSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_members",
@@ -21359,22 +19368,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get _tao_ri (
           &_tao_call,
@@ -21382,14 +19391,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -21397,78 +19406,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::StructMemberSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::StructMemberSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -21478,59 +19494,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -21546,12 +19560,12 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_members",
@@ -21559,22 +19573,22 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set _tao_ri (
           &_tao_call,
@@ -21583,14 +19597,14 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -21598,70 +19612,76 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << members)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << members)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -21671,61 +19691,59 @@ void CORBA::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -21776,8 +19794,8 @@ CORBA::_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ExceptionDef::ExceptionDef (int collocated)
 {
@@ -21793,7 +19811,7 @@ CORBA::ExceptionDef::CORBA_ExceptionDef_setup_collocation (int collocated)
   else
     this->the_TAO_ExceptionDef_Proxy_Broker_ =
       ::CORBA::_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
   this->CORBA_Container_setup_collocation (collocated);
 }
@@ -21801,7 +19819,7 @@ CORBA::ExceptionDef::CORBA_ExceptionDef_setup_collocation (int collocated)
 CORBA::ExceptionDef::~ExceptionDef (void)
 {}
 
-void 
+void
 CORBA::ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionDef *tmp = ACE_static_cast (ExceptionDef *, _tao_void_pointer);
@@ -21818,7 +19836,7 @@ CORBA::ExceptionDef::_narrow (
     {
       return ExceptionDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -21827,17 +19845,17 @@ CORBA::ExceptionDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ExceptionDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ExceptionDef::_nil ();
         }
     }
-  
+
   return ExceptionDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ExceptionDef_ptr 
+CORBA::ExceptionDef_ptr
 CORBA::ExceptionDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -21847,18 +19865,18 @@ CORBA::ExceptionDef::_unchecked_narrow (
     {
       return ExceptionDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ExceptionDef_ptr default_proxy = ExceptionDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -21876,7 +19894,7 @@ CORBA::ExceptionDef::_unchecked_narrow (
               ExceptionDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -21889,10 +19907,10 @@ CORBA::ExceptionDef::_unchecked_narrow (
               ExceptionDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ExceptionDef_ptr,
@@ -21912,7 +19930,7 @@ CORBA::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -21959,7 +19977,7 @@ CORBA::ExceptionDef::_is_a (
 void *CORBA::ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ExceptionDef)::_tao_class_id)
@@ -22020,12 +20038,12 @@ void *CORBA::ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -22034,6 +20052,12 @@ const char* CORBA::ExceptionDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ExceptionDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ExceptionDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -22044,10 +20068,10 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_ExceptionDef_Proxy_Impl &proxy = 
+  _TAO_ExceptionDef_Proxy_Impl &proxy =
     this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -22064,10 +20088,10 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_ExceptionDef_Proxy_Impl &proxy = 
+  _TAO_ExceptionDef_Proxy_Impl &proxy =
     this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.members (
       this
       ACE_ENV_ARG_PARAMETER
@@ -22085,10 +20109,10 @@ void CORBA::ExceptionDef::members (
     CORBA::SystemException
   ))
 {
-  _TAO_ExceptionDef_Proxy_Impl &proxy = 
+  _TAO_ExceptionDef_Proxy_Impl &proxy =
     this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.members (
       this,
       members
@@ -22103,19 +20127,19 @@ static const CORBA::Long _oc_CORBA_ExceptionDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x696f6e44), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x696f6e44),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
     13,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e446566), 
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e446566),
   ACE_NTOHL (0x0),  // name = ExceptionDef
   };
 
@@ -22137,160 +20161,47 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:102
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExceptionDef **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ExceptionDef **old = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA::ExceptionDef::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExceptionDef **tmp = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ExceptionDef::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::ExceptionDef **tmp = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ExceptionDef::_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::ExceptionDef **tmp = ACE_static_cast (CORBA::ExceptionDef**, target);
-  *tmp = CORBA::ExceptionDef::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_upcast (void *src) const
-{
-  CORBA::ExceptionDef **tmp = ACE_static_cast (CORBA::ExceptionDef**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ExceptionDefSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::ExceptionDefSeq::ExceptionDefSeq (void)
 {}
 
 CORBA::ExceptionDefSeq::ExceptionDefSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::ExceptionDef,
+        CORBA::ExceptionDef,
+        CORBA::tao_ExceptionDef_life,
+        CORBA::tao_ExceptionDef_cast
+      >
+    (max)
 {}
 
 CORBA::ExceptionDefSeq::ExceptionDefSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ExceptionDef_ptr *buffer,
+    CORBA::ExceptionDef_ptr* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::ExceptionDef,
+        CORBA::ExceptionDef,
+        CORBA::tao_ExceptionDef_life,
+        CORBA::tao_ExceptionDef_cast
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ExceptionDefSeq::ExceptionDefSeq (const ExceptionDefSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::ExceptionDef,
+        CORBA::ExceptionDef,
+        CORBA::tao_ExceptionDef_life,
+        CORBA::tao_ExceptionDef_cast
+      >
+    (seq)
 {}
 
-CORBA::ExceptionDefSeq::~ExceptionDefSeq (void) // dtor
+CORBA::ExceptionDefSeq::~ExceptionDefSeq (void)
 {}
 
 void CORBA::ExceptionDefSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -22299,438 +20210,320 @@ void CORBA::ExceptionDefSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x696f6e44), 
-  ACE_NTOHL (0x65665365), 
-  ACE_NTOHL (0x713a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExceptionDefSeq:1.0
-    16,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e446566), 
-  ACE_NTOHL (0x53657100),  // name = ExceptionDefSeq
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x63657074), 
-      ACE_NTOHL (0x696f6e44), 
-      ACE_NTOHL (0x65663a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
-            13,
-      ACE_NTOHL (0x45786365), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e446566), 
-      ACE_NTOHL (0x0),  // name = ExceptionDef
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDefSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ExceptionDefSeq),
-    (char *) &_oc_CORBA_ExceptionDefSeq,
-    0,
-    sizeof (CORBA::ExceptionDefSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ExceptionDefSeq,
-    &_tc_TAO_tc_CORBA_ExceptionDefSeq
-  )
-TAO_NAMESPACE_END
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::ExceptionDefSeq,
+      TAO_Object_Manager<
+          CORBA::ExceptionDef,
+          CORBA::ExceptionDef_var,
+          CORBA::tao_ExceptionDef_life
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::ExceptionDefSeq,
+      CORBA::ExceptionDefSeq_var,
+      TAO_Object_Manager<
+          CORBA::ExceptionDef,
+          CORBA::ExceptionDef_var,
+          CORBA::tao_ExceptionDef_life
+        >
+    >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_AttributeMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4174), 
-  ACE_NTOHL (0x74726962), 
-  ACE_NTOHL (0x7574654d), 
-  ACE_NTOHL (0x6f64653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-  14,
-  ACE_NTOHL (0x41747472), 
-  ACE_NTOHL (0x69627574), 
-  ACE_NTOHL (0x654d6f64), 
-  ACE_NTOHL (0x65000000),  // name = AttributeMode
-  2, // member count
-  12,
-  ACE_NTOHL (0x41545452), 
-  ACE_NTOHL (0x5f4e4f52), 
-  ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-  14,
-  ACE_NTOHL (0x41545452), 
-  ACE_NTOHL (0x5f524541), 
-  ACE_NTOHL (0x444f4e4c), 
-  ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeMode (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_AttributeMode),
-    (char *) &_oc_CORBA_AttributeMode,
-    0,
-    sizeof (CORBA::AttributeMode)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_AttributeMode,
-    &_tc_TAO_tc_CORBA_AttributeMode
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int CORBA::AttributeDef::_tao_class_id = 0;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-CORBA::AttributeDef_ptr
-tao_CORBA_AttributeDef_duplicate (
-    CORBA::AttributeDef_ptr p
-  )
-{
-  return CORBA::AttributeDef::_duplicate (p);
-}
+# pragma instantiate \
+    TAO_MngSeq_Var_T< \
+        CORBA::ExceptionDefSeq, \
+        TAO_Object_Manager< \
+            CORBA::ExceptionDef, \
+            CORBA::ExceptionDef_var, \
+            CORBA::tao_ExceptionDef_life \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::ExceptionDefSeq, \
+        CORBA::ExceptionDefSeq_var, \
+        TAO_Object_Manager< \
+            CORBA::ExceptionDef, \
+            CORBA::ExceptionDef_var, \
+            CORBA::tao_ExceptionDef_life \
+          > \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void
-tao_CORBA_AttributeDef_release (
-    CORBA::AttributeDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-CORBA::AttributeDef_ptr
-tao_CORBA_AttributeDef_nil (
-    void
-  )
-{
-  return CORBA::AttributeDef::_nil ();
-}
+  static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
+  {
+        TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4578),
+    ACE_NTOHL (0x63657074),
+    ACE_NTOHL (0x696f6e44),
+    ACE_NTOHL (0x65665365),
+    ACE_NTOHL (0x713a312e),
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExceptionDefSeq:1.0
+        16,
+    ACE_NTOHL (0x45786365),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e446566),
+    ACE_NTOHL (0x53657100),  // name = ExceptionDefSeq
+        CORBA::tk_sequence, // typecode kind
+    80, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_objref, // typecode kind
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        35,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x63657074),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65663a31),
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDef:1.0
+                13,
+        ACE_NTOHL (0x45786365),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e446566),
+        ACE_NTOHL (0x0),  // name = ExceptionDef
 
-CORBA::AttributeDef_ptr
-tao_CORBA_AttributeDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::AttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
+      0U,
 
-CORBA::Object *
-tao_CORBA_AttributeDef_upcast (
-    void *src
-  )
-{
-  CORBA::AttributeDef **tmp =
-    ACE_static_cast (CORBA::AttributeDef **, src);
-  return *tmp;
-}
+};
 
-CORBA::Boolean
-tao_CORBA_AttributeDef_marshal (
-    CORBA::AttributeDef_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
+  static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDefSeq (
+      CORBA::tk_alias,
+      sizeof (_oc_CORBA_ExceptionDefSeq),
+      (char *) &_oc_CORBA_ExceptionDefSeq,
+      0,
+      sizeof (CORBA::ExceptionDefSeq)
+    );
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (CORBA)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_ExceptionDefSeq,
+      &_tc_TAO_tc_CORBA_ExceptionDefSeq
+    )
+  TAO_NAMESPACE_END
 
-// *************************************************************
-// CORBA::AttributeDef_var
-// *************************************************************
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-CORBA::AttributeDef_var::AttributeDef_var (void)
-  : ptr_ (AttributeDef::_nil ())
-{}
+  static const CORBA::Long _oc_CORBA_AttributeMode[] =
+  {
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    36,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74726962),
+    ACE_NTOHL (0x7574654d),
+    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+    14,
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x69627574),
+    ACE_NTOHL (0x654d6f64),
+    ACE_NTOHL (0x65000000),  // name = AttributeMode
+    2, // member count
+    12,
+    ACE_NTOHL (0x41545452),
+    ACE_NTOHL (0x5f4e4f52),
+    ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+    14,
+    ACE_NTOHL (0x41545452),
+    ACE_NTOHL (0x5f524541),
+    ACE_NTOHL (0x444f4e4c),
+    ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+    };
 
-::CORBA::AttributeDef_ptr
-CORBA::AttributeDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
+  static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeMode (
+      CORBA::tk_enum,
+      sizeof (_oc_CORBA_AttributeMode),
+      (char *) &_oc_CORBA_AttributeMode,
+      0,
+      sizeof (CORBA::AttributeMode)
+    );
 
-CORBA::AttributeDef_var::AttributeDef_var (const ::CORBA::AttributeDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (AttributeDef::_duplicate (p.ptr ()))
-{}
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (CORBA)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_AttributeMode,
+      &_tc_TAO_tc_CORBA_AttributeMode
+    )
+  TAO_NAMESPACE_END
 
-CORBA::AttributeDef_var::~AttributeDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
-CORBA::AttributeDef_var &
-CORBA::AttributeDef_var::operator= (AttributeDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
+  int CORBA::AttributeDef::_tao_class_id = 0;
 
-CORBA::AttributeDef_var &
-CORBA::AttributeDef_var::operator= (const ::CORBA::AttributeDef_var &p)
-{
-  if (this != &p)
+  CORBA::AttributeDef_ptr
+  CORBA::tao_AttributeDef_life::tao_duplicate (
+      CORBA::AttributeDef_ptr p
+    )
   {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::AttributeDef::_duplicate (p.ptr ());
+    return CORBA::AttributeDef::_duplicate (p);
   }
-  return *this;
-}
-
-CORBA::AttributeDef_var::operator const ::CORBA::AttributeDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::AttributeDef_var::operator ::CORBA::AttributeDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::AttributeDef_ptr
-CORBA::AttributeDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::AttributeDef_ptr
-CORBA::AttributeDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::AttributeDef_ptr &
-CORBA::AttributeDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::AttributeDef_ptr &
-CORBA::AttributeDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::AttributeDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::AttributeDef_ptr
-CORBA::AttributeDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::AttributeDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::AttributeDef::_nil ();
-  return val;
-}
-
-::CORBA::AttributeDef_ptr
-CORBA::AttributeDef_var::tao_duplicate (AttributeDef_ptr p)
-{
-  return ::CORBA::AttributeDef::_duplicate (p);
-}
-
-void
-CORBA::AttributeDef_var::tao_release (AttributeDef_ptr p)
-{
-  CORBA::release (p);
-}
 
-::CORBA::AttributeDef_ptr
-CORBA::AttributeDef_var::tao_nil (void)
-{
-  return ::CORBA::AttributeDef::_nil ();
-}
+  void
+  CORBA::tao_AttributeDef_life::tao_release (
+      CORBA::AttributeDef_ptr p
+    )
+  {
+    CORBA::release (p);
+  }
 
-::CORBA::AttributeDef_ptr
-CORBA::AttributeDef_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::CORBA::AttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
+  CORBA::AttributeDef_ptr
+  CORBA::tao_AttributeDef_life::tao_nil (
+      void
+    )
+  {
+    return CORBA::AttributeDef::_nil ();
+  }
 
-CORBA::Object *
-CORBA::AttributeDef_var::tao_upcast (void *src)
-{
-  AttributeDef **tmp =
-    ACE_static_cast (AttributeDef **, src);
-  return *tmp;
-}
+  CORBA::Boolean
+  CORBA::tao_AttributeDef_life::tao_marshal (
+      CORBA::AttributeDef_ptr p,
+      TAO_OutputCDR &cdr
+    )
+  {
+    return p->marshal (cdr);
+  }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
+  CORBA::AttributeDef_ptr
+  CORBA::tao_AttributeDef_cast::tao_narrow (
+      CORBA::Object *p
+      ACE_ENV_ARG_DECL
+    )
+  {
+    return CORBA::AttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  }
 
-// *************************************************************
-// CORBA::AttributeDef_out
-// *************************************************************
+  CORBA::Object *
+  CORBA::tao_AttributeDef_cast::tao_upcast (
+      void *src
+    )
+  {
+    CORBA::AttributeDef **tmp =
+      ACE_static_cast (CORBA::AttributeDef **, src);
+    return *tmp;
+  }
 
-CORBA::AttributeDef_out::AttributeDef_out (AttributeDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::AttributeDef::_nil ();
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class
+      TAO_Objref_Var_T<
+          CORBA::AttributeDef,
+          CORBA::tao_AttributeDef_life
+        >;
+    template class
+      TAO_Objref_Out_T<
+          CORBA::AttributeDef,
+          CORBA::tao_AttributeDef_life
+        >;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  # pragma instantiate \
+      TAO_Objref_Var_T< \
+          CORBA::AttributeDef, \
+          CORBA::tao_AttributeDef_life \
+        >
+  # pragma instantiate \
+      TAO_Objref_Out_T< \
+          CORBA::AttributeDef, \
+          CORBA::tao_AttributeDef_life \
+        >
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-CORBA::AttributeDef_out::AttributeDef_out (AttributeDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::AttributeDef::_nil ();
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
 
-CORBA::AttributeDef_out::AttributeDef_out (const ::CORBA::AttributeDef_out &p)
-  : ptr_ (ACE_const_cast (AttributeDef_out &, p).ptr_)
-{}
+#if (TAO_HAS_INTERCEPTORS == 1)
 
-::CORBA::AttributeDef_out &
-CORBA::AttributeDef_out::operator= (const ::CORBA::AttributeDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (AttributeDef_out&, p).ptr_;
-  return *this;
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
 
-CORBA::AttributeDef_out &
-CORBA::AttributeDef_out::operator= (const ::CORBA::AttributeDef_var &p)
-{
-  this->ptr_ = ::CORBA::AttributeDef::_duplicate (p.ptr ());
-  return *this;
-}
+  class TAO_ClientRequestInfo_CORBA_AttributeDef_type_get : public TAO_ClientRequestInfo_i
+  {
+  public:
+    TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
+        TAO_GIOP_Invocation *_tao_invocation,
+        CORBA::Object_ptr _tao_target
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-CORBA::AttributeDef_out &
-CORBA::AttributeDef_out::operator= (AttributeDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+      virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException));
 
-CORBA::AttributeDef_out::operator ::CORBA::AttributeDef_ptr &() // cast
-{
-  return this->ptr_;
-}
+      virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException));
 
-::CORBA::AttributeDef_ptr &
-CORBA::AttributeDef_out::ptr (void)
-{
-  return this->ptr_;
-}
+      virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException));
 
-::CORBA::AttributeDef_ptr
-CORBA::AttributeDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+      void result (::CORBA::TypeCode_ptr result);
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
+    private:
+      TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_get &);
+      void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_get &);
 
-#if (TAO_HAS_INTERCEPTORS == 1)
+      ::CORBA::TypeCode_ptr _result;
+    };
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
 
-class TAO_ClientRequestInfo_CORBA_AttributeDef_type_get : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
+        TAO_GIOP_Invocation *_tao_invocation,
+        CORBA::Object_ptr _tao_target
+        ACE_ENV_ARG_DECL_NOT_USED
+      )
+          : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
+  {}
 
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+Dynamic::ParameterList *
+  TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    // Generate the argument list on demand.
+    Dynamic::ParameterList *parameter_list =
+      TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
 
-    void result (::CORBA::TypeCode_ptr result);
-    
-  private:
-    TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_get &);
-    void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_get &);
-    
-    ::CORBA::TypeCode_ptr _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
+    return parameter_list;
+  }
 
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
+  Dynamic::ExceptionList *
+  TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    // Generate the exception list on demand.
+    Dynamic::ExceptionList *exception_list =
+      TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK_RETURN (0);
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
+    return exception_list;
+  }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -22739,17 +20532,17 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -22766,29 +20559,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -22801,7 +20594,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -22813,11 +20606,11 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -22826,17 +20619,17 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -22854,10 +20647,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -22866,15 +20659,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set &);
     CORBA::IDLType_ptr type_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       type_def_ (type_def)
@@ -22888,15 +20681,15 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -22908,11 +20701,11 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -22921,7 +20714,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -22940,29 +20733,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::AttributeMode result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (const TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get &);
-    
+
     ::CORBA::AttributeMode _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -22975,7 +20768,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -22987,11 +20780,11 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -23000,17 +20793,17 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (::CORBA::AttributeMode result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -23028,10 +20821,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -23040,15 +20833,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set &);
     const CORBA::AttributeMode & mode_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::AttributeMode & mode
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       mode_ (mode)
@@ -23062,15 +20855,15 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -23082,11 +20875,11 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -23095,7 +20888,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -23107,7 +20900,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DE
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_AttributeDef_Proxy_Impl::_TAO_AttributeDef_Proxy_Impl (void)
@@ -23131,12 +20924,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -23144,22 +20937,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_get _tao_ri (
           &_tao_call,
@@ -23167,14 +20960,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -23182,78 +20975,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -23263,59 +21063,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -23331,12 +21129,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type_def",
@@ -23344,22 +21142,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get _tao_ri (
           &_tao_call,
@@ -23367,14 +21165,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -23382,78 +21180,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -23463,59 +21268,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -23531,12 +21334,12 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_type_def",
@@ -23544,22 +21347,22 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set _tao_ri (
           &_tao_call,
@@ -23568,14 +21371,14 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -23583,70 +21386,76 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -23656,56 +21465,54 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -23722,12 +21529,12 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
 {
   CORBA::AttributeMode _tao_retval = (CORBA::AttributeMode)0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_mode",
@@ -23735,22 +21542,22 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get _tao_ri (
           &_tao_call,
@@ -23758,14 +21565,14 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -23773,77 +21580,84 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::AttributeMode _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::AttributeMode _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -23853,59 +21667,57 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -23921,12 +21733,12 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_mode",
@@ -23934,22 +21746,22 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set _tao_ri (
           &_tao_call,
@@ -23958,14 +21770,14 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -23973,70 +21785,76 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << mode)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << mode)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -24046,61 +21864,59 @@ void CORBA::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -24151,8 +21967,8 @@ CORBA::_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::AttributeDef::AttributeDef (int collocated)
 {
@@ -24168,14 +21984,14 @@ CORBA::AttributeDef::CORBA_AttributeDef_setup_collocation (int collocated)
   else
     this->the_TAO_AttributeDef_Proxy_Broker_ =
       ::CORBA::_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
 CORBA::AttributeDef::~AttributeDef (void)
 {}
 
-void 
+void
 CORBA::AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AttributeDef *tmp = ACE_static_cast (AttributeDef *, _tao_void_pointer);
@@ -24192,7 +22008,7 @@ CORBA::AttributeDef::_narrow (
     {
       return AttributeDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -24201,17 +22017,17 @@ CORBA::AttributeDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (AttributeDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return AttributeDef::_nil ();
         }
     }
-  
+
   return AttributeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::AttributeDef_ptr 
+CORBA::AttributeDef_ptr
 CORBA::AttributeDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -24221,18 +22037,18 @@ CORBA::AttributeDef::_unchecked_narrow (
     {
       return AttributeDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       AttributeDef_ptr default_proxy = AttributeDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -24250,7 +22066,7 @@ CORBA::AttributeDef::_unchecked_narrow (
               AttributeDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -24263,10 +22079,10 @@ CORBA::AttributeDef::_unchecked_narrow (
               AttributeDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           AttributeDef_ptr,
@@ -24286,7 +22102,7 @@ CORBA::AttributeDef::_duplicate (AttributeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -24329,7 +22145,7 @@ CORBA::AttributeDef::_is_a (
 void *CORBA::AttributeDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, AttributeDef)::_tao_class_id)
@@ -24376,12 +22192,12 @@ void *CORBA::AttributeDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -24390,6 +22206,12 @@ const char* CORBA::AttributeDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/AttributeDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::AttributeDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -24400,10 +22222,10 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -24420,10 +22242,10 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -24441,10 +22263,10 @@ void CORBA::AttributeDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.type_def (
       this,
       type_def
@@ -24462,10 +22284,10 @@ void CORBA::AttributeDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::AttributeMode)0);
-  
+
   return proxy.mode (
       this
       ACE_ENV_ARG_PARAMETER
@@ -24483,10 +22305,10 @@ void CORBA::AttributeDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
+  _TAO_AttributeDef_Proxy_Impl &proxy =
     this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.mode (
       this,
       mode
@@ -24501,19 +22323,19 @@ static const CORBA::Long _oc_CORBA_AttributeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4174), 
-  ACE_NTOHL (0x74726962), 
-  ACE_NTOHL (0x75746544), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4174),
+  ACE_NTOHL (0x74726962),
+  ACE_NTOHL (0x75746544),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDef:1.0
     13,
-  ACE_NTOHL (0x41747472), 
-  ACE_NTOHL (0x69627574), 
-  ACE_NTOHL (0x65446566), 
+  ACE_NTOHL (0x41747472),
+  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x65446566),
   ACE_NTOHL (0x0),  // name = AttributeDef
   };
 
@@ -24541,46 +22363,46 @@ static const CORBA::Long _oc_CORBA_AttributeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4174), 
-  ACE_NTOHL (0x74726962), 
-  ACE_NTOHL (0x75746544), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4174),
+  ACE_NTOHL (0x74726962),
+  ACE_NTOHL (0x75746544),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
     21,
-  ACE_NTOHL (0x41747472), 
-  ACE_NTOHL (0x69627574), 
-  ACE_NTOHL (0x65446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x41747472),
+  ACE_NTOHL (0x69627574),
+  ACE_NTOHL (0x65446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = AttributeDescription
   6, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -24589,89 +22411,89 @@ static const CORBA::Long _oc_CORBA_AttributeDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   5,
-  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x6d6f6465),
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74726962), 
-    ACE_NTOHL (0x7574654d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74726962),
+    ACE_NTOHL (0x7574654d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
     14,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x69627574), 
-    ACE_NTOHL (0x654d6f64), 
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x69627574),
+    ACE_NTOHL (0x654d6f64),
     ACE_NTOHL (0x65000000),  // name = AttributeMode
     2, // member count
     12,
-    ACE_NTOHL (0x41545452), 
-    ACE_NTOHL (0x5f4e4f52), 
+    ACE_NTOHL (0x41545452),
+    ACE_NTOHL (0x5f4e4f52),
     ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
     14,
-    ACE_NTOHL (0x41545452), 
-    ACE_NTOHL (0x5f524541), 
-    ACE_NTOHL (0x444f4e4c), 
+    ACE_NTOHL (0x41545452),
+    ACE_NTOHL (0x5f524541),
+    ACE_NTOHL (0x444f4e4c),
     ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-    
+
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDescription (
@@ -24691,7 +22513,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::AttributeDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -24701,53 +22523,84 @@ void CORBA::AttributeDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      AttributeDescription
+    >;
+
+template class
+  TAO_Out_T<
+      AttributeDescription,
+      AttributeDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      AttributeDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      AttributeDescription, \
+      AttributeDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ExtAttributeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74417474), 
-  ACE_NTOHL (0x72696275), 
-  ACE_NTOHL (0x74654465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x74417474),
+  ACE_NTOHL (0x72696275),
+  ACE_NTOHL (0x74654465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
     24,
-  ACE_NTOHL (0x45787441), 
-  ACE_NTOHL (0x74747269), 
-  ACE_NTOHL (0x62757465), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x45787441),
+  ACE_NTOHL (0x74747269),
+  ACE_NTOHL (0x62757465),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
   8, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -24756,113 +22609,113 @@ static const CORBA::Long _oc_CORBA_ExtAttributeDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   5,
-  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x6d6f6465),
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74726962), 
-    ACE_NTOHL (0x7574654d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74726962),
+    ACE_NTOHL (0x7574654d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
     14,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x69627574), 
-    ACE_NTOHL (0x654d6f64), 
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x69627574),
+    ACE_NTOHL (0x654d6f64),
     ACE_NTOHL (0x65000000),  // name = AttributeMode
     2, // member count
     12,
-    ACE_NTOHL (0x41545452), 
-    ACE_NTOHL (0x5f4e4f52), 
+    ACE_NTOHL (0x41545452),
+    ACE_NTOHL (0x5f4e4f52),
     ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
     14,
-    ACE_NTOHL (0x41545452), 
-    ACE_NTOHL (0x5f524541), 
-    ACE_NTOHL (0x444f4e4c), 
+    ACE_NTOHL (0x41545452),
+    ACE_NTOHL (0x5f524541),
+    ACE_NTOHL (0x444f4e4c),
     ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-    
+
   15,
-  ACE_NTOHL (0x6765745f), 
-  ACE_NTOHL (0x65786365), 
-  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6765745f),
+  ACE_NTOHL (0x65786365),
+  ACE_NTOHL (0x7074696f),
   ACE_NTOHL (0x6e730000),  // name = get_exceptions
     CORBA::tk_alias, // typecode kind for typedefs
   276, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4578), 
-    ACE_NTOHL (0x63446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4578),
+    ACE_NTOHL (0x63446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
         18,
-    ACE_NTOHL (0x45786344), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x45786344),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e5365),
     ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     196, // encapsulation length
@@ -24871,27 +22724,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       180, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x63657074), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x63657074),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                 21,
-        ACE_NTOHL (0x45786365), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x45786365),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = ExceptionDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffd84, // negative offset (-636)
@@ -24900,18 +22753,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffffdc8, // negative offset (-568)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffdb0, // negative offset (-592)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffe10, // negative offset (-496)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
@@ -24920,9 +22773,9 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   15,
-  ACE_NTOHL (0x7075745f), 
-  ACE_NTOHL (0x65786365), 
-  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x7075745f),
+  ACE_NTOHL (0x65786365),
+  ACE_NTOHL (0x7074696f),
   ACE_NTOHL (0x6e730000),  // name = put_exceptions
     0xffffffff, // indirection
   0xfffffecc, // negative offset (-308)
@@ -24945,7 +22798,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ExtAttributeDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -24955,12 +22808,43 @@ void CORBA::ExtAttributeDescription::_tao_any_destructor (void *_tao_void_pointe
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ExtAttributeDescription
+    >;
+
+template class
+  TAO_Out_T<
+      ExtAttributeDescription,
+      ExtAttributeDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ExtAttributeDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ExtAttributeDescription, \
+      ExtAttributeDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ExtAttributeDef::_tao_class_id = 0;
 
 CORBA::ExtAttributeDef_ptr
-tao_CORBA_ExtAttributeDef_duplicate (
+CORBA::tao_ExtAttributeDef_life::tao_duplicate (
     CORBA::ExtAttributeDef_ptr p
   )
 {
@@ -24968,7 +22852,7 @@ tao_CORBA_ExtAttributeDef_duplicate (
 }
 
 void
-tao_CORBA_ExtAttributeDef_release (
+CORBA::tao_ExtAttributeDef_life::tao_release (
     CORBA::ExtAttributeDef_ptr p
   )
 {
@@ -24976,228 +22860,64 @@ tao_CORBA_ExtAttributeDef_release (
 }
 
 CORBA::ExtAttributeDef_ptr
-tao_CORBA_ExtAttributeDef_nil (
+CORBA::tao_ExtAttributeDef_life::tao_nil (
     void
   )
 {
   return CORBA::ExtAttributeDef::_nil ();
 }
 
-CORBA::ExtAttributeDef_ptr
-tao_CORBA_ExtAttributeDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ExtAttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ExtAttributeDef_upcast (
-    void *src
-  )
-{
-  CORBA::ExtAttributeDef **tmp =
-    ACE_static_cast (CORBA::ExtAttributeDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ExtAttributeDef_marshal (
+CORBA::tao_ExtAttributeDef_life::tao_marshal (
     CORBA::ExtAttributeDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ExtAttributeDef_var
-// *************************************************************
-
-CORBA::ExtAttributeDef_var::ExtAttributeDef_var (void)
-  : ptr_ (ExtAttributeDef::_nil ())
-{}
-
-::CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ExtAttributeDef_var::ExtAttributeDef_var (const ::CORBA::ExtAttributeDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ExtAttributeDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ExtAttributeDef_var::~ExtAttributeDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ExtAttributeDef_var &
-CORBA::ExtAttributeDef_var::operator= (ExtAttributeDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtAttributeDef_var &
-CORBA::ExtAttributeDef_var::operator= (const ::CORBA::ExtAttributeDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ExtAttributeDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ExtAttributeDef_var::operator const ::CORBA::ExtAttributeDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ExtAttributeDef_var::operator ::CORBA::ExtAttributeDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAttributeDef_ptr &
-CORBA::ExtAttributeDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAttributeDef_ptr &
-CORBA::ExtAttributeDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtAttributeDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ExtAttributeDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ExtAttributeDef::_nil ();
-  return val;
-}
-
-::CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef_var::tao_duplicate (ExtAttributeDef_ptr p)
-{
-  return ::CORBA::ExtAttributeDef::_duplicate (p);
+  return p->marshal (cdr);
 }
 
-void
-CORBA::ExtAttributeDef_var::tao_release (ExtAttributeDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef_var::tao_nil (void)
-{
-  return ::CORBA::ExtAttributeDef::_nil ();
-}
-
-::CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef_var::tao_narrow (
+CORBA::ExtAttributeDef_ptr
+CORBA::tao_ExtAttributeDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ExtAttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExtAttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ExtAttributeDef_var::tao_upcast (void *src)
+CORBA::tao_ExtAttributeDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ExtAttributeDef **tmp =
-    ACE_static_cast (ExtAttributeDef **, src);
+  CORBA::ExtAttributeDef **tmp =
+    ACE_static_cast (CORBA::ExtAttributeDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ExtAttributeDef_out
-// *************************************************************
-
-CORBA::ExtAttributeDef_out::ExtAttributeDef_out (ExtAttributeDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ExtAttributeDef::_nil ();
-}
-
-CORBA::ExtAttributeDef_out::ExtAttributeDef_out (ExtAttributeDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtAttributeDef::_nil ();
-}
-
-CORBA::ExtAttributeDef_out::ExtAttributeDef_out (const ::CORBA::ExtAttributeDef_out &p)
-  : ptr_ (ACE_const_cast (ExtAttributeDef_out &, p).ptr_)
-{}
-
-::CORBA::ExtAttributeDef_out &
-CORBA::ExtAttributeDef_out::operator= (const ::CORBA::ExtAttributeDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtAttributeDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ExtAttributeDef_out &
-CORBA::ExtAttributeDef_out::operator= (const ::CORBA::ExtAttributeDef_var &p)
-{
-  this->ptr_ = ::CORBA::ExtAttributeDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ExtAttributeDef_out &
-CORBA::ExtAttributeDef_out::operator= (ExtAttributeDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtAttributeDef_out::operator ::CORBA::ExtAttributeDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAttributeDef_ptr &
-CORBA::ExtAttributeDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAttributeDef_ptr
-CORBA::ExtAttributeDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ExtAttributeDef,
+        CORBA::tao_ExtAttributeDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ExtAttributeDef,
+        CORBA::tao_ExtAttributeDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ExtAttributeDef, \
+        CORBA::tao_ExtAttributeDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ExtAttributeDef, \
+        CORBA::tao_ExtAttributeDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -25217,29 +22937,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExcDescriptionSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get &);
-    
+
     ::CORBA::ExcDescriptionSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -25252,7 +22972,7 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -25264,11 +22984,11 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -25277,17 +22997,17 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::result (::CORBA::ExcDescriptionSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -25305,10 +23025,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -25317,15 +23037,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set &);
     const CORBA::ExcDescriptionSeq & get_exceptions_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ExcDescriptionSeq & get_exceptions
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       get_exceptions_ (get_exceptions)
@@ -25339,15 +23059,15 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->get_exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -25359,11 +23079,11 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -25372,7 +23092,7 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -25391,29 +23111,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExcDescriptionSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get &);
-    
+
     ::CORBA::ExcDescriptionSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -25426,7 +23146,7 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -25438,11 +23158,11 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -25451,17 +23171,17 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::result (::CORBA::ExcDescriptionSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -25479,10 +23199,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -25491,15 +23211,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set &);
     const CORBA::ExcDescriptionSeq & set_exceptions_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ExcDescriptionSeq & set_exceptions
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       set_exceptions_ (set_exceptions)
@@ -25513,15 +23233,15 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->set_exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -25533,11 +23253,11 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -25546,7 +23266,7 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -25565,29 +23285,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExtAttributeDescription * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute &);
-    
+
     ::CORBA::ExtAttributeDescription * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -25600,7 +23320,7 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -25612,11 +23332,11 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -25625,17 +23345,17 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::result (::CORBA::ExtAttributeDescription * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -25645,7 +23365,7 @@ TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute::result (::CORBA:
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ExtAttributeDef_Proxy_Impl::_TAO_ExtAttributeDef_Proxy_Impl (void)
@@ -25669,18 +23389,18 @@ CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::_TAO_ExtAttributeDef_Remote_Proxy
 {
   CORBA::ExcDescriptionSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ExcDescriptionSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ExcDescriptionSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_get_exceptions",
@@ -25688,22 +23408,22 @@ CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::_TAO_ExtAttributeDef_Remote_Proxy
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get _tao_ri (
           &_tao_call,
@@ -25711,14 +23431,14 @@ CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::_TAO_ExtAttributeDef_Remote_Proxy
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -25726,78 +23446,85 @@ CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::_TAO_ExtAttributeDef_Remote_Proxy
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExcDescriptionSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExcDescriptionSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -25807,59 +23534,57 @@ CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::_TAO_ExtAttributeDef_Remote_Proxy
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -25875,12 +23600,12 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_get_exceptions",
@@ -25888,22 +23613,22 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set _tao_ri (
           &_tao_call,
@@ -25912,14 +23637,14 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -25927,70 +23652,76 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << get_exceptions)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << get_exceptions)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -26000,56 +23731,54 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -26066,18 +23795,18 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
 {
   CORBA::ExcDescriptionSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ExcDescriptionSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ExcDescriptionSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_set_exceptions",
@@ -26085,22 +23814,22 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get _tao_ri (
           &_tao_call,
@@ -26108,14 +23837,14 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -26123,78 +23852,85 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExcDescriptionSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExcDescriptionSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -26204,59 +23940,57 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::get_exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -26272,12 +24006,12 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_set_exceptions",
@@ -26285,22 +24019,22 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set _tao_ri (
           &_tao_call,
@@ -26309,14 +24043,14 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -26324,70 +24058,76 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << set_exceptions)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << set_exceptions)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -26397,56 +24137,54 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -26463,18 +24201,18 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
 {
   CORBA::ExtAttributeDescription_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ExtAttributeDescription *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ExtAttributeDescription, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_attribute",
@@ -26482,22 +24220,22 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtAttributeDef_describe_attribute _tao_ri (
           &_tao_call,
@@ -26505,14 +24243,14 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -26520,78 +24258,85 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExtAttributeDescription * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExtAttributeDescription * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -26601,63 +24346,61 @@ void CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Impl::set_exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -26708,8 +24451,8 @@ CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ExtAttributeDef::ExtAttributeDef (int collocated)
 {
@@ -26725,14 +24468,14 @@ CORBA::ExtAttributeDef::CORBA_ExtAttributeDef_setup_collocation (int collocated)
   else
     this->the_TAO_ExtAttributeDef_Proxy_Broker_ =
       ::CORBA::_TAO_ExtAttributeDef_Remote_Proxy_Broker::the_TAO_ExtAttributeDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_AttributeDef_setup_collocation (collocated);
 }
 
 CORBA::ExtAttributeDef::~ExtAttributeDef (void)
 {}
 
-void 
+void
 CORBA::ExtAttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtAttributeDef *tmp = ACE_static_cast (ExtAttributeDef *, _tao_void_pointer);
@@ -26749,7 +24492,7 @@ CORBA::ExtAttributeDef::_narrow (
     {
       return ExtAttributeDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -26758,17 +24501,17 @@ CORBA::ExtAttributeDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ExtAttributeDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ExtAttributeDef::_nil ();
         }
     }
-  
+
   return ExtAttributeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ExtAttributeDef_ptr 
+CORBA::ExtAttributeDef_ptr
 CORBA::ExtAttributeDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -26778,18 +24521,18 @@ CORBA::ExtAttributeDef::_unchecked_narrow (
     {
       return ExtAttributeDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ExtAttributeDef_ptr default_proxy = ExtAttributeDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -26807,7 +24550,7 @@ CORBA::ExtAttributeDef::_unchecked_narrow (
               ExtAttributeDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -26820,10 +24563,10 @@ CORBA::ExtAttributeDef::_unchecked_narrow (
               ExtAttributeDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ExtAttributeDef_ptr,
@@ -26843,7 +24586,7 @@ CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -26890,7 +24633,7 @@ CORBA::ExtAttributeDef::_is_a (
 void *CORBA::ExtAttributeDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ExtAttributeDef)::_tao_class_id)
@@ -26951,12 +24694,12 @@ void *CORBA::ExtAttributeDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -26965,6 +24708,12 @@ const char* CORBA::ExtAttributeDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ExtAttributeDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ExtAttributeDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -26975,10 +24724,10 @@ const char* CORBA::ExtAttributeDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy =
     this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.get_exceptions (
       this
       ACE_ENV_ARG_PARAMETER
@@ -26996,10 +24745,10 @@ void CORBA::ExtAttributeDef::get_exceptions (
     CORBA::SystemException
   ))
 {
-  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy =
     this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.get_exceptions (
       this,
       get_exceptions
@@ -27017,10 +24766,10 @@ void CORBA::ExtAttributeDef::get_exceptions (
     CORBA::SystemException
   ))
 {
-  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy =
     this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.set_exceptions (
       this
       ACE_ENV_ARG_PARAMETER
@@ -27038,10 +24787,10 @@ void CORBA::ExtAttributeDef::set_exceptions (
     CORBA::SystemException
   ))
 {
-  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy =
     this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.set_exceptions (
       this,
       set_exceptions
@@ -27059,10 +24808,10 @@ void CORBA::ExtAttributeDef::set_exceptions (
     CORBA::SystemException
   ))
 {
-  _TAO_ExtAttributeDef_Proxy_Impl &proxy = 
+  _TAO_ExtAttributeDef_Proxy_Impl &proxy =
     this->the_TAO_ExtAttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_attribute (
       this
       ACE_ENV_ARG_PARAMETER
@@ -27076,20 +24825,20 @@ static const CORBA::Long _oc_CORBA_ExtAttributeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74417474), 
-  ACE_NTOHL (0x72696275), 
-  ACE_NTOHL (0x74654465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x74417474),
+  ACE_NTOHL (0x72696275),
+  ACE_NTOHL (0x74654465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDef:1.0
     16,
-  ACE_NTOHL (0x45787441), 
-  ACE_NTOHL (0x74747269), 
-  ACE_NTOHL (0x62757465), 
+  ACE_NTOHL (0x45787441),
+  ACE_NTOHL (0x74747269),
+  ACE_NTOHL (0x62757465),
   ACE_NTOHL (0x44656600),  // name = ExtAttributeDef
   };
 
@@ -27117,28 +24866,28 @@ static const CORBA::Long _oc_CORBA_OperationMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f70), 
-  ACE_NTOHL (0x65726174), 
-  ACE_NTOHL (0x696f6e4d), 
-  ACE_NTOHL (0x6f64653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4f70),
+  ACE_NTOHL (0x65726174),
+  ACE_NTOHL (0x696f6e4d),
+  ACE_NTOHL (0x6f64653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
   14,
-  ACE_NTOHL (0x4f706572), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e4d6f64), 
+  ACE_NTOHL (0x4f706572),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e4d6f64),
   ACE_NTOHL (0x65000000),  // name = OperationMode
   2, // member count
   10,
-  ACE_NTOHL (0x4f505f4e), 
-  ACE_NTOHL (0x4f524d41), 
+  ACE_NTOHL (0x4f505f4e),
+  ACE_NTOHL (0x4f524d41),
   ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
   10,
-  ACE_NTOHL (0x4f505f4f), 
-  ACE_NTOHL (0x4e455741), 
+  ACE_NTOHL (0x4f505f4f),
+  ACE_NTOHL (0x4e455741),
   ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
   };
 
@@ -27166,108 +24915,108 @@ static const CORBA::Long _oc_CORBA_ParameterDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5061), 
-  ACE_NTOHL (0x72616d65), 
-  ACE_NTOHL (0x74657244), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5061),
+  ACE_NTOHL (0x72616d65),
+  ACE_NTOHL (0x74657244),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
     21,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x72446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x72446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = ParameterDescription
   4, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   9,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x5f646566), 
+  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x5f646566),
   ACE_NTOHL (0x0),  // name = type_def
     CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4944), 
-    ACE_NTOHL (0x4c547970), 
-    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4944),
+    ACE_NTOHL (0x4c547970),
+    ACE_NTOHL (0x653a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
         8,
-    ACE_NTOHL (0x49444c54), 
+    ACE_NTOHL (0x49444c54),
     ACE_NTOHL (0x79706500),  // name = IDLType
-    
+
   5,
-  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x6d6f6465),
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5061), 
-    ACE_NTOHL (0x72616d65), 
-    ACE_NTOHL (0x7465724d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5061),
+    ACE_NTOHL (0x72616d65),
+    ACE_NTOHL (0x7465724d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
     14,
-    ACE_NTOHL (0x50617261), 
-    ACE_NTOHL (0x6d657465), 
-    ACE_NTOHL (0x724d6f64), 
+    ACE_NTOHL (0x50617261),
+    ACE_NTOHL (0x6d657465),
+    ACE_NTOHL (0x724d6f64),
     ACE_NTOHL (0x65000000),  // name = ParameterMode
     3, // member count
     9,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
     ACE_NTOHL (0x0),  // name = PARAM_IN
     10,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f4f55), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f4f55),
     ACE_NTOHL (0x54000000),  // name = PARAM_OUT
     12,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-    
+
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterDescription (
@@ -27287,7 +25036,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ParameterDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -27296,117 +25045,70 @@ void CORBA::ParameterDescription::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_
+template class
+  TAO_Var_Var_T<
+      ParameterDescription
+    >;
 
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ParameterDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ParameterDescription *old =
-        ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Out_T<
+      ParameterDescription,
+      ParameterDescription_var
+    >;
 
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ParameterDescription *tmp =
-    ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ParameterDescription \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      ParameterDescription, \
+      ParameterDescription_var \
+    >
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ParDescriptionSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::ParDescriptionSeq::ParDescriptionSeq (void)
 {}
 
 CORBA::ParDescriptionSeq::ParDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ParameterDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::ParameterDescription
+      >
+    (max)
 {}
 
 CORBA::ParDescriptionSeq::ParDescriptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ParameterDescription *buffer,
+    CORBA::ParameterDescription* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ParameterDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::ParameterDescription
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ParDescriptionSeq::ParDescriptionSeq (const ParDescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ParameterDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::ParameterDescription
+      >
+    (seq)
 {}
 
-CORBA::ParDescriptionSeq::~ParDescriptionSeq (void) // dtor
+CORBA::ParDescriptionSeq::~ParDescriptionSeq (void)
 {}
 
 void CORBA::ParDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -27415,7 +25117,37 @@ void CORBA::ParDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      ParDescriptionSeq,
+      CORBA::ParameterDescription
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ParDescriptionSeq,
+      ParDescriptionSeq_var,
+      CORBA::ParameterDescription
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ParDescriptionSeq, \
+      CORBA::ParameterDescription \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ParDescriptionSeq, \
+      ParDescriptionSeq_var, \
+      CORBA::ParameterDescription \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -27424,21 +25156,21 @@ static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5061), 
-  ACE_NTOHL (0x72446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5061),
+  ACE_NTOHL (0x72446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x5365713a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
     18,
-  ACE_NTOHL (0x50617244), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e5365), 
+  ACE_NTOHL (0x50617244),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e5365),
   ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   416, // encapsulation length
@@ -27447,108 +25179,108 @@ static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
     400, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5061), 
-      ACE_NTOHL (0x72616d65), 
-      ACE_NTOHL (0x74657244), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f5061),
+      ACE_NTOHL (0x72616d65),
+      ACE_NTOHL (0x74657244),
+      ACE_NTOHL (0x65736372),
+      ACE_NTOHL (0x69707469),
+      ACE_NTOHL (0x6f6e3a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
             21,
-      ACE_NTOHL (0x50617261), 
-      ACE_NTOHL (0x6d657465), 
-      ACE_NTOHL (0x72446573), 
-      ACE_NTOHL (0x63726970), 
-      ACE_NTOHL (0x74696f6e), 
+      ACE_NTOHL (0x50617261),
+      ACE_NTOHL (0x6d657465),
+      ACE_NTOHL (0x72446573),
+      ACE_NTOHL (0x63726970),
+      ACE_NTOHL (0x74696f6e),
       ACE_NTOHL (0x0),  // name = ParameterDescription
       4, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x74797065),
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       9,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x5f646566), 
+      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x5f646566),
       ACE_NTOHL (0x0),  // name = type_def
             CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4944), 
-        ACE_NTOHL (0x4c547970), 
-        ACE_NTOHL (0x653a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4944),
+        ACE_NTOHL (0x4c547970),
+        ACE_NTOHL (0x653a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-        ACE_NTOHL (0x49444c54), 
+        ACE_NTOHL (0x49444c54),
         ACE_NTOHL (0x79706500),  // name = IDLType
-        
+
       5,
-      ACE_NTOHL (0x6d6f6465), 
+      ACE_NTOHL (0x6d6f6465),
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5061), 
-        ACE_NTOHL (0x72616d65), 
-        ACE_NTOHL (0x7465724d), 
-        ACE_NTOHL (0x6f64653a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5061),
+        ACE_NTOHL (0x72616d65),
+        ACE_NTOHL (0x7465724d),
+        ACE_NTOHL (0x6f64653a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
         14,
-        ACE_NTOHL (0x50617261), 
-        ACE_NTOHL (0x6d657465), 
-        ACE_NTOHL (0x724d6f64), 
+        ACE_NTOHL (0x50617261),
+        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x724d6f64),
         ACE_NTOHL (0x65000000),  // name = ParameterMode
         3, // member count
         9,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f494e), 
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f494e),
         ACE_NTOHL (0x0),  // name = PARAM_IN
         10,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f4f55), 
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f4f55),
         ACE_NTOHL (0x54000000),  // name = PARAM_OUT
         12,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f494e), 
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f494e),
         ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-        
+
 
     0U,
 
@@ -27578,40 +25310,40 @@ static const CORBA::Long _oc_CORBA_ContextIdentifier[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746578), 
-  ACE_NTOHL (0x74496465), 
-  ACE_NTOHL (0x6e746966), 
-  ACE_NTOHL (0x6965723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746578),
+  ACE_NTOHL (0x74496465),
+  ACE_NTOHL (0x6e746966),
+  ACE_NTOHL (0x6965723a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
     18,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x65787449), 
-  ACE_NTOHL (0x64656e74), 
-  ACE_NTOHL (0x69666965), 
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x65787449),
+  ACE_NTOHL (0x64656e74),
+  ACE_NTOHL (0x69666965),
   ACE_NTOHL (0x72000000),  // name = ContextIdentifier
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
 };
@@ -27633,61 +25365,33 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-#if !defined (_CORBA_CONTEXTIDSEQ_CS_)
-#define _CORBA_CONTEXTIDSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ContextIdSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::ContextIdSeq::ContextIdSeq (void)
 {}
 
 CORBA::ContextIdSeq::ContextIdSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_String_Sequence
+    (max)
 {}
 
 CORBA::ContextIdSeq::ContextIdSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    char * *buffer,
+    char ** buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_String_Sequence
+    (max, length, buffer, release)
 {}
 
 CORBA::ContextIdSeq::ContextIdSeq (const ContextIdSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_String_Sequence
+    (seq)
 {}
 
-CORBA::ContextIdSeq::~ContextIdSeq (void) // dtor
+CORBA::ContextIdSeq::~ContextIdSeq (void)
 {}
 
 void CORBA::ContextIdSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -27696,7 +25400,37 @@ void CORBA::ContextIdSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::ContextIdSeq,
+      TAO_SeqElem_String_Manager
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::ContextIdSeq,
+      CORBA::ContextIdSeq_var,
+      TAO_SeqElem_String_Manager
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_MngSeq_Var_T< \
+      CORBA::ContextIdSeq, \
+      TAO_SeqElem_String_Manager \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      CORBA::ContextIdSeq, \
+      CORBA::ContextIdSeq_var, \
+      TAO_SeqElem_String_Manager \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -27705,19 +25439,19 @@ static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746578), 
-  ACE_NTOHL (0x74496453), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746578),
+  ACE_NTOHL (0x74496453),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
     13,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x65787449), 
-  ACE_NTOHL (0x64536571), 
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x65787449),
+  ACE_NTOHL (0x64536571),
   ACE_NTOHL (0x0),  // name = ContextIdSeq
     CORBA::tk_sequence, // typecode kind
   164, // encapsulation length
@@ -27726,40 +25460,40 @@ static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
     148, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       40,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f436f), 
-      ACE_NTOHL (0x6e746578), 
-      ACE_NTOHL (0x74496465), 
-      ACE_NTOHL (0x6e746966), 
-      ACE_NTOHL (0x6965723a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f436f),
+      ACE_NTOHL (0x6e746578),
+      ACE_NTOHL (0x74496465),
+      ACE_NTOHL (0x6e746966),
+      ACE_NTOHL (0x6965723a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
             18,
-      ACE_NTOHL (0x436f6e74), 
-      ACE_NTOHL (0x65787449), 
-      ACE_NTOHL (0x64656e74), 
-      ACE_NTOHL (0x69666965), 
+      ACE_NTOHL (0x436f6e74),
+      ACE_NTOHL (0x65787449),
+      ACE_NTOHL (0x64656e74),
+      ACE_NTOHL (0x69666965),
       ACE_NTOHL (0x72000000),  // name = ContextIdentifier
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
 
@@ -27790,7 +25524,7 @@ TAO_NAMESPACE_END
 int CORBA::OperationDef::_tao_class_id = 0;
 
 CORBA::OperationDef_ptr
-tao_CORBA_OperationDef_duplicate (
+CORBA::tao_OperationDef_life::tao_duplicate (
     CORBA::OperationDef_ptr p
   )
 {
@@ -27798,7 +25532,7 @@ tao_CORBA_OperationDef_duplicate (
 }
 
 void
-tao_CORBA_OperationDef_release (
+CORBA::tao_OperationDef_life::tao_release (
     CORBA::OperationDef_ptr p
   )
 {
@@ -27806,228 +25540,64 @@ tao_CORBA_OperationDef_release (
 }
 
 CORBA::OperationDef_ptr
-tao_CORBA_OperationDef_nil (
+CORBA::tao_OperationDef_life::tao_nil (
     void
   )
 {
   return CORBA::OperationDef::_nil ();
 }
 
-CORBA::OperationDef_ptr
-tao_CORBA_OperationDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::OperationDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_OperationDef_upcast (
-    void *src
-  )
-{
-  CORBA::OperationDef **tmp =
-    ACE_static_cast (CORBA::OperationDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_OperationDef_marshal (
+CORBA::tao_OperationDef_life::tao_marshal (
     CORBA::OperationDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::OperationDef_var
-// *************************************************************
-
-CORBA::OperationDef_var::OperationDef_var (void)
-  : ptr_ (OperationDef::_nil ())
-{}
-
-::CORBA::OperationDef_ptr
-CORBA::OperationDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::OperationDef_var::OperationDef_var (const ::CORBA::OperationDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (OperationDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::OperationDef_var::~OperationDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::OperationDef_var &
-CORBA::OperationDef_var::operator= (OperationDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::OperationDef_var &
-CORBA::OperationDef_var::operator= (const ::CORBA::OperationDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::OperationDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::OperationDef_var::operator const ::CORBA::OperationDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::OperationDef_var::operator ::CORBA::OperationDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::OperationDef_ptr
-CORBA::OperationDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::OperationDef_ptr
-CORBA::OperationDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::OperationDef_ptr &
-CORBA::OperationDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::OperationDef_ptr &
-CORBA::OperationDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::OperationDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::OperationDef_ptr
-CORBA::OperationDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::OperationDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::OperationDef::_nil ();
-  return val;
-}
-
-::CORBA::OperationDef_ptr
-CORBA::OperationDef_var::tao_duplicate (OperationDef_ptr p)
-{
-  return ::CORBA::OperationDef::_duplicate (p);
+  return p->marshal (cdr);
 }
 
-void
-CORBA::OperationDef_var::tao_release (OperationDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::OperationDef_ptr
-CORBA::OperationDef_var::tao_nil (void)
-{
-  return ::CORBA::OperationDef::_nil ();
-}
-
-::CORBA::OperationDef_ptr
-CORBA::OperationDef_var::tao_narrow (
+CORBA::OperationDef_ptr
+CORBA::tao_OperationDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::OperationDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::OperationDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::OperationDef_var::tao_upcast (void *src)
+CORBA::tao_OperationDef_cast::tao_upcast (
+    void *src
+  )
 {
-  OperationDef **tmp =
-    ACE_static_cast (OperationDef **, src);
+  CORBA::OperationDef **tmp =
+    ACE_static_cast (CORBA::OperationDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::OperationDef_out
-// *************************************************************
-
-CORBA::OperationDef_out::OperationDef_out (OperationDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::OperationDef::_nil ();
-}
-
-CORBA::OperationDef_out::OperationDef_out (OperationDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::OperationDef::_nil ();
-}
-
-CORBA::OperationDef_out::OperationDef_out (const ::CORBA::OperationDef_out &p)
-  : ptr_ (ACE_const_cast (OperationDef_out &, p).ptr_)
-{}
-
-::CORBA::OperationDef_out &
-CORBA::OperationDef_out::operator= (const ::CORBA::OperationDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (OperationDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::OperationDef_out &
-CORBA::OperationDef_out::operator= (const ::CORBA::OperationDef_var &p)
-{
-  this->ptr_ = ::CORBA::OperationDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::OperationDef_out &
-CORBA::OperationDef_out::operator= (OperationDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::OperationDef_out::operator ::CORBA::OperationDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::OperationDef_ptr &
-CORBA::OperationDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::OperationDef_ptr
-CORBA::OperationDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::OperationDef,
+        CORBA::tao_OperationDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::OperationDef,
+        CORBA::tao_OperationDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::OperationDef, \
+        CORBA::tao_OperationDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::OperationDef, \
+        CORBA::tao_OperationDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -28047,29 +25617,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_OperationDef_result_get (const TAO_ClientRequestInfo_CORBA_OperationDef_result_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_result_get &);
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_result_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -28082,7 +25652,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -28094,11 +25664,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28107,17 +25677,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -28134,29 +25704,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (const TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -28169,7 +25739,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -28181,11 +25751,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28194,17 +25764,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -28222,10 +25792,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -28234,15 +25804,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set &);
     CORBA::IDLType_ptr result_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr result_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       result_def_ (result_def)
@@ -28256,15 +25826,15 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->result_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -28276,11 +25846,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28289,7 +25859,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -28308,29 +25878,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ParDescriptionSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_OperationDef_params_get (const TAO_ClientRequestInfo_CORBA_OperationDef_params_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_params_get &);
-    
+
     ::CORBA::ParDescriptionSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_params_get::TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -28343,7 +25913,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -28355,11 +25925,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28368,17 +25938,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (::CORBA::ParDescriptionSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -28396,10 +25966,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -28408,15 +25978,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_params_set &);
     const CORBA::ParDescriptionSeq & params_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_params_set::TAO_ClientRequestInfo_CORBA_OperationDef_params_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ParDescriptionSeq & params
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       params_ (params)
@@ -28430,15 +26000,15 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->params_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -28450,11 +26020,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28463,7 +26033,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -28482,29 +26052,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::OperationMode result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (const TAO_ClientRequestInfo_CORBA_OperationDef_mode_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_mode_get &);
-    
+
     ::CORBA::OperationMode _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -28517,7 +26087,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -28529,11 +26099,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28542,17 +26112,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (::CORBA::OperationMode result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -28570,10 +26140,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -28582,15 +26152,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_mode_set &);
     const CORBA::OperationMode & mode_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::TAO_ClientRequestInfo_CORBA_OperationDef_mode_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::OperationMode & mode
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       mode_ (mode)
@@ -28604,15 +26174,15 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (ACE_ENV_SINGLE_ARG
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -28624,11 +26194,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (ACE_ENV_SINGLE_AR
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28637,7 +26207,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (ACE_ENV_SINGLE_ARG_DE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -28656,29 +26226,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ContextIdSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (const TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get &);
-    
+
     ::CORBA::ContextIdSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -28691,7 +26261,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -28703,11 +26273,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28716,17 +26286,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (::CORBA::ContextIdSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -28744,10 +26314,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -28756,15 +26326,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set &);
     const CORBA::ContextIdSeq & contexts_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ContextIdSeq & contexts
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       contexts_ (contexts)
@@ -28778,15 +26348,15 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->contexts_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -28798,11 +26368,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28811,7 +26381,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -28830,29 +26400,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExceptionDefSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (const TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get &);
-    
+
     ::CORBA::ExceptionDefSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -28865,7 +26435,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -28877,11 +26447,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28890,17 +26460,17 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (::CORBA::ExceptionDefSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -28918,10 +26488,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -28930,15 +26500,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set &);
     const CORBA::ExceptionDefSeq & exceptions_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ExceptionDefSeq & exceptions
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       exceptions_ (exceptions)
@@ -28952,15 +26522,15 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -28972,11 +26542,11 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -28985,7 +26555,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -28997,7 +26567,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_OperationDef_Proxy_Impl::_TAO_OperationDef_Proxy_Impl (void)
@@ -29021,12 +26591,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_result",
@@ -29034,22 +26604,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_result_get _tao_ri (
           &_tao_call,
@@ -29057,14 +26627,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -29072,78 +26642,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -29153,59 +26730,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -29221,12 +26796,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_result_def",
@@ -29234,22 +26809,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get _tao_ri (
           &_tao_call,
@@ -29257,14 +26832,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -29272,78 +26847,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -29353,59 +26935,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -29421,12 +27001,12 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_result_def",
@@ -29434,22 +27014,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set _tao_ri (
           &_tao_call,
@@ -29458,14 +27038,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -29473,70 +27053,76 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << result_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << result_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -29546,56 +27132,54 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -29612,18 +27196,18 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
 {
   CORBA::ParDescriptionSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ParDescriptionSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ParDescriptionSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_params",
@@ -29631,22 +27215,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_params_get _tao_ri (
           &_tao_call,
@@ -29654,14 +27238,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -29669,78 +27253,85 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ParDescriptionSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ParDescriptionSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -29750,59 +27341,57 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -29818,12 +27407,12 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_params",
@@ -29831,22 +27420,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_params_set _tao_ri (
           &_tao_call,
@@ -29855,14 +27444,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -29870,70 +27459,76 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << params)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << params)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -29943,56 +27538,54 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -30009,12 +27602,12 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
 {
   CORBA::OperationMode _tao_retval = (CORBA::OperationMode)0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_mode",
@@ -30022,22 +27615,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_mode_get _tao_ri (
           &_tao_call,
@@ -30045,14 +27638,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -30060,77 +27653,84 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::OperationMode _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::OperationMode _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -30140,59 +27740,57 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::params (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -30208,12 +27806,12 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_mode",
@@ -30221,22 +27819,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_mode_set _tao_ri (
           &_tao_call,
@@ -30245,14 +27843,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -30260,70 +27858,76 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << mode)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << mode)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -30333,56 +27937,54 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -30399,18 +28001,18 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
 {
   CORBA::ContextIdSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ContextIdSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ContextIdSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_contexts",
@@ -30418,22 +28020,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get _tao_ri (
           &_tao_call,
@@ -30441,14 +28043,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -30456,78 +28058,85 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ContextIdSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ContextIdSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -30537,59 +28146,57 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::mode (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -30605,12 +28212,12 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_contexts",
@@ -30618,22 +28225,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set _tao_ri (
           &_tao_call,
@@ -30642,14 +28249,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -30657,70 +28264,76 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << contexts)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << contexts)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -30730,56 +28343,54 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -30796,18 +28407,18 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
 {
   CORBA::ExceptionDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ExceptionDefSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ExceptionDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_exceptions",
@@ -30815,22 +28426,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get _tao_ri (
           &_tao_call,
@@ -30838,14 +28449,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -30853,78 +28464,85 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExceptionDefSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExceptionDefSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -30934,59 +28552,57 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -31002,12 +28618,12 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_exceptions",
@@ -31015,22 +28631,22 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set _tao_ri (
           &_tao_call,
@@ -31039,14 +28655,14 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -31054,70 +28670,76 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << exceptions)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << exceptions)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -31127,61 +28749,59 @@ void CORBA::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -31232,8 +28852,8 @@ CORBA::_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::OperationDef::OperationDef (int collocated)
 {
@@ -31249,14 +28869,14 @@ CORBA::OperationDef::CORBA_OperationDef_setup_collocation (int collocated)
   else
     this->the_TAO_OperationDef_Proxy_Broker_ =
       ::CORBA::_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
 CORBA::OperationDef::~OperationDef (void)
 {}
 
-void 
+void
 CORBA::OperationDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   OperationDef *tmp = ACE_static_cast (OperationDef *, _tao_void_pointer);
@@ -31273,7 +28893,7 @@ CORBA::OperationDef::_narrow (
     {
       return OperationDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -31282,17 +28902,17 @@ CORBA::OperationDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (OperationDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return OperationDef::_nil ();
         }
     }
-  
+
   return OperationDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::OperationDef_ptr 
+CORBA::OperationDef_ptr
 CORBA::OperationDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -31302,18 +28922,18 @@ CORBA::OperationDef::_unchecked_narrow (
     {
       return OperationDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       OperationDef_ptr default_proxy = OperationDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -31331,7 +28951,7 @@ CORBA::OperationDef::_unchecked_narrow (
               OperationDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -31344,10 +28964,10 @@ CORBA::OperationDef::_unchecked_narrow (
               OperationDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           OperationDef_ptr,
@@ -31367,7 +28987,7 @@ CORBA::OperationDef::_duplicate (OperationDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -31410,7 +29030,7 @@ CORBA::OperationDef::_is_a (
 void *CORBA::OperationDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, OperationDef)::_tao_class_id)
@@ -31457,12 +29077,12 @@ void *CORBA::OperationDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -31471,6 +29091,12 @@ const char* CORBA::OperationDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/OperationDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::OperationDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -31481,10 +29107,10 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.result (
       this
       ACE_ENV_ARG_PARAMETER
@@ -31501,10 +29127,10 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.result_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -31522,10 +29148,10 @@ void CORBA::OperationDef::result_def (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.result_def (
       this,
       result_def
@@ -31543,10 +29169,10 @@ void CORBA::OperationDef::result_def (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.params (
       this
       ACE_ENV_ARG_PARAMETER
@@ -31564,10 +29190,10 @@ void CORBA::OperationDef::params (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.params (
       this,
       params
@@ -31585,10 +29211,10 @@ void CORBA::OperationDef::params (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::OperationMode)0);
-  
+
   return proxy.mode (
       this
       ACE_ENV_ARG_PARAMETER
@@ -31606,10 +29232,10 @@ void CORBA::OperationDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.mode (
       this,
       mode
@@ -31627,10 +29253,10 @@ void CORBA::OperationDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.contexts (
       this
       ACE_ENV_ARG_PARAMETER
@@ -31648,10 +29274,10 @@ void CORBA::OperationDef::contexts (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.contexts (
       this,
       contexts
@@ -31669,10 +29295,10 @@ void CORBA::OperationDef::contexts (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.exceptions (
       this
       ACE_ENV_ARG_PARAMETER
@@ -31690,10 +29316,10 @@ void CORBA::OperationDef::exceptions (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
+  _TAO_OperationDef_Proxy_Impl &proxy =
     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.exceptions (
       this,
       exceptions
@@ -31708,19 +29334,19 @@ static const CORBA::Long _oc_CORBA_OperationDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f70), 
-  ACE_NTOHL (0x65726174), 
-  ACE_NTOHL (0x696f6e44), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4f70),
+  ACE_NTOHL (0x65726174),
+  ACE_NTOHL (0x696f6e44),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDef:1.0
     13,
-  ACE_NTOHL (0x4f706572), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e446566), 
+  ACE_NTOHL (0x4f706572),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e446566),
   ACE_NTOHL (0x0),  // name = OperationDef
   };
 
@@ -31748,46 +29374,46 @@ static const CORBA::Long _oc_CORBA_OperationDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f70), 
-  ACE_NTOHL (0x65726174), 
-  ACE_NTOHL (0x696f6e44), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4f70),
+  ACE_NTOHL (0x65726174),
+  ACE_NTOHL (0x696f6e44),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
     21,
-  ACE_NTOHL (0x4f706572), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x4f706572),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = OperationDescription
   9, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -31796,109 +29422,109 @@ static const CORBA::Long _oc_CORBA_OperationDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   7,
-  ACE_NTOHL (0x72657375), 
+  ACE_NTOHL (0x72657375),
   ACE_NTOHL (0x6c740000),  // name = result
     CORBA::tk_TypeCode,
 
   5,
-  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x6d6f6465),
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x65726174), 
-    ACE_NTOHL (0x696f6e4d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x65726174),
+    ACE_NTOHL (0x696f6e4d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
     14,
-    ACE_NTOHL (0x4f706572), 
-    ACE_NTOHL (0x6174696f), 
-    ACE_NTOHL (0x6e4d6f64), 
+    ACE_NTOHL (0x4f706572),
+    ACE_NTOHL (0x6174696f),
+    ACE_NTOHL (0x6e4d6f64),
     ACE_NTOHL (0x65000000),  // name = OperationMode
     2, // member count
     10,
-    ACE_NTOHL (0x4f505f4e), 
-    ACE_NTOHL (0x4f524d41), 
+    ACE_NTOHL (0x4f505f4e),
+    ACE_NTOHL (0x4f524d41),
     ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
     10,
-    ACE_NTOHL (0x4f505f4f), 
-    ACE_NTOHL (0x4e455741), 
+    ACE_NTOHL (0x4f505f4f),
+    ACE_NTOHL (0x4e455741),
     ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-    
+
   9,
-  ACE_NTOHL (0x636f6e74), 
-  ACE_NTOHL (0x65787473), 
+  ACE_NTOHL (0x636f6e74),
+  ACE_NTOHL (0x65787473),
   ACE_NTOHL (0x0),  // name = contexts
     CORBA::tk_alias, // typecode kind for typedefs
   168, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f436f), 
-    ACE_NTOHL (0x6e746578), 
-    ACE_NTOHL (0x74496453), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f436f),
+    ACE_NTOHL (0x6e746578),
+    ACE_NTOHL (0x74496453),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
         13,
-    ACE_NTOHL (0x436f6e74), 
-    ACE_NTOHL (0x65787449), 
-    ACE_NTOHL (0x64536571), 
+    ACE_NTOHL (0x436f6e74),
+    ACE_NTOHL (0x65787449),
+    ACE_NTOHL (0x64536571),
     ACE_NTOHL (0x0),  // name = ContextIdSeq
         CORBA::tk_sequence, // typecode kind
     96, // encapsulation length
@@ -31907,21 +29533,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       80, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f436f), 
-        ACE_NTOHL (0x6e746578), 
-        ACE_NTOHL (0x74496465), 
-        ACE_NTOHL (0x6e746966), 
-        ACE_NTOHL (0x6965723a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f436f),
+        ACE_NTOHL (0x6e746578),
+        ACE_NTOHL (0x74496465),
+        ACE_NTOHL (0x6e746966),
+        ACE_NTOHL (0x6965723a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                 18,
-        ACE_NTOHL (0x436f6e74), 
-        ACE_NTOHL (0x65787449), 
-        ACE_NTOHL (0x64656e74), 
-        ACE_NTOHL (0x69666965), 
+        ACE_NTOHL (0x436f6e74),
+        ACE_NTOHL (0x65787449),
+        ACE_NTOHL (0x64656e74),
+        ACE_NTOHL (0x69666965),
         ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                 0xffffffff, // indirection
         0xfffffdac, // negative offset (-596)
@@ -31930,28 +29556,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x70617261), 
-  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x70617261),
+  ACE_NTOHL (0x6d657465),
   ACE_NTOHL (0x72730000),  // name = parameters
     CORBA::tk_alias, // typecode kind for typedefs
   428, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5061), 
-    ACE_NTOHL (0x72446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5061),
+    ACE_NTOHL (0x72446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
         18,
-    ACE_NTOHL (0x50617244), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x50617244),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e5365),
     ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     348, // encapsulation length
@@ -31960,117 +29586,117 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       332, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5061), 
-        ACE_NTOHL (0x72616d65), 
-        ACE_NTOHL (0x74657244), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5061),
+        ACE_NTOHL (0x72616d65),
+        ACE_NTOHL (0x74657244),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                 21,
-        ACE_NTOHL (0x50617261), 
-        ACE_NTOHL (0x6d657465), 
-        ACE_NTOHL (0x72446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x50617261),
+        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x72446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = ParameterDescription
         4, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffccc, // negative offset (-820)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x5f646566), 
+        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x5f646566),
         ACE_NTOHL (0x0),  // name = type_def
                 CORBA::tk_objref, // typecode kind
         52, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4944), 
-          ACE_NTOHL (0x4c547970), 
-          ACE_NTOHL (0x653a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4944),
+          ACE_NTOHL (0x4c547970),
+          ACE_NTOHL (0x653a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                     8,
-          ACE_NTOHL (0x49444c54), 
+          ACE_NTOHL (0x49444c54),
           ACE_NTOHL (0x79706500),  // name = IDLType
-          
+
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72616d65), 
-          ACE_NTOHL (0x7465724d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72616d65),
+          ACE_NTOHL (0x7465724d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
           14,
-          ACE_NTOHL (0x50617261), 
-          ACE_NTOHL (0x6d657465), 
-          ACE_NTOHL (0x724d6f64), 
+          ACE_NTOHL (0x50617261),
+          ACE_NTOHL (0x6d657465),
+          ACE_NTOHL (0x724d6f64),
           ACE_NTOHL (0x65000000),  // name = ParameterMode
           3, // member count
           9,
-          ACE_NTOHL (0x50415241), 
-          ACE_NTOHL (0x4d5f494e), 
+          ACE_NTOHL (0x50415241),
+          ACE_NTOHL (0x4d5f494e),
           ACE_NTOHL (0x0),  // name = PARAM_IN
           10,
-          ACE_NTOHL (0x50415241), 
-          ACE_NTOHL (0x4d5f4f55), 
+          ACE_NTOHL (0x50415241),
+          ACE_NTOHL (0x4d5f4f55),
           ACE_NTOHL (0x54000000),  // name = PARAM_OUT
           12,
-          ACE_NTOHL (0x50415241), 
-          ACE_NTOHL (0x4d5f494e), 
+          ACE_NTOHL (0x50415241),
+          ACE_NTOHL (0x4d5f494e),
           ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-          
+
 
       0U,
 
 
   11,
-  ACE_NTOHL (0x65786365), 
-  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x65786365),
+  ACE_NTOHL (0x7074696f),
   ACE_NTOHL (0x6e730000),  // name = exceptions
     CORBA::tk_alias, // typecode kind for typedefs
   276, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4578), 
-    ACE_NTOHL (0x63446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4578),
+    ACE_NTOHL (0x63446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
         18,
-    ACE_NTOHL (0x45786344), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x45786344),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e5365),
     ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     196, // encapsulation length
@@ -32079,27 +29705,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       180, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x63657074), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x63657074),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                 21,
-        ACE_NTOHL (0x45786365), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x45786365),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = ExceptionDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffb08, // negative offset (-1272)
@@ -32108,18 +29734,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffffb4c, // negative offset (-1204)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffb34, // negative offset (-1228)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffb94, // negative offset (-1132)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
@@ -32146,7 +29772,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::OperationDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -32155,61 +29781,64 @@ void CORBA::OperationDescription::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#if !defined (_CORBA_REPOSITORYIDSEQ_CS_)
-#define _CORBA_REPOSITORYIDSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-// *************************************************************
-// CORBA::RepositoryIdSeq
-// *************************************************************
+template class
+  TAO_Var_Var_T<
+      OperationDescription
+    >;
+
+template class
+  TAO_Out_T<
+      OperationDescription,
+      OperationDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      OperationDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      OperationDescription, \
+      OperationDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::RepositoryIdSeq::RepositoryIdSeq (void)
 {}
 
 CORBA::RepositoryIdSeq::RepositoryIdSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_String_Sequence
+    (max)
 {}
 
 CORBA::RepositoryIdSeq::RepositoryIdSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    char * *buffer,
+    char ** buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_String_Sequence
+    (max, length, buffer, release)
 {}
 
 CORBA::RepositoryIdSeq::RepositoryIdSeq (const RepositoryIdSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_String_Sequence
+    (seq)
 {}
 
-CORBA::RepositoryIdSeq::~RepositoryIdSeq (void) // dtor
+CORBA::RepositoryIdSeq::~RepositoryIdSeq (void)
 {}
 
 void CORBA::RepositoryIdSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -32218,7 +29847,37 @@ void CORBA::RepositoryIdSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::RepositoryIdSeq,
+      TAO_SeqElem_String_Manager
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::RepositoryIdSeq,
+      CORBA::RepositoryIdSeq_var,
+      TAO_SeqElem_String_Manager
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_MngSeq_Var_T< \
+      CORBA::RepositoryIdSeq, \
+      TAO_SeqElem_String_Manager \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      CORBA::RepositoryIdSeq, \
+      CORBA::RepositoryIdSeq_var, \
+      TAO_SeqElem_String_Manager \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -32227,20 +29886,20 @@ static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x49645365), 
-  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x49645365),
+  ACE_NTOHL (0x713a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
     16,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
-  ACE_NTOHL (0x72794964), 
+  ACE_NTOHL (0x5265706f),
+  ACE_NTOHL (0x7369746f),
+  ACE_NTOHL (0x72794964),
   ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
     CORBA::tk_sequence, // typecode kind
   88, // encapsulation length
@@ -32249,21 +29908,21 @@ static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
     72, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x49643a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x49643a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
             13,
-      ACE_NTOHL (0x5265706f), 
-      ACE_NTOHL (0x7369746f), 
-      ACE_NTOHL (0x72794964), 
+      ACE_NTOHL (0x5265706f),
+      ACE_NTOHL (0x7369746f),
+      ACE_NTOHL (0x72794964),
       ACE_NTOHL (0x0),  // name = RepositoryId
-            CORBA::tk_string, 
+            CORBA::tk_string,
       0U, // string length
 
     0U,
@@ -32287,117 +29946,39 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::OperationDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::OperationDescription *old =
-        ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::OperationDescription *tmp =
-    ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CS_)
-#define _CORBA_OPDESCRIPTIONSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::OpDescriptionSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::OpDescriptionSeq::OpDescriptionSeq (void)
 {}
 
 CORBA::OpDescriptionSeq::OpDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::OperationDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::OperationDescription
+      >
+    (max)
 {}
 
 CORBA::OpDescriptionSeq::OpDescriptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::OperationDescription *buffer,
+    CORBA::OperationDescription* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::OperationDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::OperationDescription
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::OpDescriptionSeq::OpDescriptionSeq (const OpDescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::OperationDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::OperationDescription
+      >
+    (seq)
 {}
 
-CORBA::OpDescriptionSeq::~OpDescriptionSeq (void) // dtor
+CORBA::OpDescriptionSeq::~OpDescriptionSeq (void)
 {}
 
 void CORBA::OpDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -32406,7 +29987,37 @@ void CORBA::OpDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      OpDescriptionSeq,
+      CORBA::OperationDescription
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      OpDescriptionSeq,
+      OpDescriptionSeq_var,
+      CORBA::OperationDescription
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      OpDescriptionSeq, \
+      CORBA::OperationDescription \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      OpDescriptionSeq, \
+      OpDescriptionSeq_var, \
+      CORBA::OperationDescription \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -32415,21 +30026,21 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f70), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e53), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4f70),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
     17,
-  ACE_NTOHL (0x4f704465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e536571), 
+  ACE_NTOHL (0x4f704465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e536571),
   ACE_NTOHL (0x0),  // name = OpDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   1468, // encapsulation length
@@ -32438,46 +30049,46 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
     1452, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4f70), 
-      ACE_NTOHL (0x65726174), 
-      ACE_NTOHL (0x696f6e44), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f4f70),
+      ACE_NTOHL (0x65726174),
+      ACE_NTOHL (0x696f6e44),
+      ACE_NTOHL (0x65736372),
+      ACE_NTOHL (0x69707469),
+      ACE_NTOHL (0x6f6e3a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
             21,
-      ACE_NTOHL (0x4f706572), 
-      ACE_NTOHL (0x6174696f), 
-      ACE_NTOHL (0x6e446573), 
-      ACE_NTOHL (0x63726970), 
-      ACE_NTOHL (0x74696f6e), 
+      ACE_NTOHL (0x4f706572),
+      ACE_NTOHL (0x6174696f),
+      ACE_NTOHL (0x6e446573),
+      ACE_NTOHL (0x63726970),
+      ACE_NTOHL (0x74696f6e),
       ACE_NTOHL (0x0),  // name = OperationDescription
       9, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       3,
@@ -32486,109 +30097,109 @@ static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
             0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5665),
+        ACE_NTOHL (0x7273696f),
+        ACE_NTOHL (0x6e537065),
+        ACE_NTOHL (0x633a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       7,
-      ACE_NTOHL (0x72657375), 
+      ACE_NTOHL (0x72657375),
       ACE_NTOHL (0x6c740000),  // name = result
             CORBA::tk_TypeCode,
 
       5,
-      ACE_NTOHL (0x6d6f6465), 
+      ACE_NTOHL (0x6d6f6465),
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e4d), 
-        ACE_NTOHL (0x6f64653a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e4d),
+        ACE_NTOHL (0x6f64653a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
         14,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e4d6f64), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e4d6f64),
         ACE_NTOHL (0x65000000),  // name = OperationMode
         2, // member count
         10,
-        ACE_NTOHL (0x4f505f4e), 
-        ACE_NTOHL (0x4f524d41), 
+        ACE_NTOHL (0x4f505f4e),
+        ACE_NTOHL (0x4f524d41),
         ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
         10,
-        ACE_NTOHL (0x4f505f4f), 
-        ACE_NTOHL (0x4e455741), 
+        ACE_NTOHL (0x4f505f4f),
+        ACE_NTOHL (0x4e455741),
         ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-        
+
       9,
-      ACE_NTOHL (0x636f6e74), 
-      ACE_NTOHL (0x65787473), 
+      ACE_NTOHL (0x636f6e74),
+      ACE_NTOHL (0x65787473),
       ACE_NTOHL (0x0),  // name = contexts
             CORBA::tk_alias, // typecode kind for typedefs
       168, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f436f), 
-        ACE_NTOHL (0x6e746578), 
-        ACE_NTOHL (0x74496453), 
-        ACE_NTOHL (0x65713a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f436f),
+        ACE_NTOHL (0x6e746578),
+        ACE_NTOHL (0x74496453),
+        ACE_NTOHL (0x65713a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                 13,
-        ACE_NTOHL (0x436f6e74), 
-        ACE_NTOHL (0x65787449), 
-        ACE_NTOHL (0x64536571), 
+        ACE_NTOHL (0x436f6e74),
+        ACE_NTOHL (0x65787449),
+        ACE_NTOHL (0x64536571),
         ACE_NTOHL (0x0),  // name = ContextIdSeq
                 CORBA::tk_sequence, // typecode kind
         96, // encapsulation length
@@ -32597,21 +30208,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           80, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             40,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x434f5242), 
-            ACE_NTOHL (0x412f436f), 
-            ACE_NTOHL (0x6e746578), 
-            ACE_NTOHL (0x74496465), 
-            ACE_NTOHL (0x6e746966), 
-            ACE_NTOHL (0x6965723a), 
+            ACE_NTOHL (0x49444c3a),
+            ACE_NTOHL (0x6f6d672e),
+            ACE_NTOHL (0x6f72672f),
+            ACE_NTOHL (0x434f5242),
+            ACE_NTOHL (0x412f436f),
+            ACE_NTOHL (0x6e746578),
+            ACE_NTOHL (0x74496465),
+            ACE_NTOHL (0x6e746966),
+            ACE_NTOHL (0x6965723a),
             ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                         18,
-            ACE_NTOHL (0x436f6e74), 
-            ACE_NTOHL (0x65787449), 
-            ACE_NTOHL (0x64656e74), 
-            ACE_NTOHL (0x69666965), 
+            ACE_NTOHL (0x436f6e74),
+            ACE_NTOHL (0x65787449),
+            ACE_NTOHL (0x64656e74),
+            ACE_NTOHL (0x69666965),
             ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                         0xffffffff, // indirection
             0xfffffdac, // negative offset (-596)
@@ -32620,28 +30231,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
       11,
-      ACE_NTOHL (0x70617261), 
-      ACE_NTOHL (0x6d657465), 
+      ACE_NTOHL (0x70617261),
+      ACE_NTOHL (0x6d657465),
       ACE_NTOHL (0x72730000),  // name = parameters
             CORBA::tk_alias, // typecode kind for typedefs
       428, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5061), 
-        ACE_NTOHL (0x72446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x5365713a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5061),
+        ACE_NTOHL (0x72446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x5365713a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                 18,
-        ACE_NTOHL (0x50617244), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e5365), 
+        ACE_NTOHL (0x50617244),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e5365),
         ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                 CORBA::tk_sequence, // typecode kind
         348, // encapsulation length
@@ -32650,117 +30261,117 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           332, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             43,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x434f5242), 
-            ACE_NTOHL (0x412f5061), 
-            ACE_NTOHL (0x72616d65), 
-            ACE_NTOHL (0x74657244), 
-            ACE_NTOHL (0x65736372), 
-            ACE_NTOHL (0x69707469), 
-            ACE_NTOHL (0x6f6e3a31), 
+            ACE_NTOHL (0x49444c3a),
+            ACE_NTOHL (0x6f6d672e),
+            ACE_NTOHL (0x6f72672f),
+            ACE_NTOHL (0x434f5242),
+            ACE_NTOHL (0x412f5061),
+            ACE_NTOHL (0x72616d65),
+            ACE_NTOHL (0x74657244),
+            ACE_NTOHL (0x65736372),
+            ACE_NTOHL (0x69707469),
+            ACE_NTOHL (0x6f6e3a31),
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                         21,
-            ACE_NTOHL (0x50617261), 
-            ACE_NTOHL (0x6d657465), 
-            ACE_NTOHL (0x72446573), 
-            ACE_NTOHL (0x63726970), 
-            ACE_NTOHL (0x74696f6e), 
+            ACE_NTOHL (0x50617261),
+            ACE_NTOHL (0x6d657465),
+            ACE_NTOHL (0x72446573),
+            ACE_NTOHL (0x63726970),
+            ACE_NTOHL (0x74696f6e),
             ACE_NTOHL (0x0),  // name = ParameterDescription
             4, // member count
                         5,
-            ACE_NTOHL (0x6e616d65), 
+            ACE_NTOHL (0x6e616d65),
             ACE_NTOHL (0x0),  // name = name
                         0xffffffff, // indirection
             0xfffffccc, // negative offset (-820)
             5,
-            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x74797065),
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
             9,
-            ACE_NTOHL (0x74797065), 
-            ACE_NTOHL (0x5f646566), 
+            ACE_NTOHL (0x74797065),
+            ACE_NTOHL (0x5f646566),
             ACE_NTOHL (0x0),  // name = type_def
                         CORBA::tk_objref, // typecode kind
             52, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               30,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4944), 
-              ACE_NTOHL (0x4c547970), 
-              ACE_NTOHL (0x653a312e), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4944),
+              ACE_NTOHL (0x4c547970),
+              ACE_NTOHL (0x653a312e),
               ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                             8,
-              ACE_NTOHL (0x49444c54), 
+              ACE_NTOHL (0x49444c54),
               ACE_NTOHL (0x79706500),  // name = IDLType
-              
+
             5,
-            ACE_NTOHL (0x6d6f6465), 
+            ACE_NTOHL (0x6d6f6465),
             ACE_NTOHL (0x0),  // name = mode
                         CORBA::tk_enum, // typecode kind
             116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
               36,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x7465724d), 
-              ACE_NTOHL (0x6f64653a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x7465724d),
+              ACE_NTOHL (0x6f64653a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
               14,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x724d6f64), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x724d6f64),
               ACE_NTOHL (0x65000000),  // name = ParameterMode
               3, // member count
               9,
-              ACE_NTOHL (0x50415241), 
-              ACE_NTOHL (0x4d5f494e), 
+              ACE_NTOHL (0x50415241),
+              ACE_NTOHL (0x4d5f494e),
               ACE_NTOHL (0x0),  // name = PARAM_IN
               10,
-              ACE_NTOHL (0x50415241), 
-              ACE_NTOHL (0x4d5f4f55), 
+              ACE_NTOHL (0x50415241),
+              ACE_NTOHL (0x4d5f4f55),
               ACE_NTOHL (0x54000000),  // name = PARAM_OUT
               12,
-              ACE_NTOHL (0x50415241), 
-              ACE_NTOHL (0x4d5f494e), 
+              ACE_NTOHL (0x50415241),
+              ACE_NTOHL (0x4d5f494e),
               ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-              
+
 
           0U,
 
 
       11,
-      ACE_NTOHL (0x65786365), 
-      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x65786365),
+      ACE_NTOHL (0x7074696f),
       ACE_NTOHL (0x6e730000),  // name = exceptions
             CORBA::tk_alias, // typecode kind for typedefs
       276, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x63446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x5365713a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x63446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x5365713a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                 18,
-        ACE_NTOHL (0x45786344), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e5365), 
+        ACE_NTOHL (0x45786344),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e5365),
         ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                 CORBA::tk_sequence, // typecode kind
         196, // encapsulation length
@@ -32769,27 +30380,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           180, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             43,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x434f5242), 
-            ACE_NTOHL (0x412f4578), 
-            ACE_NTOHL (0x63657074), 
-            ACE_NTOHL (0x696f6e44), 
-            ACE_NTOHL (0x65736372), 
-            ACE_NTOHL (0x69707469), 
-            ACE_NTOHL (0x6f6e3a31), 
+            ACE_NTOHL (0x49444c3a),
+            ACE_NTOHL (0x6f6d672e),
+            ACE_NTOHL (0x6f72672f),
+            ACE_NTOHL (0x434f5242),
+            ACE_NTOHL (0x412f4578),
+            ACE_NTOHL (0x63657074),
+            ACE_NTOHL (0x696f6e44),
+            ACE_NTOHL (0x65736372),
+            ACE_NTOHL (0x69707469),
+            ACE_NTOHL (0x6f6e3a31),
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                         21,
-            ACE_NTOHL (0x45786365), 
-            ACE_NTOHL (0x7074696f), 
-            ACE_NTOHL (0x6e446573), 
-            ACE_NTOHL (0x63726970), 
-            ACE_NTOHL (0x74696f6e), 
+            ACE_NTOHL (0x45786365),
+            ACE_NTOHL (0x7074696f),
+            ACE_NTOHL (0x6e446573),
+            ACE_NTOHL (0x63726970),
+            ACE_NTOHL (0x74696f6e),
             ACE_NTOHL (0x0),  // name = ExceptionDescription
             5, // member count
                         5,
-            ACE_NTOHL (0x6e616d65), 
+            ACE_NTOHL (0x6e616d65),
             ACE_NTOHL (0x0),  // name = name
                         0xffffffff, // indirection
             0xfffffb08, // negative offset (-1272)
@@ -32798,18 +30409,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                         0xffffffff, // indirection
             0xfffffb4c, // negative offset (-1204)
             11,
-            ACE_NTOHL (0x64656669), 
-            ACE_NTOHL (0x6e65645f), 
+            ACE_NTOHL (0x64656669),
+            ACE_NTOHL (0x6e65645f),
             ACE_NTOHL (0x696e0000),  // name = defined_in
                         0xffffffff, // indirection
             0xfffffb34, // negative offset (-1228)
             8,
-            ACE_NTOHL (0x76657273), 
+            ACE_NTOHL (0x76657273),
             ACE_NTOHL (0x696f6e00),  // name = version
                         0xffffffff, // indirection
             0xfffffb94, // negative offset (-1132)
             5,
-            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x74797065),
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
@@ -32839,117 +30450,39 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::AttributeDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::AttributeDescription *old =
-        ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::AttributeDescription *tmp =
-    ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_)
-#define _CORBA_ATTRDESCRIPTIONSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::AttrDescriptionSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::AttrDescriptionSeq::AttrDescriptionSeq (void)
 {}
 
 CORBA::AttrDescriptionSeq::AttrDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::AttributeDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::AttributeDescription
+      >
+    (max)
 {}
 
 CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::AttributeDescription *buffer,
+    CORBA::AttributeDescription* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::AttributeDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::AttributeDescription
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::AttrDescriptionSeq::AttrDescriptionSeq (const AttrDescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::AttributeDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::AttributeDescription
+      >
+    (seq)
 {}
 
-CORBA::AttrDescriptionSeq::~AttrDescriptionSeq (void) // dtor
+CORBA::AttrDescriptionSeq::~AttrDescriptionSeq (void)
 {}
 
 void CORBA::AttrDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -32958,7 +30491,37 @@ void CORBA::AttrDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      AttrDescriptionSeq,
+      CORBA::AttributeDescription
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      AttrDescriptionSeq,
+      AttrDescriptionSeq_var,
+      CORBA::AttributeDescription
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      AttrDescriptionSeq, \
+      CORBA::AttributeDescription \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      AttrDescriptionSeq, \
+      AttrDescriptionSeq_var, \
+      CORBA::AttributeDescription \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -32967,22 +30530,22 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4174), 
-  ACE_NTOHL (0x74724465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e536571), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4174),
+  ACE_NTOHL (0x74724465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e536571),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
     19,
-  ACE_NTOHL (0x41747472), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x41747472),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e53),
   ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   528, // encapsulation length
@@ -32991,46 +30554,46 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
     512, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       43,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4174), 
-      ACE_NTOHL (0x74726962), 
-      ACE_NTOHL (0x75746544), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f4174),
+      ACE_NTOHL (0x74726962),
+      ACE_NTOHL (0x75746544),
+      ACE_NTOHL (0x65736372),
+      ACE_NTOHL (0x69707469),
+      ACE_NTOHL (0x6f6e3a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
             21,
-      ACE_NTOHL (0x41747472), 
-      ACE_NTOHL (0x69627574), 
-      ACE_NTOHL (0x65446573), 
-      ACE_NTOHL (0x63726970), 
-      ACE_NTOHL (0x74696f6e), 
+      ACE_NTOHL (0x41747472),
+      ACE_NTOHL (0x69627574),
+      ACE_NTOHL (0x65446573),
+      ACE_NTOHL (0x63726970),
+      ACE_NTOHL (0x74696f6e),
       ACE_NTOHL (0x0),  // name = AttributeDescription
       6, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       3,
@@ -33039,89 +30602,89 @@ static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
             0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5665),
+        ACE_NTOHL (0x7273696f),
+        ACE_NTOHL (0x6e537065),
+        ACE_NTOHL (0x633a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x74797065),
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       5,
-      ACE_NTOHL (0x6d6f6465), 
+      ACE_NTOHL (0x6d6f6465),
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x7574654d), 
-        ACE_NTOHL (0x6f64653a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4174),
+        ACE_NTOHL (0x74726962),
+        ACE_NTOHL (0x7574654d),
+        ACE_NTOHL (0x6f64653a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
         14,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x654d6f64), 
+        ACE_NTOHL (0x41747472),
+        ACE_NTOHL (0x69627574),
+        ACE_NTOHL (0x654d6f64),
         ACE_NTOHL (0x65000000),  // name = AttributeMode
         2, // member count
         12,
-        ACE_NTOHL (0x41545452), 
-        ACE_NTOHL (0x5f4e4f52), 
+        ACE_NTOHL (0x41545452),
+        ACE_NTOHL (0x5f4e4f52),
         ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
         14,
-        ACE_NTOHL (0x41545452), 
-        ACE_NTOHL (0x5f524541), 
-        ACE_NTOHL (0x444f4e4c), 
+        ACE_NTOHL (0x41545452),
+        ACE_NTOHL (0x5f524541),
+        ACE_NTOHL (0x444f4e4c),
         ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-        
+
 
     0U,
 
@@ -33144,117 +30707,39 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ExtAttributeDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ExtAttributeDescription *old =
-        ACE_reinterpret_cast (CORBA::ExtAttributeDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ExtAttributeDescription *tmp =
-    ACE_reinterpret_cast (CORBA::ExtAttributeDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CS_)
-#define _CORBA_EXTATTRDESCRIPTIONSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ExtAttrDescriptionSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (void)
 {}
 
 CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExtAttributeDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::ExtAttributeDescription
+      >
+    (max)
 {}
 
 CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ExtAttributeDescription *buffer,
+    CORBA::ExtAttributeDescription* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExtAttributeDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::ExtAttributeDescription
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (const ExtAttrDescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ExtAttributeDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::ExtAttributeDescription
+      >
+    (seq)
 {}
 
-CORBA::ExtAttrDescriptionSeq::~ExtAttrDescriptionSeq (void) // dtor
+CORBA::ExtAttrDescriptionSeq::~ExtAttrDescriptionSeq (void)
 {}
 
 void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -33263,7 +30748,37 @@ void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      ExtAttrDescriptionSeq,
+      CORBA::ExtAttributeDescription
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ExtAttrDescriptionSeq,
+      ExtAttrDescriptionSeq_var,
+      CORBA::ExtAttributeDescription
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ExtAttrDescriptionSeq, \
+      CORBA::ExtAttributeDescription \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ExtAttrDescriptionSeq, \
+      ExtAttrDescriptionSeq_var, \
+      CORBA::ExtAttributeDescription \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -33272,23 +30787,23 @@ static const CORBA::Long _oc_CORBA_ExtAttrDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74417474), 
-  ACE_NTOHL (0x72446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x74417474),
+  ACE_NTOHL (0x72446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x5365713a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
     22,
-  ACE_NTOHL (0x45787441), 
-  ACE_NTOHL (0x74747244), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e5365), 
+  ACE_NTOHL (0x45787441),
+  ACE_NTOHL (0x74747244),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e5365),
   ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   864, // encapsulation length
@@ -33297,47 +30812,47 @@ static const CORBA::Long _oc_CORBA_ExtAttrDescriptionSeq[] =
     848, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       46,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f4578), 
-      ACE_NTOHL (0x74417474), 
-      ACE_NTOHL (0x72696275), 
-      ACE_NTOHL (0x74654465), 
-      ACE_NTOHL (0x73637269), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e3a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f4578),
+      ACE_NTOHL (0x74417474),
+      ACE_NTOHL (0x72696275),
+      ACE_NTOHL (0x74654465),
+      ACE_NTOHL (0x73637269),
+      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x6e3a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
             24,
-      ACE_NTOHL (0x45787441), 
-      ACE_NTOHL (0x74747269), 
-      ACE_NTOHL (0x62757465), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x45787441),
+      ACE_NTOHL (0x74747269),
+      ACE_NTOHL (0x62757465),
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
       ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
       8, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       3,
@@ -33346,113 +30861,113 @@ static const CORBA::Long _oc_CORBA_ExtAttrDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
             0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5665),
+        ACE_NTOHL (0x7273696f),
+        ACE_NTOHL (0x6e537065),
+        ACE_NTOHL (0x633a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x74797065),
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       5,
-      ACE_NTOHL (0x6d6f6465), 
+      ACE_NTOHL (0x6d6f6465),
       ACE_NTOHL (0x0),  // name = mode
             CORBA::tk_enum, // typecode kind
       104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x7574654d), 
-        ACE_NTOHL (0x6f64653a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4174),
+        ACE_NTOHL (0x74726962),
+        ACE_NTOHL (0x7574654d),
+        ACE_NTOHL (0x6f64653a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
         14,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x654d6f64), 
+        ACE_NTOHL (0x41747472),
+        ACE_NTOHL (0x69627574),
+        ACE_NTOHL (0x654d6f64),
         ACE_NTOHL (0x65000000),  // name = AttributeMode
         2, // member count
         12,
-        ACE_NTOHL (0x41545452), 
-        ACE_NTOHL (0x5f4e4f52), 
+        ACE_NTOHL (0x41545452),
+        ACE_NTOHL (0x5f4e4f52),
         ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
         14,
-        ACE_NTOHL (0x41545452), 
-        ACE_NTOHL (0x5f524541), 
-        ACE_NTOHL (0x444f4e4c), 
+        ACE_NTOHL (0x41545452),
+        ACE_NTOHL (0x5f524541),
+        ACE_NTOHL (0x444f4e4c),
         ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-        
+
       15,
-      ACE_NTOHL (0x6765745f), 
-      ACE_NTOHL (0x65786365), 
-      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6765745f),
+      ACE_NTOHL (0x65786365),
+      ACE_NTOHL (0x7074696f),
       ACE_NTOHL (0x6e730000),  // name = get_exceptions
             CORBA::tk_alias, // typecode kind for typedefs
       276, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         40,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x63446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x5365713a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x63446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x5365713a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                 18,
-        ACE_NTOHL (0x45786344), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e5365), 
+        ACE_NTOHL (0x45786344),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e5365),
         ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                 CORBA::tk_sequence, // typecode kind
         196, // encapsulation length
@@ -33461,27 +30976,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
           180, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             43,
-            ACE_NTOHL (0x49444c3a), 
-            ACE_NTOHL (0x6f6d672e), 
-            ACE_NTOHL (0x6f72672f), 
-            ACE_NTOHL (0x434f5242), 
-            ACE_NTOHL (0x412f4578), 
-            ACE_NTOHL (0x63657074), 
-            ACE_NTOHL (0x696f6e44), 
-            ACE_NTOHL (0x65736372), 
-            ACE_NTOHL (0x69707469), 
-            ACE_NTOHL (0x6f6e3a31), 
+            ACE_NTOHL (0x49444c3a),
+            ACE_NTOHL (0x6f6d672e),
+            ACE_NTOHL (0x6f72672f),
+            ACE_NTOHL (0x434f5242),
+            ACE_NTOHL (0x412f4578),
+            ACE_NTOHL (0x63657074),
+            ACE_NTOHL (0x696f6e44),
+            ACE_NTOHL (0x65736372),
+            ACE_NTOHL (0x69707469),
+            ACE_NTOHL (0x6f6e3a31),
             ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                         21,
-            ACE_NTOHL (0x45786365), 
-            ACE_NTOHL (0x7074696f), 
-            ACE_NTOHL (0x6e446573), 
-            ACE_NTOHL (0x63726970), 
-            ACE_NTOHL (0x74696f6e), 
+            ACE_NTOHL (0x45786365),
+            ACE_NTOHL (0x7074696f),
+            ACE_NTOHL (0x6e446573),
+            ACE_NTOHL (0x63726970),
+            ACE_NTOHL (0x74696f6e),
             ACE_NTOHL (0x0),  // name = ExceptionDescription
             5, // member count
                         5,
-            ACE_NTOHL (0x6e616d65), 
+            ACE_NTOHL (0x6e616d65),
             ACE_NTOHL (0x0),  // name = name
                         0xffffffff, // indirection
             0xfffffd84, // negative offset (-636)
@@ -33490,18 +31005,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                         0xffffffff, // indirection
             0xfffffdc8, // negative offset (-568)
             11,
-            ACE_NTOHL (0x64656669), 
-            ACE_NTOHL (0x6e65645f), 
+            ACE_NTOHL (0x64656669),
+            ACE_NTOHL (0x6e65645f),
             ACE_NTOHL (0x696e0000),  // name = defined_in
                         0xffffffff, // indirection
             0xfffffdb0, // negative offset (-592)
             8,
-            ACE_NTOHL (0x76657273), 
+            ACE_NTOHL (0x76657273),
             ACE_NTOHL (0x696f6e00),  // name = version
                         0xffffffff, // indirection
             0xfffffe10, // negative offset (-496)
             5,
-            ACE_NTOHL (0x74797065), 
+            ACE_NTOHL (0x74797065),
             ACE_NTOHL (0x0),  // name = type
                         CORBA::tk_TypeCode,
 
@@ -33510,9 +31025,9 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
       15,
-      ACE_NTOHL (0x7075745f), 
-      ACE_NTOHL (0x65786365), 
-      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x7075745f),
+      ACE_NTOHL (0x65786365),
+      ACE_NTOHL (0x7074696f),
       ACE_NTOHL (0x6e730000),  // name = put_exceptions
             0xffffffff, // indirection
       0xfffffecc, // negative offset (-308)
@@ -33544,7 +31059,7 @@ TAO_NAMESPACE_END
 int CORBA::InterfaceDef::_tao_class_id = 0;
 
 CORBA::InterfaceDef_ptr
-tao_CORBA_InterfaceDef_duplicate (
+CORBA::tao_InterfaceDef_life::tao_duplicate (
     CORBA::InterfaceDef_ptr p
   )
 {
@@ -33552,7 +31067,7 @@ tao_CORBA_InterfaceDef_duplicate (
 }
 
 void
-tao_CORBA_InterfaceDef_release (
+CORBA::tao_InterfaceDef_life::tao_release (
     CORBA::InterfaceDef_ptr p
   )
 {
@@ -33560,228 +31075,64 @@ tao_CORBA_InterfaceDef_release (
 }
 
 CORBA::InterfaceDef_ptr
-tao_CORBA_InterfaceDef_nil (
+CORBA::tao_InterfaceDef_life::tao_nil (
     void
   )
 {
   return CORBA::InterfaceDef::_nil ();
 }
 
-CORBA::InterfaceDef_ptr
-tao_CORBA_InterfaceDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::InterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_InterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA::InterfaceDef **tmp =
-    ACE_static_cast (CORBA::InterfaceDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_InterfaceDef_marshal (
+CORBA::tao_InterfaceDef_life::tao_marshal (
     CORBA::InterfaceDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::InterfaceDef_var
-// *************************************************************
-
-CORBA::InterfaceDef_var::InterfaceDef_var (void)
-  : ptr_ (InterfaceDef::_nil ())
-{}
-
-::CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::InterfaceDef_var::InterfaceDef_var (const ::CORBA::InterfaceDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (InterfaceDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::InterfaceDef_var::~InterfaceDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::InterfaceDef_var &
-CORBA::InterfaceDef_var::operator= (InterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::InterfaceDef_var &
-CORBA::InterfaceDef_var::operator= (const ::CORBA::InterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::InterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::InterfaceDef_var::operator const ::CORBA::InterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::InterfaceDef_var::operator ::CORBA::InterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceDef_ptr &
-CORBA::InterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceDef_ptr &
-CORBA::InterfaceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::InterfaceDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::InterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::InterfaceDef::_nil ();
-  return val;
-}
-
-::CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_var::tao_duplicate (InterfaceDef_ptr p)
-{
-  return ::CORBA::InterfaceDef::_duplicate (p);
-}
-
-void
-CORBA::InterfaceDef_var::tao_release (InterfaceDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_var::tao_nil (void)
-{
-  return ::CORBA::InterfaceDef::_nil ();
-}
-
-::CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_var::tao_narrow (
+CORBA::InterfaceDef_ptr
+CORBA::tao_InterfaceDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::InterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::InterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::InterfaceDef_var::tao_upcast (void *src)
+CORBA::tao_InterfaceDef_cast::tao_upcast (
+    void *src
+  )
 {
-  InterfaceDef **tmp =
-    ACE_static_cast (InterfaceDef **, src);
+  CORBA::InterfaceDef **tmp =
+    ACE_static_cast (CORBA::InterfaceDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::InterfaceDef_out
-// *************************************************************
-
-CORBA::InterfaceDef_out::InterfaceDef_out (InterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::InterfaceDef::_nil ();
-}
-
-CORBA::InterfaceDef_out::InterfaceDef_out (InterfaceDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::InterfaceDef::_nil ();
-}
-
-CORBA::InterfaceDef_out::InterfaceDef_out (const ::CORBA::InterfaceDef_out &p)
-  : ptr_ (ACE_const_cast (InterfaceDef_out &, p).ptr_)
-{}
-
-::CORBA::InterfaceDef_out &
-CORBA::InterfaceDef_out::operator= (const ::CORBA::InterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (InterfaceDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::InterfaceDef_out &
-CORBA::InterfaceDef_out::operator= (const ::CORBA::InterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA::InterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::InterfaceDef_out &
-CORBA::InterfaceDef_out::operator= (InterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::InterfaceDef_out::operator ::CORBA::InterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceDef_ptr &
-CORBA::InterfaceDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::InterfaceDef,
+        CORBA::tao_InterfaceDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::InterfaceDef,
+        CORBA::tao_InterfaceDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::InterfaceDef, \
+        CORBA::tao_InterfaceDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::InterfaceDef, \
+        CORBA::tao_InterfaceDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -33801,29 +31152,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDefSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (const TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get &);
-    
+
     ::CORBA::InterfaceDefSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -33836,7 +31187,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (ACE_ENV
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -33848,11 +31199,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (ACE_EN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -33861,17 +31212,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (ACE_ENV_SI
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -33889,10 +31240,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -33901,15 +31252,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set &);
     const CORBA::InterfaceDefSeq & base_interfaces_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::InterfaceDefSeq & base_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       base_interfaces_ (base_interfaces)
@@ -33923,15 +31274,15 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (ACE_ENV
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->base_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -33943,11 +31294,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (ACE_EN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -33956,7 +31307,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (ACE_ENV_SI
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -33976,31 +31327,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a (const TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a &);
     void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a &);
     const char * interface_id_;
-    
+
     ::CORBA::Boolean _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * interface_id
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       interface_id_ (interface_id)
@@ -34014,15 +31365,15 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DEC
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= interface_id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -34034,11 +31385,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -34047,17 +31398,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Boolean result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -34074,29 +31425,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDef::FullInterfaceDescription * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (const TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface &);
     void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface &);
-    
+
     ::CORBA::InterfaceDef::FullInterfaceDescription * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -34109,7 +31460,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (ACE_ENV_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -34121,11 +31472,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (ACE_ENV
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -34134,17 +31485,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (ACE_ENV_SIN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (::CORBA::InterfaceDef::FullInterfaceDescription * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -34166,15 +31517,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::AttributeDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute (const TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute &);
     void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute &);
@@ -34183,13 +31534,13 @@ public:
     const char * version_;
     CORBA::IDLType_ptr type_;
     const CORBA::AttributeMode & mode_;
-    
+
     ::CORBA::AttributeDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -34198,7 +31549,7 @@ public:
       const char * version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode & mode
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -34216,31 +31567,31 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (ACE_ENV_SI
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -34252,11 +31603,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (ACE_ENV_S
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -34265,17 +31616,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (ACE_ENV_SINGL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (::CORBA::AttributeDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -34300,15 +31651,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::OperationDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation (const TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation &);
     void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation &);
@@ -34320,13 +31671,13 @@ public:
     const CORBA::ParDescriptionSeq & params_;
     const CORBA::ExceptionDefSeq & exceptions_;
     const CORBA::ContextIdSeq & contexts_;
-    
+
     ::CORBA::OperationDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -34338,7 +31689,7 @@ public:
       const CORBA::ParDescriptionSeq & params,
       const CORBA::ExceptionDefSeq & exceptions,
       const CORBA::ContextIdSeq & contexts
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -34359,43 +31710,43 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (ACE_ENV_SI
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (8);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->result_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->params_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->contexts_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -34407,11 +31758,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (ACE_ENV_S
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -34420,17 +31771,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (ACE_ENV_SINGL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (::CORBA::OperationDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -34440,7 +31791,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (::CORBA::Oper
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
@@ -34464,18 +31815,18 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
 {
   CORBA::InterfaceDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::InterfaceDefSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_interfaces",
@@ -34483,22 +31834,22 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get _tao_ri (
           &_tao_call,
@@ -34506,14 +31857,14 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -34521,78 +31872,85 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceDefSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceDefSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -34602,59 +31960,57 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -34670,12 +32026,12 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_base_interfaces",
@@ -34683,22 +32039,22 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set _tao_ri (
           &_tao_call,
@@ -34707,14 +32063,14 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -34722,70 +32078,76 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << base_interfaces)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << base_interfaces)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -34795,56 +32157,54 @@ void CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -34862,12 +32222,12 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "is_a",
@@ -34875,22 +32235,22 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a _tao_ri (
           &_tao_call,
@@ -34899,14 +32259,14 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -34914,90 +32274,94 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << interface_id)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << interface_id)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Boolean _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -35007,59 +32371,57 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -35075,18 +32437,18 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::InterfaceDef::FullInterfaceDescription_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::InterfaceDef::FullInterfaceDescription *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InterfaceDef::FullInterfaceDescription, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_interface",
@@ -35094,22 +32456,22 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface _tao_ri (
           &_tao_call,
@@ -35117,14 +32479,14 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -35132,78 +32494,85 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceDef::FullInterfaceDescription * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceDef::FullInterfaceDescription * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -35213,59 +32582,57 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -35286,12 +32653,12 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::AttributeDef_var _tao_retval (CORBA::AttributeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_attribute",
@@ -35299,22 +32666,22 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute _tao_ri (
           &_tao_call,
@@ -35327,14 +32694,14 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -35342,95 +32709,99 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << type) &&
-              (_tao_out << mode)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << type) &&
+                  (_tao_out << mode)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::AttributeDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::AttributeDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -35440,59 +32811,57 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -35516,12 +32885,12 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::OperationDef_var _tao_retval (CORBA::OperationDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_operation",
@@ -35529,22 +32898,22 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
       8,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation _tao_ri (
           &_tao_call,
@@ -35560,14 +32929,14 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -35575,98 +32944,102 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << result) &&
-              (_tao_out << mode) &&
-              (_tao_out << params) &&
-              (_tao_out << exceptions) &&
-              (_tao_out << contexts)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << result) &&
+                  (_tao_out << mode) &&
+                  (_tao_out << params) &&
+                  (_tao_out << exceptions) &&
+                  (_tao_out << contexts)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::OperationDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::OperationDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -35676,63 +33049,61 @@ CORBA::Boolean CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -35783,8 +33154,8 @@ CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::InterfaceDef::InterfaceDef (int collocated)
 {
@@ -35800,7 +33171,7 @@ CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation (int collocated)
   else
     this->the_TAO_InterfaceDef_Proxy_Broker_ =
       ::CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Container_setup_collocation (collocated);
   this->CORBA_Contained_setup_collocation (collocated);
   this->CORBA_IDLType_setup_collocation (collocated);
@@ -35809,7 +33180,7 @@ CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation (int collocated)
 CORBA::InterfaceDef::~InterfaceDef (void)
 {}
 
-void 
+void
 CORBA::InterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   InterfaceDef *tmp = ACE_static_cast (InterfaceDef *, _tao_void_pointer);
@@ -35826,7 +33197,7 @@ CORBA::InterfaceDef::_narrow (
     {
       return InterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -35835,17 +33206,17 @@ CORBA::InterfaceDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (InterfaceDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return InterfaceDef::_nil ();
         }
     }
-  
+
   return InterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::InterfaceDef_ptr 
+CORBA::InterfaceDef_ptr
 CORBA::InterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -35855,18 +33226,18 @@ CORBA::InterfaceDef::_unchecked_narrow (
     {
       return InterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       InterfaceDef_ptr default_proxy = InterfaceDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -35884,7 +33255,7 @@ CORBA::InterfaceDef::_unchecked_narrow (
               InterfaceDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -35897,10 +33268,10 @@ CORBA::InterfaceDef::_unchecked_narrow (
               InterfaceDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           InterfaceDef_ptr,
@@ -35920,7 +33291,7 @@ CORBA::InterfaceDef::_duplicate (InterfaceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -35971,7 +33342,7 @@ CORBA::InterfaceDef::_is_a (
 void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id)
@@ -36046,12 +33417,12 @@ void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -36060,6 +33431,12 @@ const char* CORBA::InterfaceDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/InterfaceDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::InterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -36070,10 +33447,10 @@ const char* CORBA::InterfaceDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.base_interfaces (
       this
       ACE_ENV_ARG_PARAMETER
@@ -36091,10 +33468,10 @@ void CORBA::InterfaceDef::base_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.base_interfaces (
       this,
       base_interfaces
@@ -36113,10 +33490,10 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_a (
       this,
       interface_id
@@ -36131,51 +33508,51 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65662f46), 
-  ACE_NTOHL (0x756c6c49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f496e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636544),
+  ACE_NTOHL (0x65662f46),
+  ACE_NTOHL (0x756c6c49),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x66616365),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0
     25,
-  ACE_NTOHL (0x46756c6c), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x46756c6c),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x65446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = FullInterfaceDescription
   8, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -36184,75 +33561,75 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
   1340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x4f704465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1260, // encapsulation length
@@ -36261,27 +33638,27 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
       1244, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffe14, // negative offset (-492)
@@ -36290,73 +33667,73 @@ static const CORBA::Long _oc_CORBA_InterfaceDef_FullInterfaceDescription[] =
                 0xffffffff, // indirection
         0xfffffe58, // negative offset (-424)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffe40, // negative offset (-448)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffea0, // negative offset (-352)
         7,
-        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x72657375),
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
-          ACE_NTOHL (0x65726174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f70),
+          ACE_NTOHL (0x65726174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x4f706572),
+          ACE_NTOHL (0x6174696f),
+          ACE_NTOHL (0x6e4d6f64),
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e), 
-          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4f505f4e),
+          ACE_NTOHL (0x4f524d41),
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f), 
-          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x4f505f4f),
+          ACE_NTOHL (0x4e455741),
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-          
+
         9,
-        ACE_NTOHL (0x636f6e74), 
-        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x636f6e74),
+        ACE_NTOHL (0x65787473),
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         168, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
-          ACE_NTOHL (0x6e746578), 
-          ACE_NTOHL (0x74496453), 
-          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+          ACE_NTOHL (0x74496453),
+          ACE_NTOHL (0x65713a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x436f6e74),
+          ACE_NTOHL (0x65787449),
+          ACE_NTOHL (0x64536571),
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           96, // encapsulation length
@@ -36365,21 +33742,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             80, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f436f),
+              ACE_NTOHL (0x6e746578),
+              ACE_NTOHL (0x74496465),
+              ACE_NTOHL (0x6e746966),
+              ACE_NTOHL (0x6965723a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x436f6e74),
+              ACE_NTOHL (0x65787449),
+              ACE_NTOHL (0x64656e74),
+              ACE_NTOHL (0x69666965),
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             0xffffffff, // indirection
               0xfffffc94, // negative offset (-876)
@@ -36388,28 +33765,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261), 
-        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x70617261),
+        ACE_NTOHL (0x6d657465),
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         428, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x50617244),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           348, // encapsulation length
@@ -36418,117 +33795,117 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             332, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x74657244), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x74657244),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x72446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffffbb4, // negative offset (-1100)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
-                
+
               5,
-              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x6d6f6465),
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
-                ACE_NTOHL (0x72616d65), 
-                ACE_NTOHL (0x7465724d), 
-                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5061),
+                ACE_NTOHL (0x72616d65),
+                ACE_NTOHL (0x7465724d),
+                ACE_NTOHL (0x6f64653a),
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x50617261),
+                ACE_NTOHL (0x6d657465),
+                ACE_NTOHL (0x724d6f64),
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f4f55),
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-                
+
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
@@ -36537,27 +33914,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             180, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff9f0, // negative offset (-1552)
@@ -36566,18 +33943,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                             0xffffffff, // indirection
               0xfffffa34, // negative offset (-1484)
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             0xffffffff, // indirection
               0xfffffa1c, // negative offset (-1508)
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
                             0xffffffff, // indirection
               0xfffffa7c, // negative offset (-1412)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -36590,29 +33967,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   404, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74724465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74724465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
         19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     320, // encapsulation length
@@ -36621,27 +33998,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       304, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x75746544), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4174),
+        ACE_NTOHL (0x74726962),
+        ACE_NTOHL (0x75746544),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
                 21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x41747472),
+        ACE_NTOHL (0x69627574),
+        ACE_NTOHL (0x65446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = AttributeDescription
         6, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff8bc, // negative offset (-1860)
@@ -36650,80 +34027,80 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffff900, // negative offset (-1792)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffff8e8, // negative offset (-1816)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffff948, // negative offset (-1720)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-          
+
 
       0U,
 
 
   16,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = base_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
@@ -36734,7 +34111,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -36751,7 +34128,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription (
 ::CORBA::TypeCode_ptr CORBA::InterfaceDef::_tc_FullInterfaceDescription =
   &_tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -36761,6 +34138,37 @@ void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      FullInterfaceDescription
+    >;
+
+template class
+  TAO_Out_T<
+      FullInterfaceDescription,
+      FullInterfaceDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      FullInterfaceDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      FullInterfaceDescription, \
+      FullInterfaceDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::InterfaceDef::FullInterfaceDescription * CORBA::InterfaceDef::describe_interface (
@@ -36770,10 +34178,10 @@ void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_interface (
       this
       ACE_ENV_ARG_PARAMETER
@@ -36795,10 +34203,10 @@ void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_attribute (
       this,
       id,
@@ -36828,10 +34236,10 @@ void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
+  _TAO_InterfaceDef_Proxy_Impl &proxy =
     this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_operation (
       this,
       id,
@@ -36853,19 +34261,19 @@ static const CORBA::Long _oc_CORBA_InterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f496e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636544),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
     13,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446566), 
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x65446566),
   ACE_NTOHL (0x0),  // name = InterfaceDef
   };
 
@@ -36893,46 +34301,46 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f496e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636544),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDescription:1.0
     21,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x65446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = InterfaceDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -36941,75 +34349,75 @@ static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   16,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = base_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
@@ -37038,7 +34446,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::InterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -37048,12 +34456,43 @@ void CORBA::InterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      InterfaceDescription
+    >;
+
+template class
+  TAO_Out_T<
+      InterfaceDescription,
+      InterfaceDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      InterfaceDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      InterfaceDescription, \
+      InterfaceDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::InterfaceAttrExtension::_tao_class_id = 0;
 
 CORBA::InterfaceAttrExtension_ptr
-tao_CORBA_InterfaceAttrExtension_duplicate (
+CORBA::tao_InterfaceAttrExtension_life::tao_duplicate (
     CORBA::InterfaceAttrExtension_ptr p
   )
 {
@@ -37061,7 +34500,7 @@ tao_CORBA_InterfaceAttrExtension_duplicate (
 }
 
 void
-tao_CORBA_InterfaceAttrExtension_release (
+CORBA::tao_InterfaceAttrExtension_life::tao_release (
     CORBA::InterfaceAttrExtension_ptr p
   )
 {
@@ -37069,228 +34508,64 @@ tao_CORBA_InterfaceAttrExtension_release (
 }
 
 CORBA::InterfaceAttrExtension_ptr
-tao_CORBA_InterfaceAttrExtension_nil (
+CORBA::tao_InterfaceAttrExtension_life::tao_nil (
     void
   )
 {
   return CORBA::InterfaceAttrExtension::_nil ();
 }
 
-CORBA::InterfaceAttrExtension_ptr
-tao_CORBA_InterfaceAttrExtension_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::InterfaceAttrExtension::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_InterfaceAttrExtension_upcast (
-    void *src
-  )
-{
-  CORBA::InterfaceAttrExtension **tmp =
-    ACE_static_cast (CORBA::InterfaceAttrExtension **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_InterfaceAttrExtension_marshal (
+CORBA::tao_InterfaceAttrExtension_life::tao_marshal (
     CORBA::InterfaceAttrExtension_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::InterfaceAttrExtension_var
-// *************************************************************
-
-CORBA::InterfaceAttrExtension_var::InterfaceAttrExtension_var (void)
-  : ptr_ (InterfaceAttrExtension::_nil ())
-{}
-
-::CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::InterfaceAttrExtension_var::InterfaceAttrExtension_var (const ::CORBA::InterfaceAttrExtension_var &p)
-  : TAO_Base_var (),
-    ptr_ (InterfaceAttrExtension::_duplicate (p.ptr ()))
-{}
-
-CORBA::InterfaceAttrExtension_var::~InterfaceAttrExtension_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::InterfaceAttrExtension_var &
-CORBA::InterfaceAttrExtension_var::operator= (InterfaceAttrExtension_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::InterfaceAttrExtension_var &
-CORBA::InterfaceAttrExtension_var::operator= (const ::CORBA::InterfaceAttrExtension_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::InterfaceAttrExtension::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::InterfaceAttrExtension_var::operator const ::CORBA::InterfaceAttrExtension_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::InterfaceAttrExtension_var::operator ::CORBA::InterfaceAttrExtension_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceAttrExtension_ptr &
-CORBA::InterfaceAttrExtension_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceAttrExtension_ptr &
-CORBA::InterfaceAttrExtension_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::InterfaceAttrExtension::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::InterfaceAttrExtension_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::InterfaceAttrExtension::_nil ();
-  return val;
-}
-
-::CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension_var::tao_duplicate (InterfaceAttrExtension_ptr p)
-{
-  return ::CORBA::InterfaceAttrExtension::_duplicate (p);
-}
-
-void
-CORBA::InterfaceAttrExtension_var::tao_release (InterfaceAttrExtension_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension_var::tao_nil (void)
-{
-  return ::CORBA::InterfaceAttrExtension::_nil ();
-}
-
-::CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension_var::tao_narrow (
+CORBA::InterfaceAttrExtension_ptr
+CORBA::tao_InterfaceAttrExtension_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::InterfaceAttrExtension::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::InterfaceAttrExtension::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::InterfaceAttrExtension_var::tao_upcast (void *src)
+CORBA::tao_InterfaceAttrExtension_cast::tao_upcast (
+    void *src
+  )
 {
-  InterfaceAttrExtension **tmp =
-    ACE_static_cast (InterfaceAttrExtension **, src);
+  CORBA::InterfaceAttrExtension **tmp =
+    ACE_static_cast (CORBA::InterfaceAttrExtension **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::InterfaceAttrExtension_out
-// *************************************************************
-
-CORBA::InterfaceAttrExtension_out::InterfaceAttrExtension_out (InterfaceAttrExtension_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::InterfaceAttrExtension::_nil ();
-}
-
-CORBA::InterfaceAttrExtension_out::InterfaceAttrExtension_out (InterfaceAttrExtension_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::InterfaceAttrExtension::_nil ();
-}
-
-CORBA::InterfaceAttrExtension_out::InterfaceAttrExtension_out (const ::CORBA::InterfaceAttrExtension_out &p)
-  : ptr_ (ACE_const_cast (InterfaceAttrExtension_out &, p).ptr_)
-{}
-
-::CORBA::InterfaceAttrExtension_out &
-CORBA::InterfaceAttrExtension_out::operator= (const ::CORBA::InterfaceAttrExtension_out &p)
-{
-  this->ptr_ = ACE_const_cast (InterfaceAttrExtension_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::InterfaceAttrExtension_out &
-CORBA::InterfaceAttrExtension_out::operator= (const ::CORBA::InterfaceAttrExtension_var &p)
-{
-  this->ptr_ = ::CORBA::InterfaceAttrExtension::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::InterfaceAttrExtension_out &
-CORBA::InterfaceAttrExtension_out::operator= (InterfaceAttrExtension_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::InterfaceAttrExtension_out::operator ::CORBA::InterfaceAttrExtension_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceAttrExtension_ptr &
-CORBA::InterfaceAttrExtension_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::InterfaceAttrExtension_ptr
-CORBA::InterfaceAttrExtension_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::InterfaceAttrExtension,
+        CORBA::tao_InterfaceAttrExtension_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::InterfaceAttrExtension,
+        CORBA::tao_InterfaceAttrExtension_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::InterfaceAttrExtension, \
+        CORBA::tao_InterfaceAttrExtension_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::InterfaceAttrExtension, \
+        CORBA::tao_InterfaceAttrExtension_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -37310,29 +34585,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface (const TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface &);
     void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface &);
-    
+
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -37345,7 +34620,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::argum
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -37357,11 +34632,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::excep
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -37370,17 +34645,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::resul
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::result (::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -37404,15 +34679,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExtAttributeDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute (const TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute &);
     void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute &);
@@ -37423,13 +34698,13 @@ public:
     const CORBA::AttributeMode & mode_;
     const CORBA::ExceptionDefSeq & get_exceptions_;
     const CORBA::ExceptionDefSeq & set_exceptions_;
-    
+
     ::CORBA::ExtAttributeDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -37440,7 +34715,7 @@ public:
       CORBA::AttributeMode & mode,
       const CORBA::ExceptionDefSeq & get_exceptions,
       const CORBA::ExceptionDefSeq & set_exceptions
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -37460,39 +34735,39 @@ TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::argumen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (7);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->get_exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->set_exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -37504,11 +34779,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::excepti
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -37517,17 +34792,17 @@ TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::result
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::result (::CORBA::ExtAttributeDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -37537,7 +34812,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::result
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl::_TAO_InterfaceAttrExtension_Proxy_Impl (void)
@@ -37561,18 +34836,18 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
 {
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_ext_interface",
@@ -37580,22 +34855,22 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface _tao_ri (
           &_tao_call,
@@ -37603,14 +34878,14 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -37618,78 +34893,85 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -37699,59 +34981,57 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -37774,12 +35054,12 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
 {
   CORBA::ExtAttributeDef_var _tao_retval (CORBA::ExtAttributeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_ext_attribute",
@@ -37787,22 +35067,22 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
       7,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute _tao_ri (
           &_tao_call,
@@ -37817,14 +35097,14 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -37832,97 +35112,101 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << type) &&
-              (_tao_out << mode) &&
-              (_tao_out << get_exceptions) &&
-              (_tao_out << set_exceptions)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << type) &&
+                  (_tao_out << mode) &&
+                  (_tao_out << get_exceptions) &&
+                  (_tao_out << set_exceptions)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExtAttributeDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
+#if TAO_HAS_INTERCEPTORS == 1
             }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExtAttributeDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -37932,63 +35216,61 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Impl::_TAO_InterfaceAttrExtensio
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -38039,8 +35321,8 @@ CORBA::_TAO_InterfaceAttrExtension_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::InterfaceAttrExtension::InterfaceAttrExtension (int collocated)
 {
@@ -38061,7 +35343,7 @@ CORBA::InterfaceAttrExtension::CORBA_InterfaceAttrExtension_setup_collocation (i
 CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
 {}
 
-void 
+void
 CORBA::InterfaceAttrExtension::_tao_any_destructor (void *_tao_void_pointer)
 {
   InterfaceAttrExtension *tmp = ACE_static_cast (InterfaceAttrExtension *, _tao_void_pointer);
@@ -38078,7 +35360,7 @@ CORBA::InterfaceAttrExtension::_narrow (
     {
       return InterfaceAttrExtension::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -38087,17 +35369,17 @@ CORBA::InterfaceAttrExtension::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (InterfaceAttrExtension::_nil ());
-      
+
       if (is_a == 0)
         {
           return InterfaceAttrExtension::_nil ();
         }
     }
-  
+
   return InterfaceAttrExtension::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::InterfaceAttrExtension_ptr 
+CORBA::InterfaceAttrExtension_ptr
 CORBA::InterfaceAttrExtension::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -38107,18 +35389,18 @@ CORBA::InterfaceAttrExtension::_unchecked_narrow (
     {
       return InterfaceAttrExtension::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       InterfaceAttrExtension_ptr default_proxy = InterfaceAttrExtension::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -38136,7 +35418,7 @@ CORBA::InterfaceAttrExtension::_unchecked_narrow (
               InterfaceAttrExtension::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -38149,10 +35431,10 @@ CORBA::InterfaceAttrExtension::_unchecked_narrow (
               InterfaceAttrExtension::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           InterfaceAttrExtension_ptr,
@@ -38172,7 +35454,7 @@ CORBA::InterfaceAttrExtension::_duplicate (InterfaceAttrExtension_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -38207,7 +35489,7 @@ CORBA::InterfaceAttrExtension::_is_a (
 void *CORBA::InterfaceAttrExtension::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id)
@@ -38226,12 +35508,12 @@ void *CORBA::InterfaceAttrExtension::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -38240,6 +35522,12 @@ const char* CORBA::InterfaceAttrExtension::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0";
 }
 
+CORBA::Boolean
+CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -38247,55 +35535,55 @@ static const CORBA::Long _oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescri
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   73,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636541), 
-  ACE_NTOHL (0x74747245), 
-  ACE_NTOHL (0x7874656e), 
-  ACE_NTOHL (0x73696f6e), 
-  ACE_NTOHL (0x2f457874), 
-  ACE_NTOHL (0x46756c6c), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f496e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636541),
+  ACE_NTOHL (0x74747245),
+  ACE_NTOHL (0x7874656e),
+  ACE_NTOHL (0x73696f6e),
+  ACE_NTOHL (0x2f457874),
+  ACE_NTOHL (0x46756c6c),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x65446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0
     28,
-  ACE_NTOHL (0x45787446), 
-  ACE_NTOHL (0x756c6c49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x45787446),
+  ACE_NTOHL (0x756c6c49),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x66616365),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = ExtFullInterfaceDescription
   8, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -38304,75 +35592,75 @@ static const CORBA::Long _oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescri
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
   1340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x4f704465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1260, // encapsulation length
@@ -38381,27 +35669,27 @@ static const CORBA::Long _oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescri
       1244, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffe14, // negative offset (-492)
@@ -38410,73 +35698,73 @@ static const CORBA::Long _oc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescri
                 0xffffffff, // indirection
         0xfffffe58, // negative offset (-424)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffe40, // negative offset (-448)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffea0, // negative offset (-352)
         7,
-        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x72657375),
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
-          ACE_NTOHL (0x65726174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f70),
+          ACE_NTOHL (0x65726174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x4f706572),
+          ACE_NTOHL (0x6174696f),
+          ACE_NTOHL (0x6e4d6f64),
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e), 
-          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4f505f4e),
+          ACE_NTOHL (0x4f524d41),
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f), 
-          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x4f505f4f),
+          ACE_NTOHL (0x4e455741),
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-          
+
         9,
-        ACE_NTOHL (0x636f6e74), 
-        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x636f6e74),
+        ACE_NTOHL (0x65787473),
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         168, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
-          ACE_NTOHL (0x6e746578), 
-          ACE_NTOHL (0x74496453), 
-          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+          ACE_NTOHL (0x74496453),
+          ACE_NTOHL (0x65713a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x436f6e74),
+          ACE_NTOHL (0x65787449),
+          ACE_NTOHL (0x64536571),
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           96, // encapsulation length
@@ -38485,21 +35773,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             80, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f436f),
+              ACE_NTOHL (0x6e746578),
+              ACE_NTOHL (0x74496465),
+              ACE_NTOHL (0x6e746966),
+              ACE_NTOHL (0x6965723a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x436f6e74),
+              ACE_NTOHL (0x65787449),
+              ACE_NTOHL (0x64656e74),
+              ACE_NTOHL (0x69666965),
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             0xffffffff, // indirection
               0xfffffc94, // negative offset (-876)
@@ -38508,28 +35796,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261), 
-        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x70617261),
+        ACE_NTOHL (0x6d657465),
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         428, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x50617244),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           348, // encapsulation length
@@ -38538,117 +35826,117 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             332, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x74657244), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x74657244),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x72446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffffbb4, // negative offset (-1100)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
-                
+
               5,
-              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x6d6f6465),
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
-                ACE_NTOHL (0x72616d65), 
-                ACE_NTOHL (0x7465724d), 
-                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5061),
+                ACE_NTOHL (0x72616d65),
+                ACE_NTOHL (0x7465724d),
+                ACE_NTOHL (0x6f64653a),
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x50617261),
+                ACE_NTOHL (0x6d657465),
+                ACE_NTOHL (0x724d6f64),
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f4f55),
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-                
+
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
@@ -38657,27 +35945,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             180, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff9f0, // negative offset (-1552)
@@ -38686,18 +35974,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                             0xffffffff, // indirection
               0xfffffa34, // negative offset (-1484)
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             0xffffffff, // indirection
               0xfffffa1c, // negative offset (-1508)
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
                             0xffffffff, // indirection
               0xfffffa7c, // negative offset (-1412)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -38710,30 +35998,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   468, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4578), 
-    ACE_NTOHL (0x74417474), 
-    ACE_NTOHL (0x72446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4578),
+    ACE_NTOHL (0x74417474),
+    ACE_NTOHL (0x72446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
         22,
-    ACE_NTOHL (0x45787441), 
-    ACE_NTOHL (0x74747244), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x45787441),
+    ACE_NTOHL (0x74747244),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e5365),
     ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     380, // encapsulation length
@@ -38742,28 +36030,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       364, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         46,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x74417474), 
-        ACE_NTOHL (0x72696275), 
-        ACE_NTOHL (0x74654465), 
-        ACE_NTOHL (0x73637269), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x74417474),
+        ACE_NTOHL (0x72696275),
+        ACE_NTOHL (0x74654465),
+        ACE_NTOHL (0x73637269),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e3a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
                 24,
-        ACE_NTOHL (0x45787441), 
-        ACE_NTOHL (0x74747269), 
-        ACE_NTOHL (0x62757465), 
-        ACE_NTOHL (0x44657363), 
-        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x45787441),
+        ACE_NTOHL (0x74747269),
+        ACE_NTOHL (0x62757465),
+        ACE_NTOHL (0x44657363),
+        ACE_NTOHL (0x72697074),
         ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
         8, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff8b4, // negative offset (-1868)
@@ -38772,64 +36060,64 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffff8f8, // negative offset (-1800)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffff8e0, // negative offset (-1824)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffff940, // negative offset (-1728)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-          
+
         15,
-        ACE_NTOHL (0x6765745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6765745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
                 0xffffffff, // indirection
         0xfffffd18, // negative offset (-744)
         15,
-        ACE_NTOHL (0x7075745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x7075745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
                 0xffffffff, // indirection
         0xfffffcfc, // negative offset (-772)
@@ -38838,28 +36126,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   16,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = base_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
@@ -38870,7 +36158,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -38887,7 +36175,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceD
 ::CORBA::TypeCode_ptr CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
   &_tc_TAO_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -38897,6 +36185,37 @@ void CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destru
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ExtFullInterfaceDescription
+    >;
+
+template class
+  TAO_Out_T<
+      ExtFullInterfaceDescription,
+      ExtFullInterfaceDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ExtFullInterfaceDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ExtFullInterfaceDescription, \
+      ExtFullInterfaceDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * CORBA::InterfaceAttrExtension::describe_ext_interface (
@@ -38906,10 +36225,10 @@ void CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destru
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceAttrExtension_Proxy_Impl &proxy = 
+  _TAO_InterfaceAttrExtension_Proxy_Impl &proxy =
     this->the_TAO_InterfaceAttrExtension_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_ext_interface (
       this
       ACE_ENV_ARG_PARAMETER
@@ -38933,10 +36252,10 @@ void CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destru
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceAttrExtension_Proxy_Impl &proxy = 
+  _TAO_InterfaceAttrExtension_Proxy_Impl &proxy =
     this->the_TAO_InterfaceAttrExtension_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_ext_attribute (
       this,
       id,
@@ -38957,24 +36276,24 @@ static const CORBA::Long _oc_CORBA_InterfaceAttrExtension[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636541), 
-  ACE_NTOHL (0x74747245), 
-  ACE_NTOHL (0x7874656e), 
-  ACE_NTOHL (0x73696f6e), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f496e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636541),
+  ACE_NTOHL (0x74747245),
+  ACE_NTOHL (0x7874656e),
+  ACE_NTOHL (0x73696f6e),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InterfaceAttrExtension:1.0
     23,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65417474), 
-  ACE_NTOHL (0x72457874), 
-  ACE_NTOHL (0x656e7369), 
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x65417474),
+  ACE_NTOHL (0x72457874),
+  ACE_NTOHL (0x656e7369),
   ACE_NTOHL (0x6f6e0000),  // name = InterfaceAttrExtension
   };
 
@@ -39001,7 +36320,7 @@ TAO_NAMESPACE_END
 int CORBA::ExtInterfaceDef::_tao_class_id = 0;
 
 CORBA::ExtInterfaceDef_ptr
-tao_CORBA_ExtInterfaceDef_duplicate (
+CORBA::tao_ExtInterfaceDef_life::tao_duplicate (
     CORBA::ExtInterfaceDef_ptr p
   )
 {
@@ -39009,7 +36328,7 @@ tao_CORBA_ExtInterfaceDef_duplicate (
 }
 
 void
-tao_CORBA_ExtInterfaceDef_release (
+CORBA::tao_ExtInterfaceDef_life::tao_release (
     CORBA::ExtInterfaceDef_ptr p
   )
 {
@@ -39017,228 +36336,64 @@ tao_CORBA_ExtInterfaceDef_release (
 }
 
 CORBA::ExtInterfaceDef_ptr
-tao_CORBA_ExtInterfaceDef_nil (
+CORBA::tao_ExtInterfaceDef_life::tao_nil (
     void
   )
 {
   return CORBA::ExtInterfaceDef::_nil ();
 }
 
-CORBA::ExtInterfaceDef_ptr
-tao_CORBA_ExtInterfaceDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ExtInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ExtInterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA::ExtInterfaceDef **tmp =
-    ACE_static_cast (CORBA::ExtInterfaceDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ExtInterfaceDef_marshal (
+CORBA::tao_ExtInterfaceDef_life::tao_marshal (
     CORBA::ExtInterfaceDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ExtInterfaceDef_var
-// *************************************************************
-
-CORBA::ExtInterfaceDef_var::ExtInterfaceDef_var (void)
-  : ptr_ (ExtInterfaceDef::_nil ())
-{}
-
-::CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ExtInterfaceDef_var::ExtInterfaceDef_var (const ::CORBA::ExtInterfaceDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ExtInterfaceDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ExtInterfaceDef_var::~ExtInterfaceDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ExtInterfaceDef_var &
-CORBA::ExtInterfaceDef_var::operator= (ExtInterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtInterfaceDef_var &
-CORBA::ExtInterfaceDef_var::operator= (const ::CORBA::ExtInterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ExtInterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ExtInterfaceDef_var::operator const ::CORBA::ExtInterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ExtInterfaceDef_var::operator ::CORBA::ExtInterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtInterfaceDef_ptr &
-CORBA::ExtInterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtInterfaceDef_ptr &
-CORBA::ExtInterfaceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtInterfaceDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ExtInterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ExtInterfaceDef::_nil ();
-  return val;
-}
-
-::CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef_var::tao_duplicate (ExtInterfaceDef_ptr p)
-{
-  return ::CORBA::ExtInterfaceDef::_duplicate (p);
-}
-
-void
-CORBA::ExtInterfaceDef_var::tao_release (ExtInterfaceDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef_var::tao_nil (void)
-{
-  return ::CORBA::ExtInterfaceDef::_nil ();
-}
-
-::CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef_var::tao_narrow (
+CORBA::ExtInterfaceDef_ptr
+CORBA::tao_ExtInterfaceDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ExtInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExtInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ExtInterfaceDef_var::tao_upcast (void *src)
+CORBA::tao_ExtInterfaceDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ExtInterfaceDef **tmp =
-    ACE_static_cast (ExtInterfaceDef **, src);
+  CORBA::ExtInterfaceDef **tmp =
+    ACE_static_cast (CORBA::ExtInterfaceDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ExtInterfaceDef_out
-// *************************************************************
-
-CORBA::ExtInterfaceDef_out::ExtInterfaceDef_out (ExtInterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ExtInterfaceDef::_nil ();
-}
-
-CORBA::ExtInterfaceDef_out::ExtInterfaceDef_out (ExtInterfaceDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtInterfaceDef::_nil ();
-}
-
-CORBA::ExtInterfaceDef_out::ExtInterfaceDef_out (const ::CORBA::ExtInterfaceDef_out &p)
-  : ptr_ (ACE_const_cast (ExtInterfaceDef_out &, p).ptr_)
-{}
-
-::CORBA::ExtInterfaceDef_out &
-CORBA::ExtInterfaceDef_out::operator= (const ::CORBA::ExtInterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtInterfaceDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ExtInterfaceDef_out &
-CORBA::ExtInterfaceDef_out::operator= (const ::CORBA::ExtInterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA::ExtInterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ExtInterfaceDef_out &
-CORBA::ExtInterfaceDef_out::operator= (ExtInterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtInterfaceDef_out::operator ::CORBA::ExtInterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtInterfaceDef_ptr &
-CORBA::ExtInterfaceDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtInterfaceDef_ptr
-CORBA::ExtInterfaceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ExtInterfaceDef,
+        CORBA::tao_ExtInterfaceDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ExtInterfaceDef,
+        CORBA::tao_ExtInterfaceDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ExtInterfaceDef, \
+        CORBA::tao_ExtInterfaceDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ExtInterfaceDef, \
+        CORBA::tao_ExtInterfaceDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -39251,7 +36406,7 @@ CORBA::ExtInterfaceDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ExtInterfaceDef_Proxy_Impl::_TAO_ExtInterfaceDef_Proxy_Impl (void)
@@ -39263,7 +36418,7 @@ CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Impl::_TAO_ExtInterfaceDef_Remote_Proxy
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -39314,8 +36469,8 @@ CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ExtInterfaceDef::ExtInterfaceDef (int collocated)
 {
@@ -39331,7 +36486,7 @@ CORBA::ExtInterfaceDef::CORBA_ExtInterfaceDef_setup_collocation (int collocated)
   else
     this->the_TAO_ExtInterfaceDef_Proxy_Broker_ =
       ::CORBA::_TAO_ExtInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtInterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_InterfaceDef_setup_collocation (collocated);
   this->CORBA_InterfaceAttrExtension_setup_collocation (collocated);
 }
@@ -39339,7 +36494,7 @@ CORBA::ExtInterfaceDef::CORBA_ExtInterfaceDef_setup_collocation (int collocated)
 CORBA::ExtInterfaceDef::~ExtInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::ExtInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtInterfaceDef *tmp = ACE_static_cast (ExtInterfaceDef *, _tao_void_pointer);
@@ -39356,7 +36511,7 @@ CORBA::ExtInterfaceDef::_narrow (
     {
       return ExtInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -39365,17 +36520,17 @@ CORBA::ExtInterfaceDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ExtInterfaceDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ExtInterfaceDef::_nil ();
         }
     }
-  
+
   return ExtInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ExtInterfaceDef_ptr 
+CORBA::ExtInterfaceDef_ptr
 CORBA::ExtInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -39385,18 +36540,18 @@ CORBA::ExtInterfaceDef::_unchecked_narrow (
     {
       return ExtInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ExtInterfaceDef_ptr default_proxy = ExtInterfaceDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -39414,7 +36569,7 @@ CORBA::ExtInterfaceDef::_unchecked_narrow (
               ExtInterfaceDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -39427,10 +36582,10 @@ CORBA::ExtInterfaceDef::_unchecked_narrow (
               ExtInterfaceDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ExtInterfaceDef_ptr,
@@ -39450,7 +36605,7 @@ CORBA::ExtInterfaceDef::_duplicate (ExtInterfaceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -39509,7 +36664,7 @@ CORBA::ExtInterfaceDef::_is_a (
 void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ExtInterfaceDef)::_tao_class_id)
@@ -39612,12 +36767,12 @@ void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -39626,6 +36781,12 @@ const char* CORBA::ExtInterfaceDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ExtInterfaceDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -39633,20 +36794,20 @@ static const CORBA::Long _oc_CORBA_ExtInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63654465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726661),
+  ACE_NTOHL (0x63654465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtInterfaceDef:1.0
     16,
-  ACE_NTOHL (0x45787449), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x45787449),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x66616365),
   ACE_NTOHL (0x44656600),  // name = ExtInterfaceDef
   };
 
@@ -39673,7 +36834,7 @@ TAO_NAMESPACE_END
 int CORBA::AbstractInterfaceDef::_tao_class_id = 0;
 
 CORBA::AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_duplicate (
+CORBA::tao_AbstractInterfaceDef_life::tao_duplicate (
     CORBA::AbstractInterfaceDef_ptr p
   )
 {
@@ -39681,7 +36842,7 @@ tao_CORBA_AbstractInterfaceDef_duplicate (
 }
 
 void
-tao_CORBA_AbstractInterfaceDef_release (
+CORBA::tao_AbstractInterfaceDef_life::tao_release (
     CORBA::AbstractInterfaceDef_ptr p
   )
 {
@@ -39689,228 +36850,64 @@ tao_CORBA_AbstractInterfaceDef_release (
 }
 
 CORBA::AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_nil (
+CORBA::tao_AbstractInterfaceDef_life::tao_nil (
     void
   )
 {
   return CORBA::AbstractInterfaceDef::_nil ();
 }
 
-CORBA::AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::AbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_AbstractInterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA::AbstractInterfaceDef **tmp =
-    ACE_static_cast (CORBA::AbstractInterfaceDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_AbstractInterfaceDef_marshal (
+CORBA::tao_AbstractInterfaceDef_life::tao_marshal (
     CORBA::AbstractInterfaceDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::AbstractInterfaceDef_var
-// *************************************************************
-
-CORBA::AbstractInterfaceDef_var::AbstractInterfaceDef_var (void)
-  : ptr_ (AbstractInterfaceDef::_nil ())
-{}
-
-::CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::AbstractInterfaceDef_var::AbstractInterfaceDef_var (const ::CORBA::AbstractInterfaceDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (AbstractInterfaceDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::AbstractInterfaceDef_var::~AbstractInterfaceDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::AbstractInterfaceDef_var &
-CORBA::AbstractInterfaceDef_var::operator= (AbstractInterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::AbstractInterfaceDef_var &
-CORBA::AbstractInterfaceDef_var::operator= (const ::CORBA::AbstractInterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::AbstractInterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::AbstractInterfaceDef_var::operator const ::CORBA::AbstractInterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::AbstractInterfaceDef_var::operator ::CORBA::AbstractInterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::AbstractInterfaceDef_ptr &
-CORBA::AbstractInterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::AbstractInterfaceDef_ptr &
-CORBA::AbstractInterfaceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::AbstractInterfaceDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::AbstractInterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::AbstractInterfaceDef::_nil ();
-  return val;
-}
-
-::CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef_var::tao_duplicate (AbstractInterfaceDef_ptr p)
-{
-  return ::CORBA::AbstractInterfaceDef::_duplicate (p);
+  return p->marshal (cdr);
 }
 
-void
-CORBA::AbstractInterfaceDef_var::tao_release (AbstractInterfaceDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef_var::tao_nil (void)
-{
-  return ::CORBA::AbstractInterfaceDef::_nil ();
-}
-
-::CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef_var::tao_narrow (
+CORBA::AbstractInterfaceDef_ptr
+CORBA::tao_AbstractInterfaceDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::AbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::AbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::AbstractInterfaceDef_var::tao_upcast (void *src)
+CORBA::tao_AbstractInterfaceDef_cast::tao_upcast (
+    void *src
+  )
 {
-  AbstractInterfaceDef **tmp =
-    ACE_static_cast (AbstractInterfaceDef **, src);
+  CORBA::AbstractInterfaceDef **tmp =
+    ACE_static_cast (CORBA::AbstractInterfaceDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::AbstractInterfaceDef_out
-// *************************************************************
-
-CORBA::AbstractInterfaceDef_out::AbstractInterfaceDef_out (AbstractInterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::AbstractInterfaceDef::_nil ();
-}
-
-CORBA::AbstractInterfaceDef_out::AbstractInterfaceDef_out (AbstractInterfaceDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::AbstractInterfaceDef::_nil ();
-}
-
-CORBA::AbstractInterfaceDef_out::AbstractInterfaceDef_out (const ::CORBA::AbstractInterfaceDef_out &p)
-  : ptr_ (ACE_const_cast (AbstractInterfaceDef_out &, p).ptr_)
-{}
-
-::CORBA::AbstractInterfaceDef_out &
-CORBA::AbstractInterfaceDef_out::operator= (const ::CORBA::AbstractInterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (AbstractInterfaceDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::AbstractInterfaceDef_out &
-CORBA::AbstractInterfaceDef_out::operator= (const ::CORBA::AbstractInterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA::AbstractInterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::AbstractInterfaceDef_out &
-CORBA::AbstractInterfaceDef_out::operator= (AbstractInterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::AbstractInterfaceDef_out::operator ::CORBA::AbstractInterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::AbstractInterfaceDef_ptr &
-CORBA::AbstractInterfaceDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::AbstractInterfaceDef,
+        CORBA::tao_AbstractInterfaceDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::AbstractInterfaceDef,
+        CORBA::tao_AbstractInterfaceDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::AbstractInterfaceDef, \
+        CORBA::tao_AbstractInterfaceDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::AbstractInterfaceDef, \
+        CORBA::tao_AbstractInterfaceDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -39923,7 +36920,7 @@ CORBA::AbstractInterfaceDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_AbstractInterfaceDef_Proxy_Impl::_TAO_AbstractInterfaceDef_Proxy_Impl (void)
@@ -39935,7 +36932,7 @@ CORBA::_TAO_AbstractInterfaceDef_Remote_Proxy_Impl::_TAO_AbstractInterfaceDef_Re
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -39986,8 +36983,8 @@ CORBA::_TAO_AbstractInterfaceDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::AbstractInterfaceDef::AbstractInterfaceDef (int collocated)
 {
@@ -40003,14 +37000,14 @@ CORBA::AbstractInterfaceDef::CORBA_AbstractInterfaceDef_setup_collocation (int c
   else
     this->the_TAO_AbstractInterfaceDef_Proxy_Broker_ =
       ::CORBA::_TAO_AbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_AbstractInterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_InterfaceDef_setup_collocation (collocated);
 }
 
 CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AbstractInterfaceDef *tmp = ACE_static_cast (AbstractInterfaceDef *, _tao_void_pointer);
@@ -40027,7 +37024,7 @@ CORBA::AbstractInterfaceDef::_narrow (
     {
       return AbstractInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -40036,17 +37033,17 @@ CORBA::AbstractInterfaceDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (AbstractInterfaceDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return AbstractInterfaceDef::_nil ();
         }
     }
-  
+
   return AbstractInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::AbstractInterfaceDef_ptr 
+CORBA::AbstractInterfaceDef_ptr
 CORBA::AbstractInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -40056,18 +37053,18 @@ CORBA::AbstractInterfaceDef::_unchecked_narrow (
     {
       return AbstractInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       AbstractInterfaceDef_ptr default_proxy = AbstractInterfaceDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -40085,7 +37082,7 @@ CORBA::AbstractInterfaceDef::_unchecked_narrow (
               AbstractInterfaceDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -40098,10 +37095,10 @@ CORBA::AbstractInterfaceDef::_unchecked_narrow (
               AbstractInterfaceDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           AbstractInterfaceDef_ptr,
@@ -40121,7 +37118,7 @@ CORBA::AbstractInterfaceDef::_duplicate (AbstractInterfaceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -40176,7 +37173,7 @@ CORBA::AbstractInterfaceDef::_is_a (
 void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, AbstractInterfaceDef)::_tao_class_id)
@@ -40265,12 +37262,12 @@ void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -40279,6 +37276,12 @@ const char* CORBA::AbstractInterfaceDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -40286,23 +37289,23 @@ static const CORBA::Long _oc_CORBA_AbstractInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4162), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x6374496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4162),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x6374496e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636544),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AbstractInterfaceDef:1.0
     21,
-  ACE_NTOHL (0x41627374), 
-  ACE_NTOHL (0x72616374), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446566), 
+  ACE_NTOHL (0x41627374),
+  ACE_NTOHL (0x72616374),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x65446566),
   ACE_NTOHL (0x0),  // name = AbstractInterfaceDef
   };
 
@@ -40329,7 +37332,7 @@ TAO_NAMESPACE_END
 int CORBA::ExtAbstractInterfaceDef::_tao_class_id = 0;
 
 CORBA::ExtAbstractInterfaceDef_ptr
-tao_CORBA_ExtAbstractInterfaceDef_duplicate (
+CORBA::tao_ExtAbstractInterfaceDef_life::tao_duplicate (
     CORBA::ExtAbstractInterfaceDef_ptr p
   )
 {
@@ -40337,7 +37340,7 @@ tao_CORBA_ExtAbstractInterfaceDef_duplicate (
 }
 
 void
-tao_CORBA_ExtAbstractInterfaceDef_release (
+CORBA::tao_ExtAbstractInterfaceDef_life::tao_release (
     CORBA::ExtAbstractInterfaceDef_ptr p
   )
 {
@@ -40345,228 +37348,64 @@ tao_CORBA_ExtAbstractInterfaceDef_release (
 }
 
 CORBA::ExtAbstractInterfaceDef_ptr
-tao_CORBA_ExtAbstractInterfaceDef_nil (
+CORBA::tao_ExtAbstractInterfaceDef_life::tao_nil (
     void
   )
 {
   return CORBA::ExtAbstractInterfaceDef::_nil ();
 }
 
-CORBA::ExtAbstractInterfaceDef_ptr
-tao_CORBA_ExtAbstractInterfaceDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ExtAbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ExtAbstractInterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA::ExtAbstractInterfaceDef **tmp =
-    ACE_static_cast (CORBA::ExtAbstractInterfaceDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ExtAbstractInterfaceDef_marshal (
+CORBA::tao_ExtAbstractInterfaceDef_life::tao_marshal (
     CORBA::ExtAbstractInterfaceDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ExtAbstractInterfaceDef_var
-// *************************************************************
-
-CORBA::ExtAbstractInterfaceDef_var::ExtAbstractInterfaceDef_var (void)
-  : ptr_ (ExtAbstractInterfaceDef::_nil ())
-{}
-
-::CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ExtAbstractInterfaceDef_var::ExtAbstractInterfaceDef_var (const ::CORBA::ExtAbstractInterfaceDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ExtAbstractInterfaceDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ExtAbstractInterfaceDef_var::~ExtAbstractInterfaceDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ExtAbstractInterfaceDef_var &
-CORBA::ExtAbstractInterfaceDef_var::operator= (ExtAbstractInterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return p->marshal (cdr);
 }
 
-CORBA::ExtAbstractInterfaceDef_var &
-CORBA::ExtAbstractInterfaceDef_var::operator= (const ::CORBA::ExtAbstractInterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ExtAbstractInterfaceDef_var::operator const ::CORBA::ExtAbstractInterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ExtAbstractInterfaceDef_var::operator ::CORBA::ExtAbstractInterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr &
-CORBA::ExtAbstractInterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr &
-CORBA::ExtAbstractInterfaceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ExtAbstractInterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_nil ();
-  return val;
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef_var::tao_duplicate (ExtAbstractInterfaceDef_ptr p)
-{
-  return ::CORBA::ExtAbstractInterfaceDef::_duplicate (p);
-}
-
-void
-CORBA::ExtAbstractInterfaceDef_var::tao_release (ExtAbstractInterfaceDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef_var::tao_nil (void)
-{
-  return ::CORBA::ExtAbstractInterfaceDef::_nil ();
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef_var::tao_narrow (
+CORBA::ExtAbstractInterfaceDef_ptr
+CORBA::tao_ExtAbstractInterfaceDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ExtAbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExtAbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ExtAbstractInterfaceDef_var::tao_upcast (void *src)
+CORBA::tao_ExtAbstractInterfaceDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ExtAbstractInterfaceDef **tmp =
-    ACE_static_cast (ExtAbstractInterfaceDef **, src);
+  CORBA::ExtAbstractInterfaceDef **tmp =
+    ACE_static_cast (CORBA::ExtAbstractInterfaceDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ExtAbstractInterfaceDef_out
-// *************************************************************
-
-CORBA::ExtAbstractInterfaceDef_out::ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_nil ();
-}
-
-CORBA::ExtAbstractInterfaceDef_out::ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_nil ();
-}
-
-CORBA::ExtAbstractInterfaceDef_out::ExtAbstractInterfaceDef_out (const ::CORBA::ExtAbstractInterfaceDef_out &p)
-  : ptr_ (ACE_const_cast (ExtAbstractInterfaceDef_out &, p).ptr_)
-{}
-
-::CORBA::ExtAbstractInterfaceDef_out &
-CORBA::ExtAbstractInterfaceDef_out::operator= (const ::CORBA::ExtAbstractInterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtAbstractInterfaceDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ExtAbstractInterfaceDef_out &
-CORBA::ExtAbstractInterfaceDef_out::operator= (const ::CORBA::ExtAbstractInterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA::ExtAbstractInterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ExtAbstractInterfaceDef_out &
-CORBA::ExtAbstractInterfaceDef_out::operator= (ExtAbstractInterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtAbstractInterfaceDef_out::operator ::CORBA::ExtAbstractInterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr &
-CORBA::ExtAbstractInterfaceDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtAbstractInterfaceDef_ptr
-CORBA::ExtAbstractInterfaceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ExtAbstractInterfaceDef,
+        CORBA::tao_ExtAbstractInterfaceDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ExtAbstractInterfaceDef,
+        CORBA::tao_ExtAbstractInterfaceDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ExtAbstractInterfaceDef, \
+        CORBA::tao_ExtAbstractInterfaceDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ExtAbstractInterfaceDef, \
+        CORBA::tao_ExtAbstractInterfaceDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -40579,7 +37418,7 @@ CORBA::ExtAbstractInterfaceDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ExtAbstractInterfaceDef_Proxy_Impl::_TAO_ExtAbstractInterfaceDef_Proxy_Impl (void)
@@ -40591,7 +37430,7 @@ CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl::_TAO_ExtAbstractInterface
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -40642,8 +37481,8 @@ CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (int collocated)
 {
@@ -40659,7 +37498,7 @@ CORBA::ExtAbstractInterfaceDef::CORBA_ExtAbstractInterfaceDef_setup_collocation
   else
     this->the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ =
       ::CORBA::_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_AbstractInterfaceDef_setup_collocation (collocated);
   this->CORBA_InterfaceAttrExtension_setup_collocation (collocated);
 }
@@ -40667,7 +37506,7 @@ CORBA::ExtAbstractInterfaceDef::CORBA_ExtAbstractInterfaceDef_setup_collocation
 CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::ExtAbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtAbstractInterfaceDef *tmp = ACE_static_cast (ExtAbstractInterfaceDef *, _tao_void_pointer);
@@ -40684,7 +37523,7 @@ CORBA::ExtAbstractInterfaceDef::_narrow (
     {
       return ExtAbstractInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -40693,17 +37532,17 @@ CORBA::ExtAbstractInterfaceDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ExtAbstractInterfaceDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ExtAbstractInterfaceDef::_nil ();
         }
     }
-  
+
   return ExtAbstractInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ExtAbstractInterfaceDef_ptr 
+CORBA::ExtAbstractInterfaceDef_ptr
 CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -40713,18 +37552,18 @@ CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
     {
       return ExtAbstractInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ExtAbstractInterfaceDef_ptr default_proxy = ExtAbstractInterfaceDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -40742,7 +37581,7 @@ CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
               ExtAbstractInterfaceDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -40755,10 +37594,10 @@ CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
               ExtAbstractInterfaceDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ExtAbstractInterfaceDef_ptr,
@@ -40778,7 +37617,7 @@ CORBA::ExtAbstractInterfaceDef::_duplicate (ExtAbstractInterfaceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -40841,7 +37680,7 @@ CORBA::ExtAbstractInterfaceDef::_is_a (
 void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ExtAbstractInterfaceDef)::_tao_class_id)
@@ -40958,12 +37797,12 @@ void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -40972,6 +37811,12 @@ const char* CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void) cons
   return "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -40979,24 +37824,24 @@ static const CORBA::Long _oc_CORBA_ExtAbstractInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x74416273), 
-  ACE_NTOHL (0x74726163), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63654465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x74416273),
+  ACE_NTOHL (0x74726163),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726661),
+  ACE_NTOHL (0x63654465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0
     24,
-  ACE_NTOHL (0x45787441), 
-  ACE_NTOHL (0x62737472), 
-  ACE_NTOHL (0x61637449), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
+  ACE_NTOHL (0x45787441),
+  ACE_NTOHL (0x62737472),
+  ACE_NTOHL (0x61637449),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x66616365),
   ACE_NTOHL (0x44656600),  // name = ExtAbstractInterfaceDef
   };
 
@@ -41023,7 +37868,7 @@ TAO_NAMESPACE_END
 int CORBA::LocalInterfaceDef::_tao_class_id = 0;
 
 CORBA::LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_duplicate (
+CORBA::tao_LocalInterfaceDef_life::tao_duplicate (
     CORBA::LocalInterfaceDef_ptr p
   )
 {
@@ -41031,7 +37876,7 @@ tao_CORBA_LocalInterfaceDef_duplicate (
 }
 
 void
-tao_CORBA_LocalInterfaceDef_release (
+CORBA::tao_LocalInterfaceDef_life::tao_release (
     CORBA::LocalInterfaceDef_ptr p
   )
 {
@@ -41039,228 +37884,64 @@ tao_CORBA_LocalInterfaceDef_release (
 }
 
 CORBA::LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_nil (
+CORBA::tao_LocalInterfaceDef_life::tao_nil (
     void
   )
 {
   return CORBA::LocalInterfaceDef::_nil ();
 }
 
-CORBA::LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::LocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_LocalInterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA::LocalInterfaceDef **tmp =
-    ACE_static_cast (CORBA::LocalInterfaceDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_LocalInterfaceDef_marshal (
+CORBA::tao_LocalInterfaceDef_life::tao_marshal (
     CORBA::LocalInterfaceDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::LocalInterfaceDef_var
-// *************************************************************
-
-CORBA::LocalInterfaceDef_var::LocalInterfaceDef_var (void)
-  : ptr_ (LocalInterfaceDef::_nil ())
-{}
-
-::CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::LocalInterfaceDef_var::LocalInterfaceDef_var (const ::CORBA::LocalInterfaceDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (LocalInterfaceDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::LocalInterfaceDef_var::~LocalInterfaceDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::LocalInterfaceDef_var &
-CORBA::LocalInterfaceDef_var::operator= (LocalInterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::LocalInterfaceDef_var &
-CORBA::LocalInterfaceDef_var::operator= (const ::CORBA::LocalInterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::LocalInterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::LocalInterfaceDef_var::operator const ::CORBA::LocalInterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::LocalInterfaceDef_var::operator ::CORBA::LocalInterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::LocalInterfaceDef_ptr &
-CORBA::LocalInterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::LocalInterfaceDef_ptr &
-CORBA::LocalInterfaceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::LocalInterfaceDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::LocalInterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::LocalInterfaceDef::_nil ();
-  return val;
-}
-
-::CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef_var::tao_duplicate (LocalInterfaceDef_ptr p)
-{
-  return ::CORBA::LocalInterfaceDef::_duplicate (p);
+  return p->marshal (cdr);
 }
 
-void
-CORBA::LocalInterfaceDef_var::tao_release (LocalInterfaceDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef_var::tao_nil (void)
-{
-  return ::CORBA::LocalInterfaceDef::_nil ();
-}
-
-::CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef_var::tao_narrow (
+CORBA::LocalInterfaceDef_ptr
+CORBA::tao_LocalInterfaceDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::LocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::LocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::LocalInterfaceDef_var::tao_upcast (void *src)
+CORBA::tao_LocalInterfaceDef_cast::tao_upcast (
+    void *src
+  )
 {
-  LocalInterfaceDef **tmp =
-    ACE_static_cast (LocalInterfaceDef **, src);
+  CORBA::LocalInterfaceDef **tmp =
+    ACE_static_cast (CORBA::LocalInterfaceDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::LocalInterfaceDef_out
-// *************************************************************
-
-CORBA::LocalInterfaceDef_out::LocalInterfaceDef_out (LocalInterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::LocalInterfaceDef::_nil ();
-}
-
-CORBA::LocalInterfaceDef_out::LocalInterfaceDef_out (LocalInterfaceDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::LocalInterfaceDef::_nil ();
-}
-
-CORBA::LocalInterfaceDef_out::LocalInterfaceDef_out (const ::CORBA::LocalInterfaceDef_out &p)
-  : ptr_ (ACE_const_cast (LocalInterfaceDef_out &, p).ptr_)
-{}
-
-::CORBA::LocalInterfaceDef_out &
-CORBA::LocalInterfaceDef_out::operator= (const ::CORBA::LocalInterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (LocalInterfaceDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::LocalInterfaceDef_out &
-CORBA::LocalInterfaceDef_out::operator= (const ::CORBA::LocalInterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA::LocalInterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::LocalInterfaceDef_out &
-CORBA::LocalInterfaceDef_out::operator= (LocalInterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::LocalInterfaceDef_out::operator ::CORBA::LocalInterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::LocalInterfaceDef_ptr &
-CORBA::LocalInterfaceDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::LocalInterfaceDef,
+        CORBA::tao_LocalInterfaceDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::LocalInterfaceDef,
+        CORBA::tao_LocalInterfaceDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::LocalInterfaceDef, \
+        CORBA::tao_LocalInterfaceDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::LocalInterfaceDef, \
+        CORBA::tao_LocalInterfaceDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -41273,7 +37954,7 @@ CORBA::LocalInterfaceDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_LocalInterfaceDef_Proxy_Impl::_TAO_LocalInterfaceDef_Proxy_Impl (void)
@@ -41285,7 +37966,7 @@ CORBA::_TAO_LocalInterfaceDef_Remote_Proxy_Impl::_TAO_LocalInterfaceDef_Remote_P
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -41336,8 +38017,8 @@ CORBA::_TAO_LocalInterfaceDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::LocalInterfaceDef::LocalInterfaceDef (int collocated)
 {
@@ -41353,14 +38034,14 @@ CORBA::LocalInterfaceDef::CORBA_LocalInterfaceDef_setup_collocation (int colloca
   else
     this->the_TAO_LocalInterfaceDef_Proxy_Broker_ =
       ::CORBA::_TAO_LocalInterfaceDef_Remote_Proxy_Broker::the_TAO_LocalInterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_InterfaceDef_setup_collocation (collocated);
 }
 
 CORBA::LocalInterfaceDef::~LocalInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   LocalInterfaceDef *tmp = ACE_static_cast (LocalInterfaceDef *, _tao_void_pointer);
@@ -41377,7 +38058,7 @@ CORBA::LocalInterfaceDef::_narrow (
     {
       return LocalInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -41386,17 +38067,17 @@ CORBA::LocalInterfaceDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (LocalInterfaceDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return LocalInterfaceDef::_nil ();
         }
     }
-  
+
   return LocalInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::LocalInterfaceDef_ptr 
+CORBA::LocalInterfaceDef_ptr
 CORBA::LocalInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -41406,18 +38087,18 @@ CORBA::LocalInterfaceDef::_unchecked_narrow (
     {
       return LocalInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       LocalInterfaceDef_ptr default_proxy = LocalInterfaceDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -41435,7 +38116,7 @@ CORBA::LocalInterfaceDef::_unchecked_narrow (
               LocalInterfaceDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -41448,10 +38129,10 @@ CORBA::LocalInterfaceDef::_unchecked_narrow (
               LocalInterfaceDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           LocalInterfaceDef_ptr,
@@ -41471,7 +38152,7 @@ CORBA::LocalInterfaceDef::_duplicate (LocalInterfaceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -41526,7 +38207,7 @@ CORBA::LocalInterfaceDef::_is_a (
 void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, LocalInterfaceDef)::_tao_class_id)
@@ -41615,12 +38296,12 @@ void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -41629,6 +38310,12 @@ const char* CORBA::LocalInterfaceDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -41636,21 +38323,21 @@ static const CORBA::Long _oc_CORBA_LocalInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4c6f), 
-  ACE_NTOHL (0x63616c49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4c6f),
+  ACE_NTOHL (0x63616c49),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x66616365),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/LocalInterfaceDef:1.0
     18,
-  ACE_NTOHL (0x4c6f6361), 
-  ACE_NTOHL (0x6c496e74), 
-  ACE_NTOHL (0x65726661), 
-  ACE_NTOHL (0x63654465), 
+  ACE_NTOHL (0x4c6f6361),
+  ACE_NTOHL (0x6c496e74),
+  ACE_NTOHL (0x65726661),
+  ACE_NTOHL (0x63654465),
   ACE_NTOHL (0x66000000),  // name = LocalInterfaceDef
   };
 
@@ -41677,7 +38364,7 @@ TAO_NAMESPACE_END
 int CORBA::ExtLocalInterfaceDef::_tao_class_id = 0;
 
 CORBA::ExtLocalInterfaceDef_ptr
-tao_CORBA_ExtLocalInterfaceDef_duplicate (
+CORBA::tao_ExtLocalInterfaceDef_life::tao_duplicate (
     CORBA::ExtLocalInterfaceDef_ptr p
   )
 {
@@ -41685,7 +38372,7 @@ tao_CORBA_ExtLocalInterfaceDef_duplicate (
 }
 
 void
-tao_CORBA_ExtLocalInterfaceDef_release (
+CORBA::tao_ExtLocalInterfaceDef_life::tao_release (
     CORBA::ExtLocalInterfaceDef_ptr p
   )
 {
@@ -41693,228 +38380,64 @@ tao_CORBA_ExtLocalInterfaceDef_release (
 }
 
 CORBA::ExtLocalInterfaceDef_ptr
-tao_CORBA_ExtLocalInterfaceDef_nil (
+CORBA::tao_ExtLocalInterfaceDef_life::tao_nil (
     void
   )
 {
   return CORBA::ExtLocalInterfaceDef::_nil ();
 }
 
-CORBA::ExtLocalInterfaceDef_ptr
-tao_CORBA_ExtLocalInterfaceDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ExtLocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ExtLocalInterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA::ExtLocalInterfaceDef **tmp =
-    ACE_static_cast (CORBA::ExtLocalInterfaceDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ExtLocalInterfaceDef_marshal (
+CORBA::tao_ExtLocalInterfaceDef_life::tao_marshal (
     CORBA::ExtLocalInterfaceDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ExtLocalInterfaceDef_var
-// *************************************************************
-
-CORBA::ExtLocalInterfaceDef_var::ExtLocalInterfaceDef_var (void)
-  : ptr_ (ExtLocalInterfaceDef::_nil ())
-{}
-
-::CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ExtLocalInterfaceDef_var::ExtLocalInterfaceDef_var (const ::CORBA::ExtLocalInterfaceDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ExtLocalInterfaceDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ExtLocalInterfaceDef_var::~ExtLocalInterfaceDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ExtLocalInterfaceDef_var &
-CORBA::ExtLocalInterfaceDef_var::operator= (ExtLocalInterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtLocalInterfaceDef_var &
-CORBA::ExtLocalInterfaceDef_var::operator= (const ::CORBA::ExtLocalInterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ExtLocalInterfaceDef_var::operator const ::CORBA::ExtLocalInterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ExtLocalInterfaceDef_var::operator ::CORBA::ExtLocalInterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr &
-CORBA::ExtLocalInterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr &
-CORBA::ExtLocalInterfaceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ExtLocalInterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_nil ();
-  return val;
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef_var::tao_duplicate (ExtLocalInterfaceDef_ptr p)
-{
-  return ::CORBA::ExtLocalInterfaceDef::_duplicate (p);
-}
-
-void
-CORBA::ExtLocalInterfaceDef_var::tao_release (ExtLocalInterfaceDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef_var::tao_nil (void)
-{
-  return ::CORBA::ExtLocalInterfaceDef::_nil ();
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef_var::tao_narrow (
+CORBA::ExtLocalInterfaceDef_ptr
+CORBA::tao_ExtLocalInterfaceDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ExtLocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExtLocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ExtLocalInterfaceDef_var::tao_upcast (void *src)
+CORBA::tao_ExtLocalInterfaceDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ExtLocalInterfaceDef **tmp =
-    ACE_static_cast (ExtLocalInterfaceDef **, src);
+  CORBA::ExtLocalInterfaceDef **tmp =
+    ACE_static_cast (CORBA::ExtLocalInterfaceDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ExtLocalInterfaceDef_out
-// *************************************************************
-
-CORBA::ExtLocalInterfaceDef_out::ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_nil ();
-}
-
-CORBA::ExtLocalInterfaceDef_out::ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_nil ();
-}
-
-CORBA::ExtLocalInterfaceDef_out::ExtLocalInterfaceDef_out (const ::CORBA::ExtLocalInterfaceDef_out &p)
-  : ptr_ (ACE_const_cast (ExtLocalInterfaceDef_out &, p).ptr_)
-{}
-
-::CORBA::ExtLocalInterfaceDef_out &
-CORBA::ExtLocalInterfaceDef_out::operator= (const ::CORBA::ExtLocalInterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtLocalInterfaceDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ExtLocalInterfaceDef_out &
-CORBA::ExtLocalInterfaceDef_out::operator= (const ::CORBA::ExtLocalInterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA::ExtLocalInterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ExtLocalInterfaceDef_out &
-CORBA::ExtLocalInterfaceDef_out::operator= (ExtLocalInterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtLocalInterfaceDef_out::operator ::CORBA::ExtLocalInterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr &
-CORBA::ExtLocalInterfaceDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtLocalInterfaceDef_ptr
-CORBA::ExtLocalInterfaceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ExtLocalInterfaceDef,
+        CORBA::tao_ExtLocalInterfaceDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ExtLocalInterfaceDef,
+        CORBA::tao_ExtLocalInterfaceDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ExtLocalInterfaceDef, \
+        CORBA::tao_ExtLocalInterfaceDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ExtLocalInterfaceDef, \
+        CORBA::tao_ExtLocalInterfaceDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -41927,7 +38450,7 @@ CORBA::ExtLocalInterfaceDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ExtLocalInterfaceDef_Proxy_Impl::_TAO_ExtLocalInterfaceDef_Proxy_Impl (void)
@@ -41939,7 +38462,7 @@ CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl::_TAO_ExtLocalInterfaceDef_Re
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -41990,8 +38513,8 @@ CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (int collocated)
 {
@@ -42007,7 +38530,7 @@ CORBA::ExtLocalInterfaceDef::CORBA_ExtLocalInterfaceDef_setup_collocation (int c
   else
     this->the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ =
       ::CORBA::_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker::the_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_LocalInterfaceDef_setup_collocation (collocated);
   this->CORBA_InterfaceAttrExtension_setup_collocation (collocated);
 }
@@ -42015,7 +38538,7 @@ CORBA::ExtLocalInterfaceDef::CORBA_ExtLocalInterfaceDef_setup_collocation (int c
 CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void)
 {}
 
-void 
+void
 CORBA::ExtLocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtLocalInterfaceDef *tmp = ACE_static_cast (ExtLocalInterfaceDef *, _tao_void_pointer);
@@ -42032,7 +38555,7 @@ CORBA::ExtLocalInterfaceDef::_narrow (
     {
       return ExtLocalInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -42041,17 +38564,17 @@ CORBA::ExtLocalInterfaceDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ExtLocalInterfaceDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ExtLocalInterfaceDef::_nil ();
         }
     }
-  
+
   return ExtLocalInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ExtLocalInterfaceDef_ptr 
+CORBA::ExtLocalInterfaceDef_ptr
 CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -42061,18 +38584,18 @@ CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
     {
       return ExtLocalInterfaceDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ExtLocalInterfaceDef_ptr default_proxy = ExtLocalInterfaceDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -42090,7 +38613,7 @@ CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
               ExtLocalInterfaceDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -42103,10 +38626,10 @@ CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
               ExtLocalInterfaceDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ExtLocalInterfaceDef_ptr,
@@ -42126,7 +38649,7 @@ CORBA::ExtLocalInterfaceDef::_duplicate (ExtLocalInterfaceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -42189,7 +38712,7 @@ CORBA::ExtLocalInterfaceDef::_is_a (
 void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ExtLocalInterfaceDef)::_tao_class_id)
@@ -42306,12 +38829,12 @@ void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -42320,6 +38843,12 @@ const char* CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ExtLocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -42327,23 +38856,23 @@ static const CORBA::Long _oc_CORBA_ExtLocalInterfaceDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x744c6f63), 
-  ACE_NTOHL (0x616c496e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636544), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x744c6f63),
+  ACE_NTOHL (0x616c496e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636544),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0
     21,
-  ACE_NTOHL (0x4578744c), 
-  ACE_NTOHL (0x6f63616c), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x65446566), 
+  ACE_NTOHL (0x4578744c),
+  ACE_NTOHL (0x6f63616c),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x65446566),
   ACE_NTOHL (0x0),  // name = ExtLocalInterfaceDef
   };
 
@@ -42388,7 +38917,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::extract (
         _tao_any,
         CORBA::_tc_PrimitiveKind,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -42396,7 +38925,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -42507,7 +39036,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ModuleDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -42626,7 +39155,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ConstantDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -43285,7 +39814,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ExceptionDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -43343,6 +39872,13 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
@@ -43367,7 +39903,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
         _tao_any,
         CORBA::_tc_AttributeMode,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -43375,7 +39911,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<CORBA::AttributeMode>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::AttributeMode>
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::AttributeMode \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -43432,7 +39968,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::AttributeDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -43497,7 +40033,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -43640,7 +40176,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
         _tao_any,
         CORBA::_tc_OperationMode,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -43648,10 +40184,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<CORBA::OperationMode>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::OperationMode>
+# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::OperationMode \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -43716,7 +40252,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -43774,7 +40310,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -43832,6 +40375,13 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
@@ -43886,7 +40436,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::OperationDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -43951,7 +40501,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::OperationDescription>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -44009,7 +40559,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -44067,7 +40624,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -44125,7 +40689,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -44183,6 +40754,13 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
@@ -44228,6 +40806,16 @@ operator>>= (
       );
 }
 
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::InterfaceDef>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>;
@@ -44237,7 +40825,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::InterfaceDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -44302,7 +40890,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -44412,6 +41000,16 @@ operator>>= (
       );
 }
 
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<CORBA::InterfaceAttrExtension,CORBA::InterfaceAttrExtension_var>;
@@ -44421,7 +41019,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -44757,7 +41355,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -44776,12 +41374,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::Repository::_unchecked_narrow (
@@ -44800,7 +41398,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -44819,12 +41417,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ModuleDef::_unchecked_narrow (
@@ -44843,7 +41441,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -44862,12 +41460,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ConstantDef::_unchecked_narrow (
@@ -44886,7 +41484,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -44905,12 +41503,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::StructDef::_unchecked_narrow (
@@ -44929,7 +41527,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -44948,12 +41546,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::UnionDef::_unchecked_narrow (
@@ -44972,7 +41570,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -44991,12 +41589,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::EnumDef::_unchecked_narrow (
@@ -45015,7 +41613,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45034,12 +41632,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::AliasDef::_unchecked_narrow (
@@ -45058,7 +41656,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45077,12 +41675,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::NativeDef::_unchecked_narrow (
@@ -45101,7 +41699,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45120,12 +41718,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::PrimitiveDef::_unchecked_narrow (
@@ -45144,7 +41742,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45163,12 +41761,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::StringDef::_unchecked_narrow (
@@ -45187,7 +41785,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45206,12 +41804,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::WstringDef::_unchecked_narrow (
@@ -45230,7 +41828,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45249,12 +41847,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::SequenceDef::_unchecked_narrow (
@@ -45273,7 +41871,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45292,12 +41890,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ArrayDef::_unchecked_narrow (
@@ -45316,7 +41914,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45335,12 +41933,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ExceptionDef::_unchecked_narrow (
@@ -45359,7 +41957,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45367,21 +41965,21 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
             _tao_sequence[i].in ()->marshal (strm);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -45391,7 +41989,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -45401,32 +41999,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45445,12 +42043,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::AttributeDef::_unchecked_narrow (
@@ -45469,7 +42067,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45488,12 +42086,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ExtAttributeDef::_unchecked_narrow (
@@ -45512,7 +42110,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45520,20 +42118,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -45543,7 +42141,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -45553,32 +42151,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45586,20 +42184,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -45609,7 +42207,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -45619,32 +42217,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45663,12 +42261,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::OperationDef::_unchecked_narrow (
@@ -45687,7 +42285,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45695,20 +42293,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -45718,7 +42316,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -45728,32 +42326,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45761,20 +42359,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -45784,7 +42382,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -45794,32 +42392,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45827,20 +42425,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -45850,7 +42448,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -45860,32 +42458,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45893,20 +42491,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -45916,7 +42514,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -45926,32 +42524,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -45970,12 +42568,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::InterfaceDef::_unchecked_narrow (
@@ -45994,7 +42592,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -46013,12 +42611,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::InterfaceAttrExtension::_unchecked_narrow (
@@ -46037,7 +42635,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -46056,12 +42654,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ExtInterfaceDef::_unchecked_narrow (
@@ -46080,7 +42678,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -46099,12 +42697,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::AbstractInterfaceDef::_unchecked_narrow (
@@ -46123,7 +42721,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -46142,12 +42740,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ExtAbstractInterfaceDef::_unchecked_narrow (
@@ -46166,7 +42764,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -46185,12 +42783,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::LocalInterfaceDef::_unchecked_narrow (
@@ -46209,7 +42807,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -46228,12 +42826,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ExtLocalInterfaceDef::_unchecked_narrow (
@@ -46250,5 +42848,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
-
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 6d87d31ac64..476e9ea36ff 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -27,7 +27,7 @@
 
 #include "ace/pre.h"
 
-#include "tao/corba.h"
+#include "IFR_BaseC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,8 +36,6 @@
 
 #include "ifr_client_export.h"
 
-#include "IFR_BaseC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -66,514 +64,286 @@
 
 TAO_NAMESPACE  CORBA
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class PrimitiveDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_PRIMITIVEDEF___PTR_CH_)
-#define _CORBA_PRIMITIVEDEF___PTR_CH_
-  
+#if !defined (_CORBA_PRIMITIVEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_PRIMITIVEDEF__ODDS_N_ENDS_CH_
+
+  class PrimitiveDef;
   typedef PrimitiveDef *PrimitiveDef_ptr;
+  struct tao_PrimitiveDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        PrimitiveDef,
+        tao_PrimitiveDef_life
+      >
+    PrimitiveDef_var;
 
-#if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
-#define _CORBA_PRIMITIVEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export PrimitiveDef_var : public TAO_Base_var
-  {
-  public:
-    PrimitiveDef_var (void); // default constructor
-    PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {} 
-    PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
-    ~PrimitiveDef_var (void); // destructor
-    
-    PrimitiveDef_var &operator= (PrimitiveDef_ptr);
-    PrimitiveDef_var &operator= (const PrimitiveDef_var &);
-    PrimitiveDef_ptr operator-> (void) const;
-    
-    operator const PrimitiveDef_ptr &() const;
-    operator PrimitiveDef_ptr &();
-    // in, inout, out, _retn 
-    PrimitiveDef_ptr in (void) const;
-    PrimitiveDef_ptr &inout (void);
-    PrimitiveDef_ptr &out (void);
-    PrimitiveDef_ptr _retn (void);
-    PrimitiveDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        PrimitiveDef,
+        tao_PrimitiveDef_life
+      >
+    PrimitiveDef_out;
+
+  struct TAO_IFR_Client_Export tao_PrimitiveDef_life
+  {
     static PrimitiveDef_ptr tao_duplicate (PrimitiveDef_ptr);
     static void tao_release (PrimitiveDef_ptr);
     static PrimitiveDef_ptr tao_nil (void);
-    static PrimitiveDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        PrimitiveDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PrimitiveDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PrimitiveDef_var (const TAO_Base_var &rhs);
-    PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
-#define _CORBA_PRIMITIVEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export PrimitiveDef_out
-  {
-  public:
-    PrimitiveDef_out (PrimitiveDef_ptr &);
-    PrimitiveDef_out (PrimitiveDef_var &);
-    PrimitiveDef_out (const PrimitiveDef_out &);
-    PrimitiveDef_out &operator= (const PrimitiveDef_out &);
-    PrimitiveDef_out &operator= (const PrimitiveDef_var &);
-    PrimitiveDef_out &operator= (PrimitiveDef_ptr);
-    operator PrimitiveDef_ptr &();
-    PrimitiveDef_ptr &ptr (void);
-    PrimitiveDef_ptr operator-> (void);
-  
-  private:
-    PrimitiveDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_PrimitiveDef_cast
+  {
+    static PrimitiveDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class StringDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_STRINGDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_STRINGDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_STRINGDEF___PTR_CH_)
-#define _CORBA_STRINGDEF___PTR_CH_
-  
+  class StringDef;
   typedef StringDef *StringDef_ptr;
+  struct tao_StringDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        StringDef,
+        tao_StringDef_life
+      >
+    StringDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        StringDef,
+        tao_StringDef_life
+      >
+    StringDef_out;
 
-#if !defined (_CORBA_STRINGDEF___VAR_CH_)
-#define _CORBA_STRINGDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export StringDef_var : public TAO_Base_var
-  {
-  public:
-    StringDef_var (void); // default constructor
-    StringDef_var (StringDef_ptr p) : ptr_ (p) {} 
-    StringDef_var (const StringDef_var &); // copy constructor
-    ~StringDef_var (void); // destructor
-    
-    StringDef_var &operator= (StringDef_ptr);
-    StringDef_var &operator= (const StringDef_var &);
-    StringDef_ptr operator-> (void) const;
-    
-    operator const StringDef_ptr &() const;
-    operator StringDef_ptr &();
-    // in, inout, out, _retn 
-    StringDef_ptr in (void) const;
-    StringDef_ptr &inout (void);
-    StringDef_ptr &out (void);
-    StringDef_ptr _retn (void);
-    StringDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_StringDef_life
+  {
     static StringDef_ptr tao_duplicate (StringDef_ptr);
     static void tao_release (StringDef_ptr);
     static StringDef_ptr tao_nil (void);
-    static StringDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        StringDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    StringDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    StringDef_var (const TAO_Base_var &rhs);
-    StringDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRINGDEF___OUT_CH_)
-#define _CORBA_STRINGDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export StringDef_out
-  {
-  public:
-    StringDef_out (StringDef_ptr &);
-    StringDef_out (StringDef_var &);
-    StringDef_out (const StringDef_out &);
-    StringDef_out &operator= (const StringDef_out &);
-    StringDef_out &operator= (const StringDef_var &);
-    StringDef_out &operator= (StringDef_ptr);
-    operator StringDef_ptr &();
-    StringDef_ptr &ptr (void);
-    StringDef_ptr operator-> (void);
-  
-  private:
-    StringDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_StringDef_cast
+  {
+    static StringDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class SequenceDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_SEQUENCEDEF___PTR_CH_)
-#define _CORBA_SEQUENCEDEF___PTR_CH_
-  
+#if !defined (_CORBA_SEQUENCEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_SEQUENCEDEF__ODDS_N_ENDS_CH_
+
+  class SequenceDef;
   typedef SequenceDef *SequenceDef_ptr;
+  struct tao_SequenceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        SequenceDef,
+        tao_SequenceDef_life
+      >
+    SequenceDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        SequenceDef,
+        tao_SequenceDef_life
+      >
+    SequenceDef_out;
 
-#if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
-#define _CORBA_SEQUENCEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export SequenceDef_var : public TAO_Base_var
-  {
-  public:
-    SequenceDef_var (void); // default constructor
-    SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {} 
-    SequenceDef_var (const SequenceDef_var &); // copy constructor
-    ~SequenceDef_var (void); // destructor
-    
-    SequenceDef_var &operator= (SequenceDef_ptr);
-    SequenceDef_var &operator= (const SequenceDef_var &);
-    SequenceDef_ptr operator-> (void) const;
-    
-    operator const SequenceDef_ptr &() const;
-    operator SequenceDef_ptr &();
-    // in, inout, out, _retn 
-    SequenceDef_ptr in (void) const;
-    SequenceDef_ptr &inout (void);
-    SequenceDef_ptr &out (void);
-    SequenceDef_ptr _retn (void);
-    SequenceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_SequenceDef_life
+  {
     static SequenceDef_ptr tao_duplicate (SequenceDef_ptr);
     static void tao_release (SequenceDef_ptr);
     static SequenceDef_ptr tao_nil (void);
-    static SequenceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        SequenceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    SequenceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    SequenceDef_var (const TAO_Base_var &rhs);
-    SequenceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
-#define _CORBA_SEQUENCEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export SequenceDef_out
-  {
-  public:
-    SequenceDef_out (SequenceDef_ptr &);
-    SequenceDef_out (SequenceDef_var &);
-    SequenceDef_out (const SequenceDef_out &);
-    SequenceDef_out &operator= (const SequenceDef_out &);
-    SequenceDef_out &operator= (const SequenceDef_var &);
-    SequenceDef_out &operator= (SequenceDef_ptr);
-    operator SequenceDef_ptr &();
-    SequenceDef_ptr &ptr (void);
-    SequenceDef_ptr operator-> (void);
-  
-  private:
-    SequenceDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_SequenceDef_cast
+  {
+    static SequenceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ArrayDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_ARRAYDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_ARRAYDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_ARRAYDEF___PTR_CH_)
-#define _CORBA_ARRAYDEF___PTR_CH_
-  
+  class ArrayDef;
   typedef ArrayDef *ArrayDef_ptr;
+  struct tao_ArrayDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ArrayDef,
+        tao_ArrayDef_life
+      >
+    ArrayDef_var;
 
-#if !defined (_CORBA_ARRAYDEF___VAR_CH_)
-#define _CORBA_ARRAYDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ArrayDef_var : public TAO_Base_var
-  {
-  public:
-    ArrayDef_var (void); // default constructor
-    ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {} 
-    ArrayDef_var (const ArrayDef_var &); // copy constructor
-    ~ArrayDef_var (void); // destructor
-    
-    ArrayDef_var &operator= (ArrayDef_ptr);
-    ArrayDef_var &operator= (const ArrayDef_var &);
-    ArrayDef_ptr operator-> (void) const;
-    
-    operator const ArrayDef_ptr &() const;
-    operator ArrayDef_ptr &();
-    // in, inout, out, _retn 
-    ArrayDef_ptr in (void) const;
-    ArrayDef_ptr &inout (void);
-    ArrayDef_ptr &out (void);
-    ArrayDef_ptr _retn (void);
-    ArrayDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        ArrayDef,
+        tao_ArrayDef_life
+      >
+    ArrayDef_out;
+
+  struct TAO_IFR_Client_Export tao_ArrayDef_life
+  {
     static ArrayDef_ptr tao_duplicate (ArrayDef_ptr);
     static void tao_release (ArrayDef_ptr);
     static ArrayDef_ptr tao_nil (void);
-    static ArrayDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ArrayDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ArrayDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ArrayDef_var (const TAO_Base_var &rhs);
-    ArrayDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ARRAYDEF___OUT_CH_)
-#define _CORBA_ARRAYDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ArrayDef_out
-  {
-  public:
-    ArrayDef_out (ArrayDef_ptr &);
-    ArrayDef_out (ArrayDef_var &);
-    ArrayDef_out (const ArrayDef_out &);
-    ArrayDef_out &operator= (const ArrayDef_out &);
-    ArrayDef_out &operator= (const ArrayDef_var &);
-    ArrayDef_out &operator= (ArrayDef_ptr);
-    operator ArrayDef_ptr &();
-    ArrayDef_ptr &ptr (void);
-    ArrayDef_ptr operator-> (void);
-  
-  private:
-    ArrayDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_ArrayDef_cast
+  {
+    static ArrayDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class WstringDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_WSTRINGDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_WSTRINGDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_WSTRINGDEF___PTR_CH_)
-#define _CORBA_WSTRINGDEF___PTR_CH_
-  
+  class WstringDef;
   typedef WstringDef *WstringDef_ptr;
+  struct tao_WstringDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        WstringDef,
+        tao_WstringDef_life
+      >
+    WstringDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        WstringDef,
+        tao_WstringDef_life
+      >
+    WstringDef_out;
 
-#if !defined (_CORBA_WSTRINGDEF___VAR_CH_)
-#define _CORBA_WSTRINGDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export WstringDef_var : public TAO_Base_var
-  {
-  public:
-    WstringDef_var (void); // default constructor
-    WstringDef_var (WstringDef_ptr p) : ptr_ (p) {} 
-    WstringDef_var (const WstringDef_var &); // copy constructor
-    ~WstringDef_var (void); // destructor
-    
-    WstringDef_var &operator= (WstringDef_ptr);
-    WstringDef_var &operator= (const WstringDef_var &);
-    WstringDef_ptr operator-> (void) const;
-    
-    operator const WstringDef_ptr &() const;
-    operator WstringDef_ptr &();
-    // in, inout, out, _retn 
-    WstringDef_ptr in (void) const;
-    WstringDef_ptr &inout (void);
-    WstringDef_ptr &out (void);
-    WstringDef_ptr _retn (void);
-    WstringDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_WstringDef_life
+  {
     static WstringDef_ptr tao_duplicate (WstringDef_ptr);
     static void tao_release (WstringDef_ptr);
     static WstringDef_ptr tao_nil (void);
-    static WstringDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        WstringDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    WstringDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    WstringDef_var (const TAO_Base_var &rhs);
-    WstringDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGDEF___OUT_CH_)
-#define _CORBA_WSTRINGDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export WstringDef_out
-  {
-  public:
-    WstringDef_out (WstringDef_ptr &);
-    WstringDef_out (WstringDef_var &);
-    WstringDef_out (const WstringDef_out &);
-    WstringDef_out &operator= (const WstringDef_out &);
-    WstringDef_out &operator= (const WstringDef_var &);
-    WstringDef_out &operator= (WstringDef_ptr);
-    operator WstringDef_ptr &();
-    WstringDef_ptr &ptr (void);
-    WstringDef_ptr operator-> (void);
-  
-  private:
-    WstringDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_WstringDef_cast
+  {
+    static WstringDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class FixedDef;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_FIXEDDEF___PTR_CH_)
-#define _CORBA_FIXEDDEF___PTR_CH_
-  
+#if !defined (_CORBA_FIXEDDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_FIXEDDEF__ODDS_N_ENDS_CH_
+
+  class FixedDef;
   typedef FixedDef *FixedDef_ptr;
+  struct tao_FixedDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        FixedDef,
+        tao_FixedDef_life
+      >
+    FixedDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        FixedDef,
+        tao_FixedDef_life
+      >
+    FixedDef_out;
 
-#if !defined (_CORBA_FIXEDDEF___VAR_CH_)
-#define _CORBA_FIXEDDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export FixedDef_var : public TAO_Base_var
-  {
-  public:
-    FixedDef_var (void); // default constructor
-    FixedDef_var (FixedDef_ptr p) : ptr_ (p) {} 
-    FixedDef_var (const FixedDef_var &); // copy constructor
-    ~FixedDef_var (void); // destructor
-    
-    FixedDef_var &operator= (FixedDef_ptr);
-    FixedDef_var &operator= (const FixedDef_var &);
-    FixedDef_ptr operator-> (void) const;
-    
-    operator const FixedDef_ptr &() const;
-    operator FixedDef_ptr &();
-    // in, inout, out, _retn 
-    FixedDef_ptr in (void) const;
-    FixedDef_ptr &inout (void);
-    FixedDef_ptr &out (void);
-    FixedDef_ptr _retn (void);
-    FixedDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_FixedDef_life
+  {
     static FixedDef_ptr tao_duplicate (FixedDef_ptr);
     static void tao_release (FixedDef_ptr);
     static FixedDef_ptr tao_nil (void);
-    static FixedDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        FixedDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    FixedDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    FixedDef_var (const TAO_Base_var &rhs);
-    FixedDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF___OUT_CH_)
-#define _CORBA_FIXEDDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export FixedDef_out
-  {
-  public:
-    FixedDef_out (FixedDef_ptr &);
-    FixedDef_out (FixedDef_var &);
-    FixedDef_out (const FixedDef_out &);
-    FixedDef_out &operator= (const FixedDef_out &);
-    FixedDef_out &operator= (const FixedDef_var &);
-    FixedDef_out &operator= (FixedDef_ptr);
-    operator FixedDef_ptr &();
-    FixedDef_ptr &ptr (void);
-    FixedDef_ptr operator-> (void);
-  
-  private:
-    FixedDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_FixedDef_cast
+  {
+    static FixedDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum PrimitiveKind
   {
     pk_null,
@@ -599,108 +369,71 @@ TAO_NAMESPACE  CORBA
     pk_wstring,
     pk_value_base
   };
-  
+
   typedef PrimitiveKind &PrimitiveKind_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrimitiveKind;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_REPOSITORY__ODDS_N_ENDS_CH_)
+#define _CORBA_REPOSITORY__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_REPOSITORY___PTR_CH_)
-#define _CORBA_REPOSITORY___PTR_CH_
-  
   class Repository;
   typedef Repository *Repository_ptr;
+  struct tao_Repository_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        Repository,
+        tao_Repository_life
+      >
+    Repository_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        Repository,
+        tao_Repository_life
+      >
+    Repository_out;
 
-#if !defined (_CORBA_REPOSITORY___VAR_CH_)
-#define _CORBA_REPOSITORY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
-  {
-  public:
-    Repository_var (void); // default constructor
-    Repository_var (Repository_ptr p) : ptr_ (p) {} 
-    Repository_var (const Repository_var &); // copy constructor
-    ~Repository_var (void); // destructor
-    
-    Repository_var &operator= (Repository_ptr);
-    Repository_var &operator= (const Repository_var &);
-    Repository_ptr operator-> (void) const;
-    
-    operator const Repository_ptr &() const;
-    operator Repository_ptr &();
-    // in, inout, out, _retn 
-    Repository_ptr in (void) const;
-    Repository_ptr &inout (void);
-    Repository_ptr &out (void);
-    Repository_ptr _retn (void);
-    Repository_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_Repository_life
+  {
     static Repository_ptr tao_duplicate (Repository_ptr);
     static void tao_release (Repository_ptr);
     static Repository_ptr tao_nil (void);
-    static Repository_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Repository_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Repository_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Repository_var (const TAO_Base_var &rhs);
-    Repository_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY___OUT_CH_)
-#define _CORBA_REPOSITORY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export Repository_out
-  {
-  public:
-    Repository_out (Repository_ptr &);
-    Repository_out (Repository_var &);
-    Repository_out (const Repository_out &);
-    Repository_out &operator= (const Repository_out &);
-    Repository_out &operator= (const Repository_var &);
-    Repository_out &operator= (Repository_ptr);
-    operator Repository_ptr &();
-    Repository_ptr &ptr (void);
-    Repository_ptr operator-> (void);
-  
-  private:
-    Repository_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_Repository_cast
+  {
+    static Repository_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_REPOSITORY_CH_)
 #define _CORBA_REPOSITORY_CH_
-  
+
   class _TAO_Repository_Proxy_Impl;
   class _TAO_Repository_Remote_Proxy_Impl;
   class _TAO_Repository_Proxy_Broker;
   class _TAO_Repository_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export Repository
     : public virtual CORBA::Container
   {
@@ -708,30 +441,30 @@ TAO_NAMESPACE  CORBA
     typedef Repository_ptr _ptr_type;
     typedef Repository_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static Repository_ptr _duplicate (Repository_ptr obj);
-    
+
     static Repository_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Repository_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Repository_ptr _nil (void)
       {
         return (Repository_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Contained_ptr lookup_id (
         const char * search_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -739,10 +472,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
         CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -750,10 +483,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         CORBA::PrimitiveKind kind
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -761,10 +494,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StringDef_ptr create_string (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -772,10 +505,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::WstringDef_ptr create_wstring (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -783,10 +516,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         CORBA::ULong bound,
         CORBA::IDLType_ptr element_type
@@ -795,10 +528,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ArrayDef_ptr create_array (
         CORBA::ULong length,
         CORBA::IDLType_ptr element_type
@@ -807,10 +540,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::FixedDef_ptr create_fixed (
         CORBA::UShort digits,
         CORBA::Short scale
@@ -819,66 +552,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Repository_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
-  
+
   protected:
     Repository (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Repository_setup_collocation (int collocated);
-    
+
     Repository (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Repository (void);
-    
+
     friend class _TAO_Repository_Remote_Proxy_Impl;
     friend class _TAO_Repository_ThruPOA_Proxy_Impl;
     friend class _TAO_Repository_Direct_Proxy_Impl;
-  
+
   private:
     Repository (const Repository &);
     void operator= (const Repository &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_Repository_Proxy_Impl
     : public virtual CORBA::_TAO_Container_Proxy_Impl
   {
   public:
     virtual ~_TAO_Repository_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::Contained_ptr lookup_id (
         CORBA::Object *_collocated_tao_target_,
         const char * search_id
@@ -887,10 +620,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::TypeCode_ptr tc
@@ -899,10 +632,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PrimitiveKind kind
@@ -911,10 +644,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::StringDef_ptr create_string (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -923,10 +656,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::WstringDef_ptr create_wstring (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -935,10 +668,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound,
@@ -948,10 +681,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ArrayDef_ptr create_array (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong length,
@@ -961,10 +694,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::FixedDef_ptr create_fixed (
         CORBA::Object *_collocated_tao_target_,
         CORBA::UShort digits,
@@ -974,23 +707,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_Repository_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Impl
     : public virtual _TAO_Repository_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -998,12 +731,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_Repository_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_Repository_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::Contained_ptr lookup_id (
         CORBA::Object *_collocated_tao_target_,
         const char * search_id
@@ -1012,10 +745,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::TypeCode_ptr tc
@@ -1024,10 +757,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         CORBA::Object *_collocated_tao_target_,
         CORBA::PrimitiveKind kind
@@ -1036,10 +769,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::StringDef_ptr create_string (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -1048,10 +781,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::WstringDef_ptr create_wstring (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -1060,10 +793,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound,
@@ -1073,10 +806,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ArrayDef_ptr create_array (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong length,
@@ -1086,10 +819,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::FixedDef_ptr create_fixed (
         CORBA::Object *_collocated_tao_target_,
         CORBA::UShort digits,
@@ -1100,23 +833,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker
   {
   public:
@@ -1125,152 +858,115 @@ TAO_NAMESPACE  CORBA
         Repository *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_Repository_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Broker
     : public virtual _TAO_Repository_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_Repository_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_Repository_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_Repository_Proxy_Impl &select_proxy (
         Repository *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_Repository_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Repository;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_MODULEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_MODULEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_MODULEDEF___PTR_CH_)
-#define _CORBA_MODULEDEF___PTR_CH_
-  
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
+  struct tao_ModuleDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ModuleDef,
+        tao_ModuleDef_life
+      >
+    ModuleDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ModuleDef,
+        tao_ModuleDef_life
+      >
+    ModuleDef_out;
 
-#if !defined (_CORBA_MODULEDEF___VAR_CH_)
-#define _CORBA_MODULEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
-  {
-  public:
-    ModuleDef_var (void); // default constructor
-    ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {} 
-    ModuleDef_var (const ModuleDef_var &); // copy constructor
-    ~ModuleDef_var (void); // destructor
-    
-    ModuleDef_var &operator= (ModuleDef_ptr);
-    ModuleDef_var &operator= (const ModuleDef_var &);
-    ModuleDef_ptr operator-> (void) const;
-    
-    operator const ModuleDef_ptr &() const;
-    operator ModuleDef_ptr &();
-    // in, inout, out, _retn 
-    ModuleDef_ptr in (void) const;
-    ModuleDef_ptr &inout (void);
-    ModuleDef_ptr &out (void);
-    ModuleDef_ptr _retn (void);
-    ModuleDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_ModuleDef_life
+  {
     static ModuleDef_ptr tao_duplicate (ModuleDef_ptr);
     static void tao_release (ModuleDef_ptr);
     static ModuleDef_ptr tao_nil (void);
-    static ModuleDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ModuleDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ModuleDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ModuleDef_var (const TAO_Base_var &rhs);
-    ModuleDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_MODULEDEF___OUT_CH_)
-#define _CORBA_MODULEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ModuleDef_out
-  {
-  public:
-    ModuleDef_out (ModuleDef_ptr &);
-    ModuleDef_out (ModuleDef_var &);
-    ModuleDef_out (const ModuleDef_out &);
-    ModuleDef_out &operator= (const ModuleDef_out &);
-    ModuleDef_out &operator= (const ModuleDef_var &);
-    ModuleDef_out &operator= (ModuleDef_ptr);
-    operator ModuleDef_ptr &();
-    ModuleDef_ptr &ptr (void);
-    ModuleDef_ptr operator-> (void);
-  
-  private:
-    ModuleDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_ModuleDef_cast
+  {
+    static ModuleDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_MODULEDEF_CH_)
 #define _CORBA_MODULEDEF_CH_
-  
+
   class _TAO_ModuleDef_Proxy_Impl;
   class _TAO_ModuleDef_Remote_Proxy_Impl;
   class _TAO_ModuleDef_Proxy_Broker;
   class _TAO_ModuleDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ModuleDef
     : public virtual CORBA::Container,
       public virtual CORBA::Contained
@@ -1279,100 +975,100 @@ TAO_NAMESPACE  CORBA
     typedef ModuleDef_ptr _ptr_type;
     typedef ModuleDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
-    
+
     static ModuleDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ModuleDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ModuleDef_ptr _nil (void)
       {
         return (ModuleDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ModuleDef_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
-  
+
   protected:
     ModuleDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ModuleDef_setup_collocation (int collocated);
-    
+
     ModuleDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ModuleDef (void);
-    
+
     friend class _TAO_ModuleDef_Remote_Proxy_Impl;
     friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ModuleDef_Direct_Proxy_Impl;
-  
+
   private:
     ModuleDef (const ModuleDef &);
     void operator= (const ModuleDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Container_Proxy_Impl, 
+    : public virtual CORBA::_TAO_Container_Proxy_Impl,
       public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_ModuleDef_Proxy_Impl (void) {}
-  
+
   protected:
     _TAO_ModuleDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Impl
     : public virtual _TAO_ModuleDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -1381,26 +1077,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ModuleDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ModuleDef_Remote_Proxy_Impl (void) {}
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker
   {
   public:
@@ -1409,228 +1105,152 @@ TAO_NAMESPACE  CORBA
         ModuleDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ModuleDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Broker
     : public virtual _TAO_ModuleDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ModuleDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ModuleDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
         ModuleDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ModuleDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ModuleDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ModuleDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct ModuleDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        ModuleDescription
+      >
+    ModuleDescription_var;
+
+  typedef
+    TAO_Out_T<
+        ModuleDescription,
+        ModuleDescription_var
+      >
+    ModuleDescription_out;
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export ModuleDescription
   {
     typedef ModuleDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
     TAO_String_Manager defined_in;
     TAO_String_Manager version;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export ModuleDescription_var
-  {
-  public:
-    ModuleDescription_var (void);
-    ModuleDescription_var (ModuleDescription *);
-    ModuleDescription_var (const ModuleDescription_var &);
-    ~ModuleDescription_var (void);
-    
-    ModuleDescription_var &operator= (ModuleDescription *);
-    ModuleDescription_var &operator= (const ModuleDescription_var &);
-    ModuleDescription *operator-> (void);
-    const ModuleDescription *operator-> (void) const;
-    
-    operator const ModuleDescription &() const;
-    operator ModuleDescription &();
-    operator ModuleDescription &() const;
-    
-    // Variable-size types only.
-    operator ModuleDescription *&();
-    
-    // in, inout, out, _retn 
-    const ModuleDescription &in (void) const;
-    ModuleDescription &inout (void);
-    ModuleDescription *&out (void);
-    ModuleDescription *_retn (void);
-    ModuleDescription *ptr (void) const;
-  
-  private:
-    ModuleDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export ModuleDescription_out
-  {
-  public:
-    ModuleDescription_out (ModuleDescription *&);
-    ModuleDescription_out (ModuleDescription_var &);
-    ModuleDescription_out (const ModuleDescription_out &);
-    ModuleDescription_out &operator= (const ModuleDescription_out &);
-    ModuleDescription_out &operator= (ModuleDescription *);
-    operator ModuleDescription *&();
-    ModuleDescription *&ptr (void);
-    ModuleDescription *operator-> (void);
-    
-  private:
-    ModuleDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ModuleDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ModuleDescription;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_CONSTANTDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_CONSTANTDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
-#define _CORBA_CONSTANTDEF___PTR_CH_
-  
   class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
+  struct tao_ConstantDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ConstantDef,
+        tao_ConstantDef_life
+      >
+    ConstantDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ConstantDef,
+        tao_ConstantDef_life
+      >
+    ConstantDef_out;
 
-#if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
-#define _CORBA_CONSTANTDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ConstantDef_var : public TAO_Base_var
-  {
-  public:
-    ConstantDef_var (void); // default constructor
-    ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {} 
-    ConstantDef_var (const ConstantDef_var &); // copy constructor
-    ~ConstantDef_var (void); // destructor
-    
-    ConstantDef_var &operator= (ConstantDef_ptr);
-    ConstantDef_var &operator= (const ConstantDef_var &);
-    ConstantDef_ptr operator-> (void) const;
-    
-    operator const ConstantDef_ptr &() const;
-    operator ConstantDef_ptr &();
-    // in, inout, out, _retn 
-    ConstantDef_ptr in (void) const;
-    ConstantDef_ptr &inout (void);
-    ConstantDef_ptr &out (void);
-    ConstantDef_ptr _retn (void);
-    ConstantDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_ConstantDef_life
+  {
     static ConstantDef_ptr tao_duplicate (ConstantDef_ptr);
     static void tao_release (ConstantDef_ptr);
     static ConstantDef_ptr tao_nil (void);
-    static ConstantDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ConstantDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ConstantDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ConstantDef_var (const TAO_Base_var &rhs);
-    ConstantDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
-#define _CORBA_CONSTANTDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ConstantDef_out
-  {
-  public:
-    ConstantDef_out (ConstantDef_ptr &);
-    ConstantDef_out (ConstantDef_var &);
-    ConstantDef_out (const ConstantDef_out &);
-    ConstantDef_out &operator= (const ConstantDef_out &);
-    ConstantDef_out &operator= (const ConstantDef_var &);
-    ConstantDef_out &operator= (ConstantDef_ptr);
-    operator ConstantDef_ptr &();
-    ConstantDef_ptr &ptr (void);
-    ConstantDef_ptr operator-> (void);
-  
-  private:
-    ConstantDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_ConstantDef_cast
+  {
+    static ConstantDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONSTANTDEF_CH_)
 #define _CORBA_CONSTANTDEF_CH_
-  
+
   class _TAO_ConstantDef_Proxy_Impl;
   class _TAO_ConstantDef_Remote_Proxy_Impl;
   class _TAO_ConstantDef_Proxy_Broker;
   class _TAO_ConstantDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ConstantDef
     : public virtual CORBA::Contained
   {
@@ -1638,50 +1258,50 @@ TAO_NAMESPACE  CORBA
     typedef ConstantDef_ptr _ptr_type;
     typedef ConstantDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ConstantDef_ptr _duplicate (ConstantDef_ptr obj);
-    
+
     static ConstantDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstantDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstantDef_ptr _nil (void)
       {
         return (ConstantDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void type_def (
         CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1689,20 +1309,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void value (
         const CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1710,66 +1330,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ConstantDef_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
-  
+
   protected:
     ConstantDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ConstantDef_setup_collocation (int collocated);
-    
+
     ConstantDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ConstantDef (void);
-    
+
     friend class _TAO_ConstantDef_Remote_Proxy_Impl;
     friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ConstantDef_Direct_Proxy_Impl;
-  
+
   private:
     ConstantDef (const ConstantDef &);
     void operator= (const ConstantDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Impl
     : public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_ConstantDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1777,10 +1397,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1788,10 +1408,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -1800,10 +1420,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::Any * value (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1811,10 +1431,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void value (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::Any & value
@@ -1823,23 +1443,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_ConstantDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Impl
     : public virtual _TAO_ConstantDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -1847,12 +1467,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ConstantDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ConstantDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1860,10 +1480,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1871,10 +1491,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -1883,10 +1503,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::Any * value (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -1894,10 +1514,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void value (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::Any & value
@@ -1907,23 +1527,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker
   {
   public:
@@ -1932,67 +1552,83 @@ TAO_NAMESPACE  CORBA
         ConstantDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ConstantDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Broker
     : public virtual _TAO_ConstantDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ConstantDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ConstantDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
         ConstantDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ConstantDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstantDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ConstantDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct ConstantDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        ConstantDescription
+      >
+    ConstantDescription_var;
+
+  typedef
+    TAO_Out_T<
+        ConstantDescription,
+        ConstantDescription_var
+      >
+    ConstantDescription_out;
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export ConstantDescription
   {
     typedef ConstantDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -2001,161 +1637,69 @@ TAO_NAMESPACE  CORBA
     CORBA::TypeCode_var type;
     CORBA::Any value;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export ConstantDescription_var
-  {
-  public:
-    ConstantDescription_var (void);
-    ConstantDescription_var (ConstantDescription *);
-    ConstantDescription_var (const ConstantDescription_var &);
-    ~ConstantDescription_var (void);
-    
-    ConstantDescription_var &operator= (ConstantDescription *);
-    ConstantDescription_var &operator= (const ConstantDescription_var &);
-    ConstantDescription *operator-> (void);
-    const ConstantDescription *operator-> (void) const;
-    
-    operator const ConstantDescription &() const;
-    operator ConstantDescription &();
-    operator ConstantDescription &() const;
-    
-    // Variable-size types only.
-    operator ConstantDescription *&();
-    
-    // in, inout, out, _retn 
-    const ConstantDescription &in (void) const;
-    ConstantDescription &inout (void);
-    ConstantDescription *&out (void);
-    ConstantDescription *_retn (void);
-    ConstantDescription *ptr (void) const;
-  
-  private:
-    ConstantDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export ConstantDescription_out
-  {
-  public:
-    ConstantDescription_out (ConstantDescription *&);
-    ConstantDescription_out (ConstantDescription_var &);
-    ConstantDescription_out (const ConstantDescription_out &);
-    ConstantDescription_out &operator= (const ConstantDescription_out &);
-    ConstantDescription_out &operator= (ConstantDescription *);
-    operator ConstantDescription *&();
-    ConstantDescription *&ptr (void);
-    ConstantDescription *operator-> (void);
-    
-  private:
-    ConstantDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ConstantDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConstantDescription;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_STRUCTDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_STRUCTDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_STRUCTDEF___PTR_CH_)
-#define _CORBA_STRUCTDEF___PTR_CH_
-  
   class StructDef;
   typedef StructDef *StructDef_ptr;
+  struct tao_StructDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        StructDef,
+        tao_StructDef_life
+      >
+    StructDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        StructDef,
+        tao_StructDef_life
+      >
+    StructDef_out;
 
-#if !defined (_CORBA_STRUCTDEF___VAR_CH_)
-#define _CORBA_STRUCTDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export StructDef_var : public TAO_Base_var
-  {
-  public:
-    StructDef_var (void); // default constructor
-    StructDef_var (StructDef_ptr p) : ptr_ (p) {} 
-    StructDef_var (const StructDef_var &); // copy constructor
-    ~StructDef_var (void); // destructor
-    
-    StructDef_var &operator= (StructDef_ptr);
-    StructDef_var &operator= (const StructDef_var &);
-    StructDef_ptr operator-> (void) const;
-    
-    operator const StructDef_ptr &() const;
-    operator StructDef_ptr &();
-    // in, inout, out, _retn 
-    StructDef_ptr in (void) const;
-    StructDef_ptr &inout (void);
-    StructDef_ptr &out (void);
-    StructDef_ptr _retn (void);
-    StructDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_StructDef_life
+  {
     static StructDef_ptr tao_duplicate (StructDef_ptr);
     static void tao_release (StructDef_ptr);
     static StructDef_ptr tao_nil (void);
-    static StructDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        StructDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    StructDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    StructDef_var (const TAO_Base_var &rhs);
-    StructDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTDEF___OUT_CH_)
-#define _CORBA_STRUCTDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export StructDef_out
-  {
-  public:
-    StructDef_out (StructDef_ptr &);
-    StructDef_out (StructDef_var &);
-    StructDef_out (const StructDef_out &);
-    StructDef_out &operator= (const StructDef_out &);
-    StructDef_out &operator= (const StructDef_var &);
-    StructDef_out &operator= (StructDef_ptr);
-    operator StructDef_ptr &();
-    StructDef_ptr &ptr (void);
-    StructDef_ptr operator-> (void);
-  
-  private:
-    StructDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_StructDef_cast
+  {
+    static StructDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_STRUCTDEF_CH_)
 #define _CORBA_STRUCTDEF_CH_
-  
+
   class _TAO_StructDef_Proxy_Impl;
   class _TAO_StructDef_Remote_Proxy_Impl;
   class _TAO_StructDef_Proxy_Broker;
   class _TAO_StructDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export StructDef
     : public virtual CORBA::TypedefDef,
       public virtual CORBA::Container
@@ -2164,40 +1708,40 @@ TAO_NAMESPACE  CORBA
     typedef StructDef_ptr _ptr_type;
     typedef StructDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static StructDef_ptr _duplicate (StructDef_ptr obj);
-    
+
     static StructDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static StructDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static StructDef_ptr _nil (void)
       {
         return (StructDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void members (
         const CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2205,67 +1749,67 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_StructDef_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
-  
+
   protected:
     StructDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_StructDef_setup_collocation (int collocated);
-    
+
     StructDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~StructDef (void);
-    
+
     friend class _TAO_StructDef_Remote_Proxy_Impl;
     friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
     friend class _TAO_StructDef_Direct_Proxy_Impl;
-  
+
   private:
     StructDef (const StructDef &);
     void operator= (const StructDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Impl
-    : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl, 
+    : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl,
       public virtual CORBA::_TAO_Container_Proxy_Impl
   {
   public:
     virtual ~_TAO_StructDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::StructMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2273,10 +1817,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::StructMemberSeq & members
@@ -2285,23 +1829,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_StructDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Impl
     : public virtual _TAO_StructDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -2310,12 +1854,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_StructDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_StructDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::StructMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2323,10 +1867,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::StructMemberSeq & members
@@ -2336,23 +1880,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker
   {
   public:
@@ -2361,152 +1905,115 @@ TAO_NAMESPACE  CORBA
         StructDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_StructDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Broker
     : public virtual _TAO_StructDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_StructDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_StructDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_StructDef_Proxy_Impl &select_proxy (
         StructDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_StructDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StructDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_UNIONDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_UNIONDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_UNIONDEF___PTR_CH_)
-#define _CORBA_UNIONDEF___PTR_CH_
-  
   class UnionDef;
   typedef UnionDef *UnionDef_ptr;
+  struct tao_UnionDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        UnionDef,
+        tao_UnionDef_life
+      >
+    UnionDef_var;
 
-#if !defined (_CORBA_UNIONDEF___VAR_CH_)
-#define _CORBA_UNIONDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export UnionDef_var : public TAO_Base_var
-  {
-  public:
-    UnionDef_var (void); // default constructor
-    UnionDef_var (UnionDef_ptr p) : ptr_ (p) {} 
-    UnionDef_var (const UnionDef_var &); // copy constructor
-    ~UnionDef_var (void); // destructor
-    
-    UnionDef_var &operator= (UnionDef_ptr);
-    UnionDef_var &operator= (const UnionDef_var &);
-    UnionDef_ptr operator-> (void) const;
-    
-    operator const UnionDef_ptr &() const;
-    operator UnionDef_ptr &();
-    // in, inout, out, _retn 
-    UnionDef_ptr in (void) const;
-    UnionDef_ptr &inout (void);
-    UnionDef_ptr &out (void);
-    UnionDef_ptr _retn (void);
-    UnionDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        UnionDef,
+        tao_UnionDef_life
+      >
+    UnionDef_out;
+
+  struct TAO_IFR_Client_Export tao_UnionDef_life
+  {
     static UnionDef_ptr tao_duplicate (UnionDef_ptr);
     static void tao_release (UnionDef_ptr);
     static UnionDef_ptr tao_nil (void);
-    static UnionDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        UnionDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    UnionDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    UnionDef_var (const TAO_Base_var &rhs);
-    UnionDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONDEF___OUT_CH_)
-#define _CORBA_UNIONDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export UnionDef_out
-  {
-  public:
-    UnionDef_out (UnionDef_ptr &);
-    UnionDef_out (UnionDef_var &);
-    UnionDef_out (const UnionDef_out &);
-    UnionDef_out &operator= (const UnionDef_out &);
-    UnionDef_out &operator= (const UnionDef_var &);
-    UnionDef_out &operator= (UnionDef_ptr);
-    operator UnionDef_ptr &();
-    UnionDef_ptr &ptr (void);
-    UnionDef_ptr operator-> (void);
-  
-  private:
-    UnionDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_UnionDef_cast
+  {
+    static UnionDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_UNIONDEF_CH_)
 #define _CORBA_UNIONDEF_CH_
-  
+
   class _TAO_UnionDef_Proxy_Impl;
   class _TAO_UnionDef_Remote_Proxy_Impl;
   class _TAO_UnionDef_Proxy_Broker;
   class _TAO_UnionDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export UnionDef
     : public virtual CORBA::TypedefDef,
       public virtual CORBA::Container
@@ -2515,50 +2022,50 @@ TAO_NAMESPACE  CORBA
     typedef UnionDef_ptr _ptr_type;
     typedef UnionDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static UnionDef_ptr _duplicate (UnionDef_ptr obj);
-    
+
     static UnionDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static UnionDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static UnionDef_ptr _nil (void)
       {
         return (UnionDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr discriminator_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void discriminator_type_def (
         CORBA::IDLType_ptr discriminator_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2566,20 +2073,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::UnionMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void members (
         const CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2587,67 +2094,67 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_UnionDef_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
-  
+
   protected:
     UnionDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_UnionDef_setup_collocation (int collocated);
-    
+
     UnionDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~UnionDef (void);
-    
+
     friend class _TAO_UnionDef_Remote_Proxy_Impl;
     friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
     friend class _TAO_UnionDef_Direct_Proxy_Impl;
-  
+
   private:
     UnionDef (const UnionDef &);
     void operator= (const UnionDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Impl
-    : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl, 
+    : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl,
       public virtual CORBA::_TAO_Container_Proxy_Impl
   {
   public:
     virtual ~_TAO_UnionDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr discriminator_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2655,10 +2162,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2666,10 +2173,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void discriminator_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr discriminator_type_def
@@ -2678,10 +2185,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::UnionMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2689,10 +2196,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::UnionMemberSeq & members
@@ -2701,23 +2208,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_UnionDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Impl
     : public virtual _TAO_UnionDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -2726,12 +2233,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_UnionDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_UnionDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr discriminator_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2739,10 +2246,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2750,10 +2257,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void discriminator_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr discriminator_type_def
@@ -2762,10 +2269,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::UnionMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2773,10 +2280,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::UnionMemberSeq & members
@@ -2786,23 +2293,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker
   {
   public:
@@ -2811,152 +2318,115 @@ TAO_NAMESPACE  CORBA
         UnionDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_UnionDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Broker
     : public virtual _TAO_UnionDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_UnionDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_UnionDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
         UnionDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_UnionDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnionDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_ENUMDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_ENUMDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_ENUMDEF___PTR_CH_)
-#define _CORBA_ENUMDEF___PTR_CH_
-  
   class EnumDef;
   typedef EnumDef *EnumDef_ptr;
+  struct tao_EnumDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        EnumDef,
+        tao_EnumDef_life
+      >
+    EnumDef_var;
 
-#if !defined (_CORBA_ENUMDEF___VAR_CH_)
-#define _CORBA_ENUMDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export EnumDef_var : public TAO_Base_var
-  {
-  public:
-    EnumDef_var (void); // default constructor
-    EnumDef_var (EnumDef_ptr p) : ptr_ (p) {} 
-    EnumDef_var (const EnumDef_var &); // copy constructor
-    ~EnumDef_var (void); // destructor
-    
-    EnumDef_var &operator= (EnumDef_ptr);
-    EnumDef_var &operator= (const EnumDef_var &);
-    EnumDef_ptr operator-> (void) const;
-    
-    operator const EnumDef_ptr &() const;
-    operator EnumDef_ptr &();
-    // in, inout, out, _retn 
-    EnumDef_ptr in (void) const;
-    EnumDef_ptr &inout (void);
-    EnumDef_ptr &out (void);
-    EnumDef_ptr _retn (void);
-    EnumDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        EnumDef,
+        tao_EnumDef_life
+      >
+    EnumDef_out;
+
+  struct TAO_IFR_Client_Export tao_EnumDef_life
+  {
     static EnumDef_ptr tao_duplicate (EnumDef_ptr);
     static void tao_release (EnumDef_ptr);
     static EnumDef_ptr tao_nil (void);
-    static EnumDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        EnumDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    EnumDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    EnumDef_var (const TAO_Base_var &rhs);
-    EnumDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF___OUT_CH_)
-#define _CORBA_ENUMDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export EnumDef_out
-  {
-  public:
-    EnumDef_out (EnumDef_ptr &);
-    EnumDef_out (EnumDef_var &);
-    EnumDef_out (const EnumDef_out &);
-    EnumDef_out &operator= (const EnumDef_out &);
-    EnumDef_out &operator= (const EnumDef_var &);
-    EnumDef_out &operator= (EnumDef_ptr);
-    operator EnumDef_ptr &();
-    EnumDef_ptr &ptr (void);
-    EnumDef_ptr operator-> (void);
-  
-  private:
-    EnumDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_EnumDef_cast
+  {
+    static EnumDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ENUMDEF_CH_)
 #define _CORBA_ENUMDEF_CH_
-  
+
   class _TAO_EnumDef_Proxy_Impl;
   class _TAO_EnumDef_Remote_Proxy_Impl;
   class _TAO_EnumDef_Proxy_Broker;
   class _TAO_EnumDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export EnumDef
     : public virtual CORBA::TypedefDef
   {
@@ -2964,40 +2434,40 @@ TAO_NAMESPACE  CORBA
     typedef EnumDef_ptr _ptr_type;
     typedef EnumDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static EnumDef_ptr _duplicate (EnumDef_ptr obj);
-    
+
     static EnumDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static EnumDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static EnumDef_ptr _nil (void)
       {
         return (EnumDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::EnumMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void members (
         const CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3005,66 +2475,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_EnumDef_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
-  
+
   protected:
     EnumDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_EnumDef_setup_collocation (int collocated);
-    
+
     EnumDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~EnumDef (void);
-    
+
     friend class _TAO_EnumDef_Remote_Proxy_Impl;
     friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
     friend class _TAO_EnumDef_Direct_Proxy_Impl;
-  
+
   private:
     EnumDef (const EnumDef &);
     void operator= (const EnumDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Impl
     : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_EnumDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::EnumMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3072,10 +2542,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::EnumMemberSeq & members
@@ -3084,23 +2554,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_EnumDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Impl
     : public virtual _TAO_EnumDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3108,12 +2578,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_EnumDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_EnumDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::EnumMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3121,10 +2591,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::EnumMemberSeq & members
@@ -3134,23 +2604,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker
   {
   public:
@@ -3159,152 +2629,115 @@ TAO_NAMESPACE  CORBA
         EnumDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_EnumDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Broker
     : public virtual _TAO_EnumDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_EnumDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_EnumDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
         EnumDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_EnumDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnumDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_ALIASDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_ALIASDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_ALIASDEF___PTR_CH_)
-#define _CORBA_ALIASDEF___PTR_CH_
-  
   class AliasDef;
   typedef AliasDef *AliasDef_ptr;
+  struct tao_AliasDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        AliasDef,
+        tao_AliasDef_life
+      >
+    AliasDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        AliasDef,
+        tao_AliasDef_life
+      >
+    AliasDef_out;
 
-#if !defined (_CORBA_ALIASDEF___VAR_CH_)
-#define _CORBA_ALIASDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export AliasDef_var : public TAO_Base_var
-  {
-  public:
-    AliasDef_var (void); // default constructor
-    AliasDef_var (AliasDef_ptr p) : ptr_ (p) {} 
-    AliasDef_var (const AliasDef_var &); // copy constructor
-    ~AliasDef_var (void); // destructor
-    
-    AliasDef_var &operator= (AliasDef_ptr);
-    AliasDef_var &operator= (const AliasDef_var &);
-    AliasDef_ptr operator-> (void) const;
-    
-    operator const AliasDef_ptr &() const;
-    operator AliasDef_ptr &();
-    // in, inout, out, _retn 
-    AliasDef_ptr in (void) const;
-    AliasDef_ptr &inout (void);
-    AliasDef_ptr &out (void);
-    AliasDef_ptr _retn (void);
-    AliasDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_AliasDef_life
+  {
     static AliasDef_ptr tao_duplicate (AliasDef_ptr);
     static void tao_release (AliasDef_ptr);
     static AliasDef_ptr tao_nil (void);
-    static AliasDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        AliasDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    AliasDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    AliasDef_var (const TAO_Base_var &rhs);
-    AliasDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF___OUT_CH_)
-#define _CORBA_ALIASDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export AliasDef_out
-  {
-  public:
-    AliasDef_out (AliasDef_ptr &);
-    AliasDef_out (AliasDef_var &);
-    AliasDef_out (const AliasDef_out &);
-    AliasDef_out &operator= (const AliasDef_out &);
-    AliasDef_out &operator= (const AliasDef_var &);
-    AliasDef_out &operator= (AliasDef_ptr);
-    operator AliasDef_ptr &();
-    AliasDef_ptr &ptr (void);
-    AliasDef_ptr operator-> (void);
-  
-  private:
-    AliasDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_AliasDef_cast
+  {
+    static AliasDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ALIASDEF_CH_)
 #define _CORBA_ALIASDEF_CH_
-  
+
   class _TAO_AliasDef_Proxy_Impl;
   class _TAO_AliasDef_Remote_Proxy_Impl;
   class _TAO_AliasDef_Proxy_Broker;
   class _TAO_AliasDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export AliasDef
     : public virtual CORBA::TypedefDef
   {
@@ -3312,40 +2745,40 @@ TAO_NAMESPACE  CORBA
     typedef AliasDef_ptr _ptr_type;
     typedef AliasDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static AliasDef_ptr _duplicate (AliasDef_ptr obj);
-    
+
     static AliasDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AliasDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AliasDef_ptr _nil (void)
       {
         return (AliasDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr original_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void original_type_def (
         CORBA::IDLType_ptr original_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3353,66 +2786,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_AliasDef_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
-  
+
   protected:
     AliasDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AliasDef_setup_collocation (int collocated);
-    
+
     AliasDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~AliasDef (void);
-    
+
     friend class _TAO_AliasDef_Remote_Proxy_Impl;
     friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
     friend class _TAO_AliasDef_Direct_Proxy_Impl;
-  
+
   private:
     AliasDef (const AliasDef &);
     void operator= (const AliasDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Impl
     : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_AliasDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr original_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3420,10 +2853,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void original_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr original_type_def
@@ -3432,23 +2865,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_AliasDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Impl
     : public virtual _TAO_AliasDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3456,12 +2889,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_AliasDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_AliasDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr original_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -3469,10 +2902,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void original_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr original_type_def
@@ -3482,23 +2915,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker
   {
   public:
@@ -3507,152 +2940,115 @@ TAO_NAMESPACE  CORBA
         AliasDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_AliasDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Broker
     : public virtual _TAO_AliasDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_AliasDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_AliasDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
         AliasDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_AliasDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AliasDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_NATIVEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_NATIVEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_NATIVEDEF___PTR_CH_)
-#define _CORBA_NATIVEDEF___PTR_CH_
-  
   class NativeDef;
   typedef NativeDef *NativeDef_ptr;
+  struct tao_NativeDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        NativeDef,
+        tao_NativeDef_life
+      >
+    NativeDef_var;
 
-#if !defined (_CORBA_NATIVEDEF___VAR_CH_)
-#define _CORBA_NATIVEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export NativeDef_var : public TAO_Base_var
-  {
-  public:
-    NativeDef_var (void); // default constructor
-    NativeDef_var (NativeDef_ptr p) : ptr_ (p) {} 
-    NativeDef_var (const NativeDef_var &); // copy constructor
-    ~NativeDef_var (void); // destructor
-    
-    NativeDef_var &operator= (NativeDef_ptr);
-    NativeDef_var &operator= (const NativeDef_var &);
-    NativeDef_ptr operator-> (void) const;
-    
-    operator const NativeDef_ptr &() const;
-    operator NativeDef_ptr &();
-    // in, inout, out, _retn 
-    NativeDef_ptr in (void) const;
-    NativeDef_ptr &inout (void);
-    NativeDef_ptr &out (void);
-    NativeDef_ptr _retn (void);
-    NativeDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        NativeDef,
+        tao_NativeDef_life
+      >
+    NativeDef_out;
+
+  struct TAO_IFR_Client_Export tao_NativeDef_life
+  {
     static NativeDef_ptr tao_duplicate (NativeDef_ptr);
     static void tao_release (NativeDef_ptr);
     static NativeDef_ptr tao_nil (void);
-    static NativeDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        NativeDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    NativeDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    NativeDef_var (const TAO_Base_var &rhs);
-    NativeDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_NATIVEDEF___OUT_CH_)
-#define _CORBA_NATIVEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export NativeDef_out
-  {
-  public:
-    NativeDef_out (NativeDef_ptr &);
-    NativeDef_out (NativeDef_var &);
-    NativeDef_out (const NativeDef_out &);
-    NativeDef_out &operator= (const NativeDef_out &);
-    NativeDef_out &operator= (const NativeDef_var &);
-    NativeDef_out &operator= (NativeDef_ptr);
-    operator NativeDef_ptr &();
-    NativeDef_ptr &ptr (void);
-    NativeDef_ptr operator-> (void);
-  
-  private:
-    NativeDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_NativeDef_cast
+  {
+    static NativeDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_NATIVEDEF_CH_)
 #define _CORBA_NATIVEDEF_CH_
-  
+
   class _TAO_NativeDef_Proxy_Impl;
   class _TAO_NativeDef_Remote_Proxy_Impl;
   class _TAO_NativeDef_Proxy_Broker;
   class _TAO_NativeDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export NativeDef
     : public virtual CORBA::TypedefDef
   {
@@ -3660,99 +3056,99 @@ TAO_NAMESPACE  CORBA
     typedef NativeDef_ptr _ptr_type;
     typedef NativeDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static NativeDef_ptr _duplicate (NativeDef_ptr obj);
-    
+
     static NativeDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static NativeDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static NativeDef_ptr _nil (void)
       {
         return (NativeDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_NativeDef_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
-  
+
   protected:
     NativeDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_NativeDef_setup_collocation (int collocated);
-    
+
     NativeDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~NativeDef (void);
-    
+
     friend class _TAO_NativeDef_Remote_Proxy_Impl;
     friend class _TAO_NativeDef_ThruPOA_Proxy_Impl;
     friend class _TAO_NativeDef_Direct_Proxy_Impl;
-  
+
   private:
     NativeDef (const NativeDef &);
     void operator= (const NativeDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Impl
     : public virtual CORBA::_TAO_TypedefDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_NativeDef_Proxy_Impl (void) {}
-  
+
   protected:
     _TAO_NativeDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Impl
     : public virtual _TAO_NativeDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3760,26 +3156,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_NativeDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_NativeDef_Remote_Proxy_Impl (void) {}
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker
   {
   public:
@@ -3788,152 +3184,69 @@ TAO_NAMESPACE  CORBA
         NativeDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_NativeDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Broker
     : public virtual _TAO_NativeDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_NativeDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_NativeDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
         NativeDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativeDef;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_PRIMITIVEDEF___PTR_CH_)
-#define _CORBA_PRIMITIVEDEF___PTR_CH_
-  
-  class PrimitiveDef;
-  typedef PrimitiveDef *PrimitiveDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
-#define _CORBA_PRIMITIVEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export PrimitiveDef_var : public TAO_Base_var
-  {
-  public:
-    PrimitiveDef_var (void); // default constructor
-    PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {} 
-    PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
-    ~PrimitiveDef_var (void); // destructor
-    
-    PrimitiveDef_var &operator= (PrimitiveDef_ptr);
-    PrimitiveDef_var &operator= (const PrimitiveDef_var &);
-    PrimitiveDef_ptr operator-> (void) const;
-    
-    operator const PrimitiveDef_ptr &() const;
-    operator PrimitiveDef_ptr &();
-    // in, inout, out, _retn 
-    PrimitiveDef_ptr in (void) const;
-    PrimitiveDef_ptr &inout (void);
-    PrimitiveDef_ptr &out (void);
-    PrimitiveDef_ptr _retn (void);
-    PrimitiveDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static PrimitiveDef_ptr tao_duplicate (PrimitiveDef_ptr);
-    static void tao_release (PrimitiveDef_ptr);
-    static PrimitiveDef_ptr tao_nil (void);
-    static PrimitiveDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PrimitiveDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PrimitiveDef_var (const TAO_Base_var &rhs);
-    PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
-#define _CORBA_PRIMITIVEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export PrimitiveDef_out
-  {
-  public:
-    PrimitiveDef_out (PrimitiveDef_ptr &);
-    PrimitiveDef_out (PrimitiveDef_var &);
-    PrimitiveDef_out (const PrimitiveDef_out &);
-    PrimitiveDef_out &operator= (const PrimitiveDef_out &);
-    PrimitiveDef_out &operator= (const PrimitiveDef_var &);
-    PrimitiveDef_out &operator= (PrimitiveDef_ptr);
-    operator PrimitiveDef_ptr &();
-    PrimitiveDef_ptr &ptr (void);
-    PrimitiveDef_ptr operator-> (void);
-  
-  private:
-    PrimitiveDef_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativeDef;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_PRIMITIVEDEF_CH_)
 #define _CORBA_PRIMITIVEDEF_CH_
-  
+
   class _TAO_PrimitiveDef_Proxy_Impl;
   class _TAO_PrimitiveDef_Remote_Proxy_Impl;
   class _TAO_PrimitiveDef_Proxy_Broker;
   class _TAO_PrimitiveDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export PrimitiveDef
     : public virtual CORBA::IDLType
   {
@@ -3941,96 +3254,96 @@ TAO_NAMESPACE  CORBA
     typedef PrimitiveDef_ptr _ptr_type;
     typedef PrimitiveDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static PrimitiveDef_ptr _duplicate (PrimitiveDef_ptr obj);
-    
+
     static PrimitiveDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PrimitiveDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PrimitiveDef_ptr _nil (void)
       {
         return (PrimitiveDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PrimitiveKind kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_PrimitiveDef_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
-  
+
   protected:
     PrimitiveDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_PrimitiveDef_setup_collocation (int collocated);
-    
+
     PrimitiveDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~PrimitiveDef (void);
-    
+
     friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
     friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
     friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
-  
+
   private:
     PrimitiveDef (const PrimitiveDef &);
     void operator= (const PrimitiveDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_PrimitiveDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::PrimitiveKind kind (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4038,23 +3351,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_PrimitiveDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Impl
     : public virtual _TAO_PrimitiveDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4062,12 +3375,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_PrimitiveDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_PrimitiveDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::PrimitiveKind kind (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4076,23 +3389,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker
   {
   public:
@@ -4101,152 +3414,69 @@ TAO_NAMESPACE  CORBA
         PrimitiveDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_PrimitiveDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Broker
     : public virtual _TAO_PrimitiveDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_PrimitiveDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
         PrimitiveDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_PrimitiveDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrimitiveDef;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_STRINGDEF___PTR_CH_)
-#define _CORBA_STRINGDEF___PTR_CH_
-  
-  class StringDef;
-  typedef StringDef *StringDef_ptr;
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRINGDEF___VAR_CH_)
-#define _CORBA_STRINGDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export StringDef_var : public TAO_Base_var
-  {
-  public:
-    StringDef_var (void); // default constructor
-    StringDef_var (StringDef_ptr p) : ptr_ (p) {} 
-    StringDef_var (const StringDef_var &); // copy constructor
-    ~StringDef_var (void); // destructor
-    
-    StringDef_var &operator= (StringDef_ptr);
-    StringDef_var &operator= (const StringDef_var &);
-    StringDef_ptr operator-> (void) const;
-    
-    operator const StringDef_ptr &() const;
-    operator StringDef_ptr &();
-    // in, inout, out, _retn 
-    StringDef_ptr in (void) const;
-    StringDef_ptr &inout (void);
-    StringDef_ptr &out (void);
-    StringDef_ptr _retn (void);
-    StringDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static StringDef_ptr tao_duplicate (StringDef_ptr);
-    static void tao_release (StringDef_ptr);
-    static StringDef_ptr tao_nil (void);
-    static StringDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    StringDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    StringDef_var (const TAO_Base_var &rhs);
-    StringDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRINGDEF___OUT_CH_)
-#define _CORBA_STRINGDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export StringDef_out
-  {
-  public:
-    StringDef_out (StringDef_ptr &);
-    StringDef_out (StringDef_var &);
-    StringDef_out (const StringDef_out &);
-    StringDef_out &operator= (const StringDef_out &);
-    StringDef_out &operator= (const StringDef_var &);
-    StringDef_out &operator= (StringDef_ptr);
-    operator StringDef_ptr &();
-    StringDef_ptr &ptr (void);
-    StringDef_ptr operator-> (void);
-  
-  private:
-    StringDef_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrimitiveDef;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_STRINGDEF_CH_)
 #define _CORBA_STRINGDEF_CH_
-  
+
   class _TAO_StringDef_Proxy_Impl;
   class _TAO_StringDef_Remote_Proxy_Impl;
   class _TAO_StringDef_Proxy_Broker;
   class _TAO_StringDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export StringDef
     : public virtual CORBA::IDLType
   {
@@ -4254,40 +3484,40 @@ TAO_NAMESPACE  CORBA
     typedef StringDef_ptr _ptr_type;
     typedef StringDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static StringDef_ptr _duplicate (StringDef_ptr obj);
-    
+
     static StringDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static StringDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static StringDef_ptr _nil (void)
       {
         return (StringDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void bound (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4295,66 +3525,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_StringDef_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
-  
+
   protected:
     StringDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_StringDef_setup_collocation (int collocated);
-    
+
     StringDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~StringDef (void);
-    
+
     friend class _TAO_StringDef_Remote_Proxy_Impl;
     friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
     friend class _TAO_StringDef_Direct_Proxy_Impl;
-  
+
   private:
     StringDef (const StringDef &);
     void operator= (const StringDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_StringDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4362,10 +3592,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -4374,23 +3604,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_StringDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Impl
     : public virtual _TAO_StringDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4398,12 +3628,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_StringDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_StringDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4411,10 +3641,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -4424,23 +3654,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker
   {
   public:
@@ -4449,152 +3679,69 @@ TAO_NAMESPACE  CORBA
         StringDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_StringDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Broker
     : public virtual _TAO_StringDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_StringDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_StringDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_StringDef_Proxy_Impl &select_proxy (
         StringDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_StringDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringDef;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_WSTRINGDEF___PTR_CH_)
-#define _CORBA_WSTRINGDEF___PTR_CH_
-  
-  class WstringDef;
-  typedef WstringDef *WstringDef_ptr;
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_WSTRINGDEF___VAR_CH_)
-#define _CORBA_WSTRINGDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export WstringDef_var : public TAO_Base_var
-  {
-  public:
-    WstringDef_var (void); // default constructor
-    WstringDef_var (WstringDef_ptr p) : ptr_ (p) {} 
-    WstringDef_var (const WstringDef_var &); // copy constructor
-    ~WstringDef_var (void); // destructor
-    
-    WstringDef_var &operator= (WstringDef_ptr);
-    WstringDef_var &operator= (const WstringDef_var &);
-    WstringDef_ptr operator-> (void) const;
-    
-    operator const WstringDef_ptr &() const;
-    operator WstringDef_ptr &();
-    // in, inout, out, _retn 
-    WstringDef_ptr in (void) const;
-    WstringDef_ptr &inout (void);
-    WstringDef_ptr &out (void);
-    WstringDef_ptr _retn (void);
-    WstringDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static WstringDef_ptr tao_duplicate (WstringDef_ptr);
-    static void tao_release (WstringDef_ptr);
-    static WstringDef_ptr tao_nil (void);
-    static WstringDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    WstringDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    WstringDef_var (const TAO_Base_var &rhs);
-    WstringDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGDEF___OUT_CH_)
-#define _CORBA_WSTRINGDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export WstringDef_out
-  {
-  public:
-    WstringDef_out (WstringDef_ptr &);
-    WstringDef_out (WstringDef_var &);
-    WstringDef_out (const WstringDef_out &);
-    WstringDef_out &operator= (const WstringDef_out &);
-    WstringDef_out &operator= (const WstringDef_var &);
-    WstringDef_out &operator= (WstringDef_ptr);
-    operator WstringDef_ptr &();
-    WstringDef_ptr &ptr (void);
-    WstringDef_ptr operator-> (void);
-  
-  private:
-    WstringDef_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringDef;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_WSTRINGDEF_CH_)
 #define _CORBA_WSTRINGDEF_CH_
-  
+
   class _TAO_WstringDef_Proxy_Impl;
   class _TAO_WstringDef_Remote_Proxy_Impl;
   class _TAO_WstringDef_Proxy_Broker;
   class _TAO_WstringDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export WstringDef
     : public virtual CORBA::IDLType
   {
@@ -4602,40 +3749,40 @@ TAO_NAMESPACE  CORBA
     typedef WstringDef_ptr _ptr_type;
     typedef WstringDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static WstringDef_ptr _duplicate (WstringDef_ptr obj);
-    
+
     static WstringDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static WstringDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static WstringDef_ptr _nil (void)
       {
         return (WstringDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void bound (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4643,66 +3790,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_WstringDef_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
-  
+
   protected:
     WstringDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_WstringDef_setup_collocation (int collocated);
-    
+
     WstringDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~WstringDef (void);
-    
+
     friend class _TAO_WstringDef_Remote_Proxy_Impl;
     friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
     friend class _TAO_WstringDef_Direct_Proxy_Impl;
-  
+
   private:
     WstringDef (const WstringDef &);
     void operator= (const WstringDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_WstringDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4710,10 +3857,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -4722,23 +3869,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_WstringDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Impl
     : public virtual _TAO_WstringDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4746,12 +3893,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_WstringDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_WstringDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -4759,10 +3906,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -4772,23 +3919,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker
   {
   public:
@@ -4797,152 +3944,69 @@ TAO_NAMESPACE  CORBA
         WstringDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_WstringDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Broker
     : public virtual _TAO_WstringDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_WstringDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_WstringDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
         WstringDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_WstringDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WstringDef;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_SEQUENCEDEF___PTR_CH_)
-#define _CORBA_SEQUENCEDEF___PTR_CH_
-  
-  class SequenceDef;
-  typedef SequenceDef *SequenceDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
-#define _CORBA_SEQUENCEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export SequenceDef_var : public TAO_Base_var
-  {
-  public:
-    SequenceDef_var (void); // default constructor
-    SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {} 
-    SequenceDef_var (const SequenceDef_var &); // copy constructor
-    ~SequenceDef_var (void); // destructor
-    
-    SequenceDef_var &operator= (SequenceDef_ptr);
-    SequenceDef_var &operator= (const SequenceDef_var &);
-    SequenceDef_ptr operator-> (void) const;
-    
-    operator const SequenceDef_ptr &() const;
-    operator SequenceDef_ptr &();
-    // in, inout, out, _retn 
-    SequenceDef_ptr in (void) const;
-    SequenceDef_ptr &inout (void);
-    SequenceDef_ptr &out (void);
-    SequenceDef_ptr _retn (void);
-    SequenceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static SequenceDef_ptr tao_duplicate (SequenceDef_ptr);
-    static void tao_release (SequenceDef_ptr);
-    static SequenceDef_ptr tao_nil (void);
-    static SequenceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    SequenceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    SequenceDef_var (const TAO_Base_var &rhs);
-    SequenceDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
-#define _CORBA_SEQUENCEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export SequenceDef_out
-  {
-  public:
-    SequenceDef_out (SequenceDef_ptr &);
-    SequenceDef_out (SequenceDef_var &);
-    SequenceDef_out (const SequenceDef_out &);
-    SequenceDef_out &operator= (const SequenceDef_out &);
-    SequenceDef_out &operator= (const SequenceDef_var &);
-    SequenceDef_out &operator= (SequenceDef_ptr);
-    operator SequenceDef_ptr &();
-    SequenceDef_ptr &ptr (void);
-    SequenceDef_ptr operator-> (void);
-  
-  private:
-    SequenceDef_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WstringDef;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_SEQUENCEDEF_CH_)
 #define _CORBA_SEQUENCEDEF_CH_
-  
+
   class _TAO_SequenceDef_Proxy_Impl;
   class _TAO_SequenceDef_Remote_Proxy_Impl;
   class _TAO_SequenceDef_Proxy_Broker;
   class _TAO_SequenceDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export SequenceDef
     : public virtual CORBA::IDLType
   {
@@ -4950,40 +4014,40 @@ TAO_NAMESPACE  CORBA
     typedef SequenceDef_ptr _ptr_type;
     typedef SequenceDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static SequenceDef_ptr _duplicate (SequenceDef_ptr obj);
-    
+
     static SequenceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static SequenceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static SequenceDef_ptr _nil (void)
       {
         return (SequenceDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong bound (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void bound (
         CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4991,30 +4055,30 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void element_type_def (
         CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5022,66 +4086,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_SequenceDef_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
-  
+
   protected:
     SequenceDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_SequenceDef_setup_collocation (int collocated);
-    
+
     SequenceDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~SequenceDef (void);
-    
+
     friend class _TAO_SequenceDef_Remote_Proxy_Impl;
     friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_SequenceDef_Direct_Proxy_Impl;
-  
+
   private:
     SequenceDef (const SequenceDef &);
     void operator= (const SequenceDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_SequenceDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5089,10 +4153,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -5101,10 +4165,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr element_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5112,10 +4176,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr element_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5123,10 +4187,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void element_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr element_type_def
@@ -5135,23 +4199,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_SequenceDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Impl
     : public virtual _TAO_SequenceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5159,12 +4223,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_SequenceDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_SequenceDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::ULong bound (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5172,10 +4236,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void bound (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong bound
@@ -5184,10 +4248,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr element_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5195,10 +4259,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr element_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5206,10 +4270,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void element_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr element_type_def
@@ -5219,23 +4283,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker
   {
   public:
@@ -5244,152 +4308,69 @@ TAO_NAMESPACE  CORBA
         SequenceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_SequenceDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Broker
     : public virtual _TAO_SequenceDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_SequenceDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_SequenceDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
         SequenceDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_SequenceDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SequenceDef;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_ARRAYDEF___PTR_CH_)
-#define _CORBA_ARRAYDEF___PTR_CH_
-  
-  class ArrayDef;
-  typedef ArrayDef *ArrayDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ARRAYDEF___VAR_CH_)
-#define _CORBA_ARRAYDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ArrayDef_var : public TAO_Base_var
-  {
-  public:
-    ArrayDef_var (void); // default constructor
-    ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {} 
-    ArrayDef_var (const ArrayDef_var &); // copy constructor
-    ~ArrayDef_var (void); // destructor
-    
-    ArrayDef_var &operator= (ArrayDef_ptr);
-    ArrayDef_var &operator= (const ArrayDef_var &);
-    ArrayDef_ptr operator-> (void) const;
-    
-    operator const ArrayDef_ptr &() const;
-    operator ArrayDef_ptr &();
-    // in, inout, out, _retn 
-    ArrayDef_ptr in (void) const;
-    ArrayDef_ptr &inout (void);
-    ArrayDef_ptr &out (void);
-    ArrayDef_ptr _retn (void);
-    ArrayDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ArrayDef_ptr tao_duplicate (ArrayDef_ptr);
-    static void tao_release (ArrayDef_ptr);
-    static ArrayDef_ptr tao_nil (void);
-    static ArrayDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ArrayDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ArrayDef_var (const TAO_Base_var &rhs);
-    ArrayDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_ARRAYDEF___OUT_CH_)
-#define _CORBA_ARRAYDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ArrayDef_out
-  {
-  public:
-    ArrayDef_out (ArrayDef_ptr &);
-    ArrayDef_out (ArrayDef_var &);
-    ArrayDef_out (const ArrayDef_out &);
-    ArrayDef_out &operator= (const ArrayDef_out &);
-    ArrayDef_out &operator= (const ArrayDef_var &);
-    ArrayDef_out &operator= (ArrayDef_ptr);
-    operator ArrayDef_ptr &();
-    ArrayDef_ptr &ptr (void);
-    ArrayDef_ptr operator-> (void);
-  
-  private:
-    ArrayDef_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SequenceDef;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ARRAYDEF_CH_)
 #define _CORBA_ARRAYDEF_CH_
-  
+
   class _TAO_ArrayDef_Proxy_Impl;
   class _TAO_ArrayDef_Remote_Proxy_Impl;
   class _TAO_ArrayDef_Proxy_Broker;
   class _TAO_ArrayDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ArrayDef
     : public virtual CORBA::IDLType
   {
@@ -5397,40 +4378,40 @@ TAO_NAMESPACE  CORBA
     typedef ArrayDef_ptr _ptr_type;
     typedef ArrayDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ArrayDef_ptr _duplicate (ArrayDef_ptr obj);
-    
+
     static ArrayDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ArrayDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ArrayDef_ptr _nil (void)
       {
         return (ArrayDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong length (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void length (
         CORBA::ULong length
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5438,30 +4419,30 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr element_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr element_type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void element_type_def (
         CORBA::IDLType_ptr element_type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5469,66 +4450,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ArrayDef_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
-  
+
   protected:
     ArrayDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ArrayDef_setup_collocation (int collocated);
-    
+
     ArrayDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ArrayDef (void);
-    
+
     friend class _TAO_ArrayDef_Remote_Proxy_Impl;
     friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ArrayDef_Direct_Proxy_Impl;
-  
+
   private:
     ArrayDef (const ArrayDef &);
     void operator= (const ArrayDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Impl
     : public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_ArrayDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::ULong length (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5536,10 +4517,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void length (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong length
@@ -5548,10 +4529,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr element_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5559,10 +4540,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr element_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5570,10 +4551,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void element_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr element_type_def
@@ -5582,23 +4563,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_ArrayDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Impl
     : public virtual _TAO_ArrayDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5606,12 +4587,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ArrayDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ArrayDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::ULong length (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5619,10 +4600,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void length (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong length
@@ -5631,10 +4612,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr element_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5642,10 +4623,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr element_type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5653,10 +4634,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void element_type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr element_type_def
@@ -5666,23 +4647,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker
   {
   public:
@@ -5691,152 +4672,115 @@ TAO_NAMESPACE  CORBA
         ArrayDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ArrayDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Broker
     : public virtual _TAO_ArrayDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ArrayDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ArrayDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
         ArrayDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ArrayDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ArrayDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_EXCEPTIONDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXCEPTIONDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
-#define _CORBA_EXCEPTIONDEF___PTR_CH_
-  
   class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
+  struct tao_ExceptionDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExceptionDef,
+        tao_ExceptionDef_life
+      >
+    ExceptionDef_var;
 
-#if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
-#define _CORBA_EXCEPTIONDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExceptionDef_var : public TAO_Base_var
-  {
-  public:
-    ExceptionDef_var (void); // default constructor
-    ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {} 
-    ExceptionDef_var (const ExceptionDef_var &); // copy constructor
-    ~ExceptionDef_var (void); // destructor
-    
-    ExceptionDef_var &operator= (ExceptionDef_ptr);
-    ExceptionDef_var &operator= (const ExceptionDef_var &);
-    ExceptionDef_ptr operator-> (void) const;
-    
-    operator const ExceptionDef_ptr &() const;
-    operator ExceptionDef_ptr &();
-    // in, inout, out, _retn 
-    ExceptionDef_ptr in (void) const;
-    ExceptionDef_ptr &inout (void);
-    ExceptionDef_ptr &out (void);
-    ExceptionDef_ptr _retn (void);
-    ExceptionDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        ExceptionDef,
+        tao_ExceptionDef_life
+      >
+    ExceptionDef_out;
+
+  struct TAO_IFR_Client_Export tao_ExceptionDef_life
+  {
     static ExceptionDef_ptr tao_duplicate (ExceptionDef_ptr);
     static void tao_release (ExceptionDef_ptr);
     static ExceptionDef_ptr tao_nil (void);
-    static ExceptionDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExceptionDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExceptionDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExceptionDef_var (const TAO_Base_var &rhs);
-    ExceptionDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
-#define _CORBA_EXCEPTIONDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExceptionDef_out
-  {
-  public:
-    ExceptionDef_out (ExceptionDef_ptr &);
-    ExceptionDef_out (ExceptionDef_var &);
-    ExceptionDef_out (const ExceptionDef_out &);
-    ExceptionDef_out &operator= (const ExceptionDef_out &);
-    ExceptionDef_out &operator= (const ExceptionDef_var &);
-    ExceptionDef_out &operator= (ExceptionDef_ptr);
-    operator ExceptionDef_ptr &();
-    ExceptionDef_ptr &ptr (void);
-    ExceptionDef_ptr operator-> (void);
-  
-  private:
-    ExceptionDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_ExceptionDef_cast
+  {
+    static ExceptionDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXCEPTIONDEF_CH_)
 #define _CORBA_EXCEPTIONDEF_CH_
-  
+
   class _TAO_ExceptionDef_Proxy_Impl;
   class _TAO_ExceptionDef_Remote_Proxy_Impl;
   class _TAO_ExceptionDef_Proxy_Broker;
   class _TAO_ExceptionDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ExceptionDef
     : public virtual CORBA::Contained,
       public virtual CORBA::Container
@@ -5845,50 +4789,50 @@ TAO_NAMESPACE  CORBA
     typedef ExceptionDef_ptr _ptr_type;
     typedef ExceptionDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ExceptionDef_ptr _duplicate (ExceptionDef_ptr obj);
-    
+
     static ExceptionDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExceptionDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExceptionDef_ptr _nil (void)
       {
         return (ExceptionDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StructMemberSeq * members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void members (
         const CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5896,67 +4840,67 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ExceptionDef_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
-  
+
   protected:
     ExceptionDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExceptionDef_setup_collocation (int collocated);
-    
+
     ExceptionDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ExceptionDef (void);
-    
+
     friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
     friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
-  
+
   private:
     ExceptionDef (const ExceptionDef &);
     void operator= (const ExceptionDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Contained_Proxy_Impl, 
+    : public virtual CORBA::_TAO_Contained_Proxy_Impl,
       public virtual CORBA::_TAO_Container_Proxy_Impl
   {
   public:
     virtual ~_TAO_ExceptionDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5964,10 +4908,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::StructMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -5975,10 +4919,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::StructMemberSeq & members
@@ -5987,23 +4931,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_ExceptionDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Impl
     : public virtual _TAO_ExceptionDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -6012,12 +4956,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ExceptionDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ExceptionDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6025,10 +4969,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::StructMemberSeq * members (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6036,10 +4980,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void members (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::StructMemberSeq & members
@@ -6049,23 +4993,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker
   {
   public:
@@ -6074,346 +5018,190 @@ TAO_NAMESPACE  CORBA
         ExceptionDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ExceptionDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Broker
     : public virtual _TAO_ExceptionDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ExceptionDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ExceptionDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
         ExceptionDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ExceptionDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDef;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExceptionDef* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static ExceptionDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ExceptionDef **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExceptionDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const ExceptionDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    virtual CORBA::Object* _upcast (void *src) const;
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDef;
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ_CH_)
-#define _CORBA_EXCEPTIONDEFSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class ExceptionDefSeq;
-  class ExceptionDefSeq_var;
-  
-  // *************************************************************
-  // CORBA::ExceptionDefSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExceptionDefSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<ExceptionDef,ExceptionDef_var>
+  class ExceptionDefSeq;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_MngSeq_Var_T<
+        ExceptionDefSeq,
+        TAO_Object_Manager<
+            ExceptionDef,
+            ExceptionDef,
+            CORBA::tao_ExceptionDef_life
+          >
+      >
+    ExceptionDefSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ExceptionDefSeq,
+        ExceptionDefSeq_var,
+        TAO_Object_Manager<
+            ExceptionDef,
+            ExceptionDef,
+            CORBA::tao_ExceptionDef_life
+          >
+      >
+    ExceptionDefSeq_out;
+
+  class TAO_IFR_Client_Export ExceptionDefSeq
+    : public
+        TAO_Unbounded_Object_Sequence<
+            ExceptionDef,
+            ExceptionDef,
+            CORBA::tao_ExceptionDef_life,
+            CORBA::tao_ExceptionDef_cast
+          >
   {
   public:
     ExceptionDefSeq (void);
     ExceptionDefSeq (CORBA::ULong max);
     ExceptionDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ExceptionDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExceptionDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExceptionDefSeq (const ExceptionDefSeq &);
     ~ExceptionDefSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ExceptionDefSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ___VAR_CH_)
-#define _CORBA_EXCEPTIONDEFSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ExceptionDefSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExceptionDefSeq_var
-  {
-  public:
-    ExceptionDefSeq_var (void);
-    ExceptionDefSeq_var (ExceptionDefSeq *);
-    ExceptionDefSeq_var (const ExceptionDefSeq_var &);
-    ~ExceptionDefSeq_var (void);
-    
-    ExceptionDefSeq_var &operator= (ExceptionDefSeq *);
-    ExceptionDefSeq_var &operator= (const ExceptionDefSeq_var &);
-    ExceptionDefSeq *operator-> (void);
-    const ExceptionDefSeq *operator-> (void) const;
-    
-    operator const ExceptionDefSeq &() const;
-    operator ExceptionDefSeq &();
-    operator ExceptionDefSeq &() const;
-    
-    // Variable-size base types only.
-    operator ExceptionDefSeq *&();
-    
-    TAO_Object_Manager<ExceptionDef, ExceptionDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ExceptionDefSeq &in (void) const;
-    ExceptionDefSeq &inout (void);
-    ExceptionDefSeq *&out (void);
-    ExceptionDefSeq *_retn (void);
-    ExceptionDefSeq *ptr (void) const;
-  
-  private:
-    ExceptionDefSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ___OUT_CH_)
-#define _CORBA_EXCEPTIONDEFSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ExceptionDefSeq_out
-  {
-  public:
-    ExceptionDefSeq_out (ExceptionDefSeq *&);
-    ExceptionDefSeq_out (ExceptionDefSeq_var &);
-    ExceptionDefSeq_out (const ExceptionDefSeq_out &);
-    ExceptionDefSeq_out &operator= (const ExceptionDefSeq_out &);
-    ExceptionDefSeq_out &operator= (ExceptionDefSeq *);
-    operator ExceptionDefSeq *&();
-    ExceptionDefSeq *&ptr (void);
-    ExceptionDefSeq *operator-> (void);
-    TAO_Object_Manager<ExceptionDef, ExceptionDef_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ExceptionDefSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExceptionDefSeq_var &);
+    typedef ExceptionDefSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum AttributeMode
   {
     ATTR_NORMAL,
     ATTR_READONLY
   };
-  
+
   typedef AttributeMode &AttributeMode_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttributeMode;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_ATTRIBUTEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_ATTRIBUTEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_ATTRIBUTEDEF___PTR_CH_)
-#define _CORBA_ATTRIBUTEDEF___PTR_CH_
-  
   class AttributeDef;
   typedef AttributeDef *AttributeDef_ptr;
+  struct tao_AttributeDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        AttributeDef,
+        tao_AttributeDef_life
+      >
+    AttributeDef_var;
 
-#if !defined (_CORBA_ATTRIBUTEDEF___VAR_CH_)
-#define _CORBA_ATTRIBUTEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export AttributeDef_var : public TAO_Base_var
-  {
-  public:
-    AttributeDef_var (void); // default constructor
-    AttributeDef_var (AttributeDef_ptr p) : ptr_ (p) {} 
-    AttributeDef_var (const AttributeDef_var &); // copy constructor
-    ~AttributeDef_var (void); // destructor
-    
-    AttributeDef_var &operator= (AttributeDef_ptr);
-    AttributeDef_var &operator= (const AttributeDef_var &);
-    AttributeDef_ptr operator-> (void) const;
-    
-    operator const AttributeDef_ptr &() const;
-    operator AttributeDef_ptr &();
-    // in, inout, out, _retn 
-    AttributeDef_ptr in (void) const;
-    AttributeDef_ptr &inout (void);
-    AttributeDef_ptr &out (void);
-    AttributeDef_ptr _retn (void);
-    AttributeDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        AttributeDef,
+        tao_AttributeDef_life
+      >
+    AttributeDef_out;
+
+  struct TAO_IFR_Client_Export tao_AttributeDef_life
+  {
     static AttributeDef_ptr tao_duplicate (AttributeDef_ptr);
     static void tao_release (AttributeDef_ptr);
     static AttributeDef_ptr tao_nil (void);
-    static AttributeDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        AttributeDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    AttributeDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    AttributeDef_var (const TAO_Base_var &rhs);
-    AttributeDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEDEF___OUT_CH_)
-#define _CORBA_ATTRIBUTEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export AttributeDef_out
-  {
-  public:
-    AttributeDef_out (AttributeDef_ptr &);
-    AttributeDef_out (AttributeDef_var &);
-    AttributeDef_out (const AttributeDef_out &);
-    AttributeDef_out &operator= (const AttributeDef_out &);
-    AttributeDef_out &operator= (const AttributeDef_var &);
-    AttributeDef_out &operator= (AttributeDef_ptr);
-    operator AttributeDef_ptr &();
-    AttributeDef_ptr &ptr (void);
-    AttributeDef_ptr operator-> (void);
-  
-  private:
-    AttributeDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_AttributeDef_cast
+  {
+    static AttributeDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ATTRIBUTEDEF_CH_)
 #define _CORBA_ATTRIBUTEDEF_CH_
-  
+
   class _TAO_AttributeDef_Proxy_Impl;
   class _TAO_AttributeDef_Remote_Proxy_Impl;
   class _TAO_AttributeDef_Proxy_Broker;
   class _TAO_AttributeDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export AttributeDef
     : public virtual CORBA::Contained
   {
@@ -6421,50 +5209,50 @@ TAO_NAMESPACE  CORBA
     typedef AttributeDef_ptr _ptr_type;
     typedef AttributeDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static AttributeDef_ptr _duplicate (AttributeDef_ptr obj);
-    
+
     static AttributeDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AttributeDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AttributeDef_ptr _nil (void)
       {
         return (AttributeDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void type_def (
         CORBA::IDLType_ptr type_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6472,20 +5260,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AttributeMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void mode (
         CORBA::AttributeMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6493,66 +5281,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_AttributeDef_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
-  
+
   protected:
     AttributeDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AttributeDef_setup_collocation (int collocated);
-    
+
     AttributeDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~AttributeDef (void);
-    
+
     friend class _TAO_AttributeDef_Remote_Proxy_Impl;
     friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
     friend class _TAO_AttributeDef_Direct_Proxy_Impl;
-  
+
   private:
     AttributeDef (const AttributeDef &);
     void operator= (const AttributeDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Impl
     : public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_AttributeDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6560,10 +5348,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6571,10 +5359,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -6583,10 +5371,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::AttributeMode mode (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6594,10 +5382,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void mode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::AttributeMode mode
@@ -6606,23 +5394,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_AttributeDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Impl
     : public virtual _TAO_AttributeDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -6630,12 +5418,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_AttributeDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_AttributeDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6643,10 +5431,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr type_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6654,10 +5442,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void type_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr type_def
@@ -6666,10 +5454,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::AttributeMode mode (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -6677,10 +5465,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void mode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::AttributeMode mode
@@ -6690,23 +5478,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker
   {
   public:
@@ -6715,67 +5503,83 @@ TAO_NAMESPACE  CORBA
         AttributeDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_AttributeDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Broker
     : public virtual _TAO_AttributeDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_AttributeDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_AttributeDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
         AttributeDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_AttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttributeDef;
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct AttributeDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        AttributeDescription
+      >
+    AttributeDescription_var;
+
+  typedef
+    TAO_Out_T<
+        AttributeDescription,
+        AttributeDescription_var
+      >
+    AttributeDescription_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class AttributeDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export AttributeDescription
   {
     typedef AttributeDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -6784,76 +5588,37 @@ TAO_NAMESPACE  CORBA
     CORBA::TypeCode_var type;
     CORBA::AttributeMode mode;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export AttributeDescription_var
-  {
-  public:
-    AttributeDescription_var (void);
-    AttributeDescription_var (AttributeDescription *);
-    AttributeDescription_var (const AttributeDescription_var &);
-    ~AttributeDescription_var (void);
-    
-    AttributeDescription_var &operator= (AttributeDescription *);
-    AttributeDescription_var &operator= (const AttributeDescription_var &);
-    AttributeDescription *operator-> (void);
-    const AttributeDescription *operator-> (void) const;
-    
-    operator const AttributeDescription &() const;
-    operator AttributeDescription &();
-    operator AttributeDescription &() const;
-    
-    // Variable-size types only.
-    operator AttributeDescription *&();
-    
-    // in, inout, out, _retn 
-    const AttributeDescription &in (void) const;
-    AttributeDescription &inout (void);
-    AttributeDescription *&out (void);
-    AttributeDescription *_retn (void);
-    AttributeDescription *ptr (void) const;
-  
-  private:
-    AttributeDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export AttributeDescription_out
-  {
-  public:
-    AttributeDescription_out (AttributeDescription *&);
-    AttributeDescription_out (AttributeDescription_var &);
-    AttributeDescription_out (const AttributeDescription_out &);
-    AttributeDescription_out &operator= (const AttributeDescription_out &);
-    AttributeDescription_out &operator= (AttributeDescription *);
-    operator AttributeDescription *&();
-    AttributeDescription *&ptr (void);
-    AttributeDescription *operator-> (void);
-    
-  private:
-    AttributeDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const AttributeDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttributeDescription;
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct ExtAttributeDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        ExtAttributeDescription
+      >
+    ExtAttributeDescription_var;
+
+  typedef
+    TAO_Out_T<
+        ExtAttributeDescription,
+        ExtAttributeDescription_var
+      >
+    ExtAttributeDescription_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ExtAttributeDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export ExtAttributeDescription
   {
     typedef ExtAttributeDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -6864,161 +5629,69 @@ TAO_NAMESPACE  CORBA
     CORBA::ExcDescriptionSeq get_exceptions;
     CORBA::ExcDescriptionSeq put_exceptions;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export ExtAttributeDescription_var
-  {
-  public:
-    ExtAttributeDescription_var (void);
-    ExtAttributeDescription_var (ExtAttributeDescription *);
-    ExtAttributeDescription_var (const ExtAttributeDescription_var &);
-    ~ExtAttributeDescription_var (void);
-    
-    ExtAttributeDescription_var &operator= (ExtAttributeDescription *);
-    ExtAttributeDescription_var &operator= (const ExtAttributeDescription_var &);
-    ExtAttributeDescription *operator-> (void);
-    const ExtAttributeDescription *operator-> (void) const;
-    
-    operator const ExtAttributeDescription &() const;
-    operator ExtAttributeDescription &();
-    operator ExtAttributeDescription &() const;
-    
-    // Variable-size types only.
-    operator ExtAttributeDescription *&();
-    
-    // in, inout, out, _retn 
-    const ExtAttributeDescription &in (void) const;
-    ExtAttributeDescription &inout (void);
-    ExtAttributeDescription *&out (void);
-    ExtAttributeDescription *_retn (void);
-    ExtAttributeDescription *ptr (void) const;
-  
-  private:
-    ExtAttributeDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export ExtAttributeDescription_out
-  {
-  public:
-    ExtAttributeDescription_out (ExtAttributeDescription *&);
-    ExtAttributeDescription_out (ExtAttributeDescription_var &);
-    ExtAttributeDescription_out (const ExtAttributeDescription_out &);
-    ExtAttributeDescription_out &operator= (const ExtAttributeDescription_out &);
-    ExtAttributeDescription_out &operator= (ExtAttributeDescription *);
-    operator ExtAttributeDescription *&();
-    ExtAttributeDescription *&ptr (void);
-    ExtAttributeDescription *operator-> (void);
-    
-  private:
-    ExtAttributeDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExtAttributeDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAttributeDescription;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_EXTATTRIBUTEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTATTRIBUTEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF___PTR_CH_)
-#define _CORBA_EXTATTRIBUTEDEF___PTR_CH_
-  
   class ExtAttributeDef;
   typedef ExtAttributeDef *ExtAttributeDef_ptr;
+  struct tao_ExtAttributeDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExtAttributeDef,
+        tao_ExtAttributeDef_life
+      >
+    ExtAttributeDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ExtAttributeDef,
+        tao_ExtAttributeDef_life
+      >
+    ExtAttributeDef_out;
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF___VAR_CH_)
-#define _CORBA_EXTATTRIBUTEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtAttributeDef_var : public TAO_Base_var
-  {
-  public:
-    ExtAttributeDef_var (void); // default constructor
-    ExtAttributeDef_var (ExtAttributeDef_ptr p) : ptr_ (p) {} 
-    ExtAttributeDef_var (const ExtAttributeDef_var &); // copy constructor
-    ~ExtAttributeDef_var (void); // destructor
-    
-    ExtAttributeDef_var &operator= (ExtAttributeDef_ptr);
-    ExtAttributeDef_var &operator= (const ExtAttributeDef_var &);
-    ExtAttributeDef_ptr operator-> (void) const;
-    
-    operator const ExtAttributeDef_ptr &() const;
-    operator ExtAttributeDef_ptr &();
-    // in, inout, out, _retn 
-    ExtAttributeDef_ptr in (void) const;
-    ExtAttributeDef_ptr &inout (void);
-    ExtAttributeDef_ptr &out (void);
-    ExtAttributeDef_ptr _retn (void);
-    ExtAttributeDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_ExtAttributeDef_life
+  {
     static ExtAttributeDef_ptr tao_duplicate (ExtAttributeDef_ptr);
     static void tao_release (ExtAttributeDef_ptr);
     static ExtAttributeDef_ptr tao_nil (void);
-    static ExtAttributeDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtAttributeDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtAttributeDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtAttributeDef_var (const TAO_Base_var &rhs);
-    ExtAttributeDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF___OUT_CH_)
-#define _CORBA_EXTATTRIBUTEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtAttributeDef_out
-  {
-  public:
-    ExtAttributeDef_out (ExtAttributeDef_ptr &);
-    ExtAttributeDef_out (ExtAttributeDef_var &);
-    ExtAttributeDef_out (const ExtAttributeDef_out &);
-    ExtAttributeDef_out &operator= (const ExtAttributeDef_out &);
-    ExtAttributeDef_out &operator= (const ExtAttributeDef_var &);
-    ExtAttributeDef_out &operator= (ExtAttributeDef_ptr);
-    operator ExtAttributeDef_ptr &();
-    ExtAttributeDef_ptr &ptr (void);
-    ExtAttributeDef_ptr operator-> (void);
-  
-  private:
-    ExtAttributeDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_ExtAttributeDef_cast
+  {
+    static ExtAttributeDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF_CH_)
 #define _CORBA_EXTATTRIBUTEDEF_CH_
-  
+
   class _TAO_ExtAttributeDef_Proxy_Impl;
   class _TAO_ExtAttributeDef_Remote_Proxy_Impl;
   class _TAO_ExtAttributeDef_Proxy_Broker;
   class _TAO_ExtAttributeDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ExtAttributeDef
     : public virtual CORBA::AttributeDef
   {
@@ -7026,40 +5699,40 @@ TAO_NAMESPACE  CORBA
     typedef ExtAttributeDef_ptr _ptr_type;
     typedef ExtAttributeDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ExtAttributeDef_ptr _duplicate (ExtAttributeDef_ptr obj);
-    
+
     static ExtAttributeDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtAttributeDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtAttributeDef_ptr _nil (void)
       {
         return (ExtAttributeDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void get_exceptions (
         const CORBA::ExcDescriptionSeq & get_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7067,20 +5740,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_exceptions (
         const CORBA::ExcDescriptionSeq & set_exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7088,76 +5761,76 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtAttributeDescription * describe_attribute (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ExtAttributeDef_Proxy_Broker *the_TAO_ExtAttributeDef_Proxy_Broker_;
-  
+
   protected:
     ExtAttributeDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtAttributeDef_setup_collocation (int collocated);
-    
+
     ExtAttributeDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ExtAttributeDef (void);
-    
+
     friend class _TAO_ExtAttributeDef_Remote_Proxy_Impl;
     friend class _TAO_ExtAttributeDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ExtAttributeDef_Direct_Proxy_Impl;
-  
+
   private:
     ExtAttributeDef (const ExtAttributeDef &);
     void operator= (const ExtAttributeDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExtAttributeDef_Proxy_Impl
     : public virtual CORBA::_TAO_AttributeDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_ExtAttributeDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7165,10 +5838,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void get_exceptions (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ExcDescriptionSeq & get_exceptions
@@ -7177,10 +5850,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7188,10 +5861,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void set_exceptions (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ExcDescriptionSeq & set_exceptions
@@ -7200,10 +5873,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ExtAttributeDescription * describe_attribute (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7211,23 +5884,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_ExtAttributeDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_ExtAttributeDef_Remote_Proxy_Impl
     : public virtual _TAO_ExtAttributeDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -7235,12 +5908,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ExtAttributeDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ExtAttributeDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7248,10 +5921,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void get_exceptions (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ExcDescriptionSeq & get_exceptions
@@ -7260,10 +5933,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7271,10 +5944,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void set_exceptions (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ExcDescriptionSeq & set_exceptions
@@ -7283,10 +5956,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ExtAttributeDescription * describe_attribute (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -7295,23 +5968,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExtAttributeDef_Proxy_Broker
   {
   public:
@@ -7320,552 +5993,274 @@ TAO_NAMESPACE  CORBA
         ExtAttributeDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ExtAttributeDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_ExtAttributeDef_Remote_Proxy_Broker
     : public virtual _TAO_ExtAttributeDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ExtAttributeDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ExtAttributeDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ExtAttributeDef_Proxy_Impl &select_proxy (
         ExtAttributeDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ExtAttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ExtAttributeDef_Remote_Proxy_Broker *the_TAO_ExtAttributeDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAttributeDef;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum OperationMode
   {
     OP_NORMAL,
     OP_ONEWAY
   };
-  
+
   typedef OperationMode &OperationMode_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OperationMode;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ParameterDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct ParameterDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        ParameterDescription
+      >
+    ParameterDescription_var;
+
+  typedef
+    TAO_Out_T<
+        ParameterDescription,
+        ParameterDescription_var
+      >
+    ParameterDescription_out;
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export ParameterDescription
   {
     typedef ParameterDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
     CORBA::ParameterMode mode;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export ParameterDescription_var
-  {
-  public:
-    ParameterDescription_var (void);
-    ParameterDescription_var (ParameterDescription *);
-    ParameterDescription_var (const ParameterDescription_var &);
-    ~ParameterDescription_var (void);
-    
-    ParameterDescription_var &operator= (ParameterDescription *);
-    ParameterDescription_var &operator= (const ParameterDescription_var &);
-    ParameterDescription *operator-> (void);
-    const ParameterDescription *operator-> (void) const;
-    
-    operator const ParameterDescription &() const;
-    operator ParameterDescription &();
-    operator ParameterDescription &() const;
-    
-    // Variable-size types only.
-    operator ParameterDescription *&();
-    
-    // in, inout, out, _retn 
-    const ParameterDescription &in (void) const;
-    ParameterDescription &inout (void);
-    ParameterDescription *&out (void);
-    ParameterDescription *_retn (void);
-    ParameterDescription *ptr (void) const;
-  
-  private:
-    ParameterDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export ParameterDescription_out
-  {
-  public:
-    ParameterDescription_out (ParameterDescription *&);
-    ParameterDescription_out (ParameterDescription_var &);
-    ParameterDescription_out (const ParameterDescription_out &);
-    ParameterDescription_out &operator= (const ParameterDescription_out &);
-    ParameterDescription_out &operator= (ParameterDescription *);
-    operator ParameterDescription *&();
-    ParameterDescription *&ptr (void);
-    ParameterDescription *operator-> (void);
-    
-  private:
-    ParameterDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ParameterDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterDescription;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ParameterDescription *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (
-        const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void);
-    
-    // = Accessors.
-    ParameterDescription &operator[] (CORBA::ULong i);
-    const ParameterDescription &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ParameterDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (ParameterDescription *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const ParameterDescription *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ParameterDescription *data,
-        CORBA::Boolean release
-      );
-  };
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterDescription;
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ_CH_)
-#define _CORBA_PARDESCRIPTIONSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ParDescriptionSeq;
-  class ParDescriptionSeq_var;
-  
-  // *************************************************************
-  // CORBA::ParDescriptionSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ParDescriptionSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ParameterDescription>
+  typedef
+    TAO_VarSeq_Var_T<
+        ParDescriptionSeq,
+        ParameterDescription
+      >
+    ParDescriptionSeq_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        ParDescriptionSeq,
+        ParDescriptionSeq_var,
+        ParameterDescription
+      >
+    ParDescriptionSeq_out;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  class TAO_IFR_Client_Export ParDescriptionSeq
+    : public
+        TAO_Unbounded_Sequence<
+            ParameterDescription
+          >
   {
   public:
     ParDescriptionSeq (void);
     ParDescriptionSeq (CORBA::ULong max);
     ParDescriptionSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ParameterDescription *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ParameterDescription* buffer,
         CORBA::Boolean release = 0
       );
     ParDescriptionSeq (const ParDescriptionSeq &);
     ~ParDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ParDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_PARDESCRIPTIONSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ParDescriptionSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ParDescriptionSeq_var
-  {
-  public:
-    ParDescriptionSeq_var (void);
-    ParDescriptionSeq_var (ParDescriptionSeq *);
-    ParDescriptionSeq_var (const ParDescriptionSeq_var &);
-    ~ParDescriptionSeq_var (void);
-    
-    ParDescriptionSeq_var &operator= (ParDescriptionSeq *);
-    ParDescriptionSeq_var &operator= (const ParDescriptionSeq_var &);
-    ParDescriptionSeq *operator-> (void);
-    const ParDescriptionSeq *operator-> (void) const;
-    
-    operator const ParDescriptionSeq &() const;
-    operator ParDescriptionSeq &();
-    operator ParDescriptionSeq &() const;
-    
-    // Variable-size base types only.
-    operator ParDescriptionSeq *&();
-    
-    ParameterDescription & operator[] (CORBA::ULong index);
-    const ParameterDescription & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ParDescriptionSeq &in (void) const;
-    ParDescriptionSeq &inout (void);
-    ParDescriptionSeq *&out (void);
-    ParDescriptionSeq *_retn (void);
-    ParDescriptionSeq *ptr (void) const;
-  
-  private:
-    ParDescriptionSeq *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_PARDESCRIPTIONSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ParDescriptionSeq_out
-  {
-  public:
-    ParDescriptionSeq_out (ParDescriptionSeq *&);
-    ParDescriptionSeq_out (ParDescriptionSeq_var &);
-    ParDescriptionSeq_out (const ParDescriptionSeq_out &);
-    ParDescriptionSeq_out &operator= (const ParDescriptionSeq_out &);
-    ParDescriptionSeq_out &operator= (ParDescriptionSeq *);
-    operator ParDescriptionSeq *&();
-    ParDescriptionSeq *&ptr (void);
-    ParDescriptionSeq *operator-> (void);
-    ParameterDescription & operator[] (CORBA::ULong index);
-  
-  private:
-    ParDescriptionSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ParDescriptionSeq_var &);
+    typedef ParDescriptionSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
-  
+
   typedef char * ContextIdentifier;
   typedef CORBA::String_var ContextIdentifier_var;
   typedef CORBA::String_out ContextIdentifier_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextIdentifier;
 
-#if !defined (_CORBA_CONTEXTIDSEQ_CH_)
-#define _CORBA_CONTEXTIDSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ContextIdSeq;
-  class ContextIdSeq_var;
-  
-  // *************************************************************
-  // CORBA::ContextIdSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ContextIdSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
+  typedef
+    TAO_MngSeq_Var_T<
+        ContextIdSeq,
+        TAO_SeqElem_String_Manager
+      >
+    ContextIdSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ContextIdSeq,
+        ContextIdSeq_var,
+        TAO_SeqElem_String_Manager
+      >
+    ContextIdSeq_out;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  class TAO_IFR_Client_Export ContextIdSeq
+    : public
+        TAO_Unbounded_String_Sequence
   {
   public:
     ContextIdSeq (void);
     ContextIdSeq (CORBA::ULong max);
     ContextIdSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        char * *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        char ** buffer,
         CORBA::Boolean release = 0
       );
     ContextIdSeq (const ContextIdSeq &);
     ~ContextIdSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ContextIdSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTEXTIDSEQ___VAR_CH_)
-#define _CORBA_CONTEXTIDSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ContextIdSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ContextIdSeq_var
-  {
-  public:
-    ContextIdSeq_var (void);
-    ContextIdSeq_var (ContextIdSeq *);
-    ContextIdSeq_var (const ContextIdSeq_var &);
-    ~ContextIdSeq_var (void);
-    
-    ContextIdSeq_var &operator= (ContextIdSeq *);
-    ContextIdSeq_var &operator= (const ContextIdSeq_var &);
-    ContextIdSeq *operator-> (void);
-    const ContextIdSeq *operator-> (void) const;
-    
-    operator const ContextIdSeq &() const;
-    operator ContextIdSeq &();
-    operator ContextIdSeq &() const;
-    
-    // Variable-size base types only.
-    operator ContextIdSeq *&();
-    
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ContextIdSeq &in (void) const;
-    ContextIdSeq &inout (void);
-    ContextIdSeq *&out (void);
-    ContextIdSeq *_retn (void);
-    ContextIdSeq *ptr (void) const;
-  
-  private:
-    ContextIdSeq *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_CONTEXTIDSEQ___OUT_CH_)
-#define _CORBA_CONTEXTIDSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ContextIdSeq_out
-  {
-  public:
-    ContextIdSeq_out (ContextIdSeq *&);
-    ContextIdSeq_out (ContextIdSeq_var &);
-    ContextIdSeq_out (const ContextIdSeq_out &);
-    ContextIdSeq_out &operator= (const ContextIdSeq_out &);
-    ContextIdSeq_out &operator= (ContextIdSeq *);
-    operator ContextIdSeq *&();
-    ContextIdSeq *&ptr (void);
-    ContextIdSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-  private:
-    ContextIdSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ContextIdSeq_var &);
+    typedef ContextIdSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextIdSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_OPERATIONDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_OPERATIONDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_OPERATIONDEF___PTR_CH_)
-#define _CORBA_OPERATIONDEF___PTR_CH_
-  
   class OperationDef;
   typedef OperationDef *OperationDef_ptr;
+  struct tao_OperationDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        OperationDef,
+        tao_OperationDef_life
+      >
+    OperationDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        OperationDef,
+        tao_OperationDef_life
+      >
+    OperationDef_out;
 
-#if !defined (_CORBA_OPERATIONDEF___VAR_CH_)
-#define _CORBA_OPERATIONDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export OperationDef_var : public TAO_Base_var
-  {
-  public:
-    OperationDef_var (void); // default constructor
-    OperationDef_var (OperationDef_ptr p) : ptr_ (p) {} 
-    OperationDef_var (const OperationDef_var &); // copy constructor
-    ~OperationDef_var (void); // destructor
-    
-    OperationDef_var &operator= (OperationDef_ptr);
-    OperationDef_var &operator= (const OperationDef_var &);
-    OperationDef_ptr operator-> (void) const;
-    
-    operator const OperationDef_ptr &() const;
-    operator OperationDef_ptr &();
-    // in, inout, out, _retn 
-    OperationDef_ptr in (void) const;
-    OperationDef_ptr &inout (void);
-    OperationDef_ptr &out (void);
-    OperationDef_ptr _retn (void);
-    OperationDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_OperationDef_life
+  {
     static OperationDef_ptr tao_duplicate (OperationDef_ptr);
     static void tao_release (OperationDef_ptr);
     static OperationDef_ptr tao_nil (void);
-    static OperationDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        OperationDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    OperationDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    OperationDef_var (const TAO_Base_var &rhs);
-    OperationDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF___OUT_CH_)
-#define _CORBA_OPERATIONDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export OperationDef_out
-  {
-  public:
-    OperationDef_out (OperationDef_ptr &);
-    OperationDef_out (OperationDef_var &);
-    OperationDef_out (const OperationDef_out &);
-    OperationDef_out &operator= (const OperationDef_out &);
-    OperationDef_out &operator= (const OperationDef_var &);
-    OperationDef_out &operator= (OperationDef_ptr);
-    operator OperationDef_ptr &();
-    OperationDef_ptr &ptr (void);
-    OperationDef_ptr operator-> (void);
-  
-  private:
-    OperationDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_OperationDef_cast
+  {
+    static OperationDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_OPERATIONDEF_CH_)
 #define _CORBA_OPERATIONDEF_CH_
-  
+
   class _TAO_OperationDef_Proxy_Impl;
   class _TAO_OperationDef_Remote_Proxy_Impl;
   class _TAO_OperationDef_Proxy_Broker;
   class _TAO_OperationDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export OperationDef
     : public virtual CORBA::Contained
   {
@@ -7873,50 +6268,50 @@ TAO_NAMESPACE  CORBA
     typedef OperationDef_ptr _ptr_type;
     typedef OperationDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static OperationDef_ptr _duplicate (OperationDef_ptr obj);
-    
+
     static OperationDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static OperationDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static OperationDef_ptr _nil (void)
       {
         return (OperationDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::IDLType_ptr result_def (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void result_def (
         CORBA::IDLType_ptr result_def
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7924,20 +6319,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ParDescriptionSeq * params (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void params (
         const CORBA::ParDescriptionSeq & params
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7945,20 +6340,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OperationMode mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void mode (
         CORBA::OperationMode mode
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7966,20 +6361,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ContextIdSeq * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void contexts (
         const CORBA::ContextIdSeq & contexts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7987,20 +6382,20 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExceptionDefSeq * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void exceptions (
         const CORBA::ExceptionDefSeq & exceptions
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -8008,66 +6403,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_OperationDef_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
-  
+
   protected:
     OperationDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_OperationDef_setup_collocation (int collocated);
-    
+
     OperationDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~OperationDef (void);
-    
+
     friend class _TAO_OperationDef_Remote_Proxy_Impl;
     friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
     friend class _TAO_OperationDef_Direct_Proxy_Impl;
-  
+
   private:
     OperationDef (const OperationDef &);
     void operator= (const OperationDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Impl
     : public virtual CORBA::_TAO_Contained_Proxy_Impl
   {
   public:
     virtual ~_TAO_OperationDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr result (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8075,10 +6470,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr result_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8086,10 +6481,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void result_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr result_def
@@ -8098,10 +6493,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ParDescriptionSeq * params (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8109,10 +6504,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void params (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ParDescriptionSeq & params
@@ -8121,10 +6516,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::OperationMode mode (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8132,10 +6527,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void mode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::OperationMode mode
@@ -8144,10 +6539,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ContextIdSeq * contexts (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8155,10 +6550,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void contexts (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ContextIdSeq & contexts
@@ -8167,10 +6562,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ExceptionDefSeq * exceptions (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8178,10 +6573,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void exceptions (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ExceptionDefSeq & exceptions
@@ -8190,23 +6585,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_OperationDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Impl
     : public virtual _TAO_OperationDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -8214,12 +6609,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_OperationDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_OperationDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::TypeCode_ptr result (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8227,10 +6622,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::IDLType_ptr result_def (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8238,10 +6633,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void result_def (
         CORBA::Object *_collocated_tao_target_,
         CORBA::IDLType_ptr result_def
@@ -8250,10 +6645,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ParDescriptionSeq * params (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8261,10 +6656,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void params (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ParDescriptionSeq & params
@@ -8273,10 +6668,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::OperationMode mode (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8284,10 +6679,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void mode (
         CORBA::Object *_collocated_tao_target_,
         CORBA::OperationMode mode
@@ -8296,10 +6691,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ContextIdSeq * contexts (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8307,10 +6702,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void contexts (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ContextIdSeq & contexts
@@ -8319,10 +6714,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ExceptionDefSeq * exceptions (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -8330,10 +6725,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void exceptions (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::ExceptionDefSeq & exceptions
@@ -8343,23 +6738,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker
   {
   public:
@@ -8368,67 +6763,83 @@ TAO_NAMESPACE  CORBA
         OperationDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_OperationDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Broker
     : public virtual _TAO_OperationDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_OperationDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_OperationDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
         OperationDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_OperationDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OperationDef;
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct OperationDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        OperationDescription
+      >
+    OperationDescription_var;
+
+  typedef
+    TAO_Out_T<
+        OperationDescription,
+        OperationDescription_var
+      >
+    OperationDescription_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class OperationDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export OperationDescription
   {
     typedef OperationDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -8440,807 +6851,259 @@ TAO_NAMESPACE  CORBA
     CORBA::ParDescriptionSeq parameters;
     CORBA::ExcDescriptionSeq exceptions;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export OperationDescription_var
-  {
-  public:
-    OperationDescription_var (void);
-    OperationDescription_var (OperationDescription *);
-    OperationDescription_var (const OperationDescription_var &);
-    ~OperationDescription_var (void);
-    
-    OperationDescription_var &operator= (OperationDescription *);
-    OperationDescription_var &operator= (const OperationDescription_var &);
-    OperationDescription *operator-> (void);
-    const OperationDescription *operator-> (void) const;
-    
-    operator const OperationDescription &() const;
-    operator OperationDescription &();
-    operator OperationDescription &() const;
-    
-    // Variable-size types only.
-    operator OperationDescription *&();
-    
-    // in, inout, out, _retn 
-    const OperationDescription &in (void) const;
-    OperationDescription &inout (void);
-    OperationDescription *&out (void);
-    OperationDescription *_retn (void);
-    OperationDescription *ptr (void) const;
-  
-  private:
-    OperationDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export OperationDescription_out
-  {
-  public:
-    OperationDescription_out (OperationDescription *&);
-    OperationDescription_out (OperationDescription_var &);
-    OperationDescription_out (const OperationDescription_out &);
-    OperationDescription_out &operator= (const OperationDescription_out &);
-    OperationDescription_out &operator= (OperationDescription *);
-    operator OperationDescription *&();
-    OperationDescription *&ptr (void);
-    OperationDescription *operator-> (void);
-    
-  private:
-    OperationDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const OperationDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OperationDescription;
 
-#if !defined (_CORBA_REPOSITORYIDSEQ_CH_)
-#define _CORBA_REPOSITORYIDSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class RepositoryIdSeq;
-  class RepositoryIdSeq_var;
-  
-  // *************************************************************
-  // CORBA::RepositoryIdSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export RepositoryIdSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
+  typedef
+    TAO_MngSeq_Var_T<
+        RepositoryIdSeq,
+        TAO_SeqElem_String_Manager
+      >
+    RepositoryIdSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_MngSeq_Out_T<
+        RepositoryIdSeq,
+        RepositoryIdSeq_var,
+        TAO_SeqElem_String_Manager
+      >
+    RepositoryIdSeq_out;
+
+  class TAO_IFR_Client_Export RepositoryIdSeq
+    : public
+        TAO_Unbounded_String_Sequence
   {
   public:
     RepositoryIdSeq (void);
     RepositoryIdSeq (CORBA::ULong max);
     RepositoryIdSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        char * *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        char ** buffer,
         CORBA::Boolean release = 0
       );
     RepositoryIdSeq (const RepositoryIdSeq &);
     ~RepositoryIdSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef RepositoryIdSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_REPOSITORYIDSEQ___VAR_CH_)
-#define _CORBA_REPOSITORYIDSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::RepositoryIdSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export RepositoryIdSeq_var
-  {
-  public:
-    RepositoryIdSeq_var (void);
-    RepositoryIdSeq_var (RepositoryIdSeq *);
-    RepositoryIdSeq_var (const RepositoryIdSeq_var &);
-    ~RepositoryIdSeq_var (void);
-    
-    RepositoryIdSeq_var &operator= (RepositoryIdSeq *);
-    RepositoryIdSeq_var &operator= (const RepositoryIdSeq_var &);
-    RepositoryIdSeq *operator-> (void);
-    const RepositoryIdSeq *operator-> (void) const;
-    
-    operator const RepositoryIdSeq &() const;
-    operator RepositoryIdSeq &();
-    operator RepositoryIdSeq &() const;
-    
-    // Variable-size base types only.
-    operator RepositoryIdSeq *&();
-    
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const RepositoryIdSeq &in (void) const;
-    RepositoryIdSeq &inout (void);
-    RepositoryIdSeq *&out (void);
-    RepositoryIdSeq *_retn (void);
-    RepositoryIdSeq *ptr (void) const;
-  
-  private:
-    RepositoryIdSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_REPOSITORYIDSEQ___OUT_CH_)
-#define _CORBA_REPOSITORYIDSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export RepositoryIdSeq_out
-  {
-  public:
-    RepositoryIdSeq_out (RepositoryIdSeq *&);
-    RepositoryIdSeq_out (RepositoryIdSeq_var &);
-    RepositoryIdSeq_out (const RepositoryIdSeq_out &);
-    RepositoryIdSeq_out &operator= (const RepositoryIdSeq_out &);
-    RepositoryIdSeq_out &operator= (RepositoryIdSeq *);
-    operator RepositoryIdSeq *&();
-    RepositoryIdSeq *&ptr (void);
-    RepositoryIdSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-  private:
-    RepositoryIdSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const RepositoryIdSeq_var &);
+    typedef RepositoryIdSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        OperationDescription *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (
-        const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void);
-    
-    // = Accessors.
-    OperationDescription &operator[] (CORBA::ULong i);
-    const OperationDescription &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static OperationDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (OperationDescription *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const OperationDescription *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        OperationDescription *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
 
-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CH_)
-#define _CORBA_OPDESCRIPTIONSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class OpDescriptionSeq;
-  class OpDescriptionSeq_var;
-  
-  // *************************************************************
-  // CORBA::OpDescriptionSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export OpDescriptionSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<OperationDescription>
+  typedef
+    TAO_VarSeq_Var_T<
+        OpDescriptionSeq,
+        OperationDescription
+      >
+    OpDescriptionSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_Seq_Out_T<
+        OpDescriptionSeq,
+        OpDescriptionSeq_var,
+        OperationDescription
+      >
+    OpDescriptionSeq_out;
+
+  class TAO_IFR_Client_Export OpDescriptionSeq
+    : public
+        TAO_Unbounded_Sequence<
+            OperationDescription
+          >
   {
   public:
     OpDescriptionSeq (void);
     OpDescriptionSeq (CORBA::ULong max);
     OpDescriptionSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        OperationDescription *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        OperationDescription* buffer,
         CORBA::Boolean release = 0
       );
     OpDescriptionSeq (const OpDescriptionSeq &);
     ~OpDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef OpDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_OPDESCRIPTIONSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::OpDescriptionSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export OpDescriptionSeq_var
-  {
-  public:
-    OpDescriptionSeq_var (void);
-    OpDescriptionSeq_var (OpDescriptionSeq *);
-    OpDescriptionSeq_var (const OpDescriptionSeq_var &);
-    ~OpDescriptionSeq_var (void);
-    
-    OpDescriptionSeq_var &operator= (OpDescriptionSeq *);
-    OpDescriptionSeq_var &operator= (const OpDescriptionSeq_var &);
-    OpDescriptionSeq *operator-> (void);
-    const OpDescriptionSeq *operator-> (void) const;
-    
-    operator const OpDescriptionSeq &() const;
-    operator OpDescriptionSeq &();
-    operator OpDescriptionSeq &() const;
-    
-    // Variable-size base types only.
-    operator OpDescriptionSeq *&();
-    
-    OperationDescription & operator[] (CORBA::ULong index);
-    const OperationDescription & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const OpDescriptionSeq &in (void) const;
-    OpDescriptionSeq &inout (void);
-    OpDescriptionSeq *&out (void);
-    OpDescriptionSeq *_retn (void);
-    OpDescriptionSeq *ptr (void) const;
-  
-  private:
-    OpDescriptionSeq *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_OPDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_OPDESCRIPTIONSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export OpDescriptionSeq_out
-  {
-  public:
-    OpDescriptionSeq_out (OpDescriptionSeq *&);
-    OpDescriptionSeq_out (OpDescriptionSeq_var &);
-    OpDescriptionSeq_out (const OpDescriptionSeq_out &);
-    OpDescriptionSeq_out &operator= (const OpDescriptionSeq_out &);
-    OpDescriptionSeq_out &operator= (OpDescriptionSeq *);
-    operator OpDescriptionSeq *&();
-    OpDescriptionSeq *&ptr (void);
-    OpDescriptionSeq *operator-> (void);
-    OperationDescription & operator[] (CORBA::ULong index);
-  
-  private:
-    OpDescriptionSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const OpDescriptionSeq_var &);
+    typedef OpDescriptionSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        AttributeDescription *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (
-        const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void);
-    
-    // = Accessors.
-    AttributeDescription &operator[] (CORBA::ULong i);
-    const AttributeDescription &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static AttributeDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (AttributeDescription *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const AttributeDescription *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        AttributeDescription *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
 
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CH_)
-#define _CORBA_ATTRDESCRIPTIONSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class AttrDescriptionSeq;
-  class AttrDescriptionSeq_var;
-  
-  // *************************************************************
-  // CORBA::AttrDescriptionSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export AttrDescriptionSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<AttributeDescription>
+  typedef
+    TAO_VarSeq_Var_T<
+        AttrDescriptionSeq,
+        AttributeDescription
+      >
+    AttrDescriptionSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_Seq_Out_T<
+        AttrDescriptionSeq,
+        AttrDescriptionSeq_var,
+        AttributeDescription
+      >
+    AttrDescriptionSeq_out;
+
+  class TAO_IFR_Client_Export AttrDescriptionSeq
+    : public
+        TAO_Unbounded_Sequence<
+            AttributeDescription
+          >
   {
   public:
     AttrDescriptionSeq (void);
     AttrDescriptionSeq (CORBA::ULong max);
     AttrDescriptionSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        AttributeDescription *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        AttributeDescription* buffer,
         CORBA::Boolean release = 0
       );
     AttrDescriptionSeq (const AttrDescriptionSeq &);
     ~AttrDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef AttrDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_ATTRDESCRIPTIONSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::AttrDescriptionSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export AttrDescriptionSeq_var
-  {
-  public:
-    AttrDescriptionSeq_var (void);
-    AttrDescriptionSeq_var (AttrDescriptionSeq *);
-    AttrDescriptionSeq_var (const AttrDescriptionSeq_var &);
-    ~AttrDescriptionSeq_var (void);
-    
-    AttrDescriptionSeq_var &operator= (AttrDescriptionSeq *);
-    AttrDescriptionSeq_var &operator= (const AttrDescriptionSeq_var &);
-    AttrDescriptionSeq *operator-> (void);
-    const AttrDescriptionSeq *operator-> (void) const;
-    
-    operator const AttrDescriptionSeq &() const;
-    operator AttrDescriptionSeq &();
-    operator AttrDescriptionSeq &() const;
-    
-    // Variable-size base types only.
-    operator AttrDescriptionSeq *&();
-    
-    AttributeDescription & operator[] (CORBA::ULong index);
-    const AttributeDescription & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const AttrDescriptionSeq &in (void) const;
-    AttrDescriptionSeq &inout (void);
-    AttrDescriptionSeq *&out (void);
-    AttrDescriptionSeq *_retn (void);
-    AttrDescriptionSeq *ptr (void) const;
-  
-  private:
-    AttrDescriptionSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_ATTRDESCRIPTIONSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export AttrDescriptionSeq_out
-  {
-  public:
-    AttrDescriptionSeq_out (AttrDescriptionSeq *&);
-    AttrDescriptionSeq_out (AttrDescriptionSeq_var &);
-    AttrDescriptionSeq_out (const AttrDescriptionSeq_out &);
-    AttrDescriptionSeq_out &operator= (const AttrDescriptionSeq_out &);
-    AttrDescriptionSeq_out &operator= (AttrDescriptionSeq *);
-    operator AttrDescriptionSeq *&();
-    AttrDescriptionSeq *&ptr (void);
-    AttrDescriptionSeq *operator-> (void);
-    AttributeDescription & operator[] (CORBA::ULong index);
-  
-  private:
-    AttrDescriptionSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const AttrDescriptionSeq_var &);
+    typedef AttrDescriptionSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ExtAttributeDescription *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (
-        const _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (void);
-    
-    // = Accessors.
-    ExtAttributeDescription &operator[] (CORBA::ULong i);
-    const ExtAttributeDescription &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ExtAttributeDescription *allocbuf (CORBA::ULong size);
-    static void freebuf (ExtAttributeDescription *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ExtAttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
-    const ExtAttributeDescription *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ExtAttributeDescription *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
 
-#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CH_)
-#define _CORBA_EXTATTRDESCRIPTIONSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ExtAttrDescriptionSeq;
-  class ExtAttrDescriptionSeq_var;
-  
-  // *************************************************************
-  // CORBA::ExtAttrDescriptionSeq
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtAttrDescriptionSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ExtAttributeDescription>
+  typedef
+    TAO_VarSeq_Var_T<
+        ExtAttrDescriptionSeq,
+        ExtAttributeDescription
+      >
+    ExtAttrDescriptionSeq_var;
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_Seq_Out_T<
+        ExtAttrDescriptionSeq,
+        ExtAttrDescriptionSeq_var,
+        ExtAttributeDescription
+      >
+    ExtAttrDescriptionSeq_out;
+
+  class TAO_IFR_Client_Export ExtAttrDescriptionSeq
+    : public
+        TAO_Unbounded_Sequence<
+            ExtAttributeDescription
+          >
   {
   public:
     ExtAttrDescriptionSeq (void);
     ExtAttrDescriptionSeq (CORBA::ULong max);
     ExtAttrDescriptionSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ExtAttributeDescription *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ExtAttributeDescription* buffer,
         CORBA::Boolean release = 0
       );
     ExtAttrDescriptionSeq (const ExtAttrDescriptionSeq &);
     ~ExtAttrDescriptionSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ExtAttrDescriptionSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_EXTATTRDESCRIPTIONSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ExtAttrDescriptionSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ExtAttrDescriptionSeq_var
-  {
-  public:
-    ExtAttrDescriptionSeq_var (void);
-    ExtAttrDescriptionSeq_var (ExtAttrDescriptionSeq *);
-    ExtAttrDescriptionSeq_var (const ExtAttrDescriptionSeq_var &);
-    ~ExtAttrDescriptionSeq_var (void);
-    
-    ExtAttrDescriptionSeq_var &operator= (ExtAttrDescriptionSeq *);
-    ExtAttrDescriptionSeq_var &operator= (const ExtAttrDescriptionSeq_var &);
-    ExtAttrDescriptionSeq *operator-> (void);
-    const ExtAttrDescriptionSeq *operator-> (void) const;
-    
-    operator const ExtAttrDescriptionSeq &() const;
-    operator ExtAttrDescriptionSeq &();
-    operator ExtAttrDescriptionSeq &() const;
-    
-    // Variable-size base types only.
-    operator ExtAttrDescriptionSeq *&();
-    
-    ExtAttributeDescription & operator[] (CORBA::ULong index);
-    const ExtAttributeDescription & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ExtAttrDescriptionSeq &in (void) const;
-    ExtAttrDescriptionSeq &inout (void);
-    ExtAttrDescriptionSeq *&out (void);
-    ExtAttrDescriptionSeq *_retn (void);
-    ExtAttrDescriptionSeq *ptr (void) const;
-  
-  private:
-    ExtAttrDescriptionSeq *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_EXTATTRDESCRIPTIONSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ExtAttrDescriptionSeq_out
-  {
-  public:
-    ExtAttrDescriptionSeq_out (ExtAttrDescriptionSeq *&);
-    ExtAttrDescriptionSeq_out (ExtAttrDescriptionSeq_var &);
-    ExtAttrDescriptionSeq_out (const ExtAttrDescriptionSeq_out &);
-    ExtAttrDescriptionSeq_out &operator= (const ExtAttrDescriptionSeq_out &);
-    ExtAttrDescriptionSeq_out &operator= (ExtAttrDescriptionSeq *);
-    operator ExtAttrDescriptionSeq *&();
-    ExtAttrDescriptionSeq *&ptr (void);
-    ExtAttrDescriptionSeq *operator-> (void);
-    ExtAttributeDescription & operator[] (CORBA::ULong index);
-  
-  private:
-    ExtAttrDescriptionSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ExtAttrDescriptionSeq_var &);
+    typedef ExtAttrDescriptionSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAttrDescriptionSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_INTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_INTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
-#define _CORBA_INTERFACEDEF___PTR_CH_
-  
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
+  struct tao_InterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        InterfaceDef,
+        tao_InterfaceDef_life
+      >
+    InterfaceDef_var;
 
-#if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
-#define _CORBA_INTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
-  {
-  public:
-    InterfaceDef_var (void); // default constructor
-    InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {} 
-    InterfaceDef_var (const InterfaceDef_var &); // copy constructor
-    ~InterfaceDef_var (void); // destructor
-    
-    InterfaceDef_var &operator= (InterfaceDef_ptr);
-    InterfaceDef_var &operator= (const InterfaceDef_var &);
-    InterfaceDef_ptr operator-> (void) const;
-    
-    operator const InterfaceDef_ptr &() const;
-    operator InterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    InterfaceDef_ptr in (void) const;
-    InterfaceDef_ptr &inout (void);
-    InterfaceDef_ptr &out (void);
-    InterfaceDef_ptr _retn (void);
-    InterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        InterfaceDef,
+        tao_InterfaceDef_life
+      >
+    InterfaceDef_out;
+
+  struct TAO_IFR_Client_Export tao_InterfaceDef_life
+  {
     static InterfaceDef_ptr tao_duplicate (InterfaceDef_ptr);
     static void tao_release (InterfaceDef_ptr);
     static InterfaceDef_ptr tao_nil (void);
-    static InterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        InterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    InterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    InterfaceDef_var (const TAO_Base_var &rhs);
-    InterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
-#define _CORBA_INTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export InterfaceDef_out
-  {
-  public:
-    InterfaceDef_out (InterfaceDef_ptr &);
-    InterfaceDef_out (InterfaceDef_var &);
-    InterfaceDef_out (const InterfaceDef_out &);
-    InterfaceDef_out &operator= (const InterfaceDef_out &);
-    InterfaceDef_out &operator= (const InterfaceDef_var &);
-    InterfaceDef_out &operator= (InterfaceDef_ptr);
-    operator InterfaceDef_ptr &();
-    InterfaceDef_ptr &ptr (void);
-    InterfaceDef_ptr operator-> (void);
-  
-  private:
-    InterfaceDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_InterfaceDef_cast
+  {
+    static InterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_INTERFACEDEF_CH_)
 #define _CORBA_INTERFACEDEF_CH_
-  
+
   class _TAO_InterfaceDef_Proxy_Impl;
   class _TAO_InterfaceDef_Remote_Proxy_Impl;
   class _TAO_InterfaceDef_Proxy_Broker;
   class _TAO_InterfaceDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export InterfaceDef
     : public virtual CORBA::Container,
       public virtual CORBA::Contained,
@@ -9250,40 +7113,40 @@ TAO_NAMESPACE  CORBA
     typedef InterfaceDef_ptr _ptr_type;
     typedef InterfaceDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj);
-    
+
     static InterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static InterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static InterfaceDef_ptr _nil (void)
       {
         return (InterfaceDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void base_interfaces (
         const CORBA::InterfaceDefSeq & base_interfaces
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -9291,10 +7154,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_a (
         const char * interface_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -9302,16 +7165,32 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-    
-    class FullInterfaceDescription_var;
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+    struct FullInterfaceDescription;
+
+    typedef
+      TAO_Var_Var_T<
+          FullInterfaceDescription
+        >
+      FullInterfaceDescription_var;
+
+    typedef
+      TAO_Out_T<
+          FullInterfaceDescription,
+          FullInterfaceDescription_var
+        >
+      FullInterfaceDescription_out;
+
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
     struct TAO_IFR_Client_Export FullInterfaceDescription
     {
       typedef FullInterfaceDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
       TAO_String_Manager name;
       TAO_String_Manager id;
@@ -9322,80 +7201,25 @@ TAO_NAMESPACE  CORBA
       ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces;
       CORBA::TypeCode_var type;
     };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export FullInterfaceDescription_var
-    {
-    public:
-      FullInterfaceDescription_var (void);
-      FullInterfaceDescription_var (FullInterfaceDescription *);
-      FullInterfaceDescription_var (const FullInterfaceDescription_var &);
-      ~FullInterfaceDescription_var (void);
-      
-      FullInterfaceDescription_var &operator= (FullInterfaceDescription *);
-      FullInterfaceDescription_var &operator= (const FullInterfaceDescription_var &);
-      FullInterfaceDescription *operator-> (void);
-      const FullInterfaceDescription *operator-> (void) const;
-      
-      operator const FullInterfaceDescription &() const;
-      operator FullInterfaceDescription &();
-      operator FullInterfaceDescription &() const;
-      
-      // Variable-size types only.
-      operator FullInterfaceDescription *&();
-      
-      // in, inout, out, _retn 
-      const FullInterfaceDescription &in (void) const;
-      FullInterfaceDescription &inout (void);
-      FullInterfaceDescription *&out (void);
-      FullInterfaceDescription *_retn (void);
-      FullInterfaceDescription *ptr (void) const;
-    
-    private:
-      FullInterfaceDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export FullInterfaceDescription_out
-    {
-    public:
-      FullInterfaceDescription_out (FullInterfaceDescription *&);
-      FullInterfaceDescription_out (FullInterfaceDescription_var &);
-      FullInterfaceDescription_out (const FullInterfaceDescription_out &);
-      FullInterfaceDescription_out &operator= (const FullInterfaceDescription_out &);
-      FullInterfaceDescription_out &operator= (FullInterfaceDescription *);
-      operator FullInterfaceDescription *&();
-      FullInterfaceDescription *&ptr (void);
-      FullInterfaceDescription *operator-> (void);
-      
-    private:
-      FullInterfaceDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const FullInterfaceDescription_var &);
-    };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_FullInterfaceDescription;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
@@ -9407,10 +7231,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -9425,68 +7249,68 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_InterfaceDef_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
-  
+
   protected:
     InterfaceDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_InterfaceDef_setup_collocation (int collocated);
-    
+
     InterfaceDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~InterfaceDef (void);
-    
+
     friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-  
+
   private:
     InterfaceDef (const InterfaceDef &);
     void operator= (const InterfaceDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Impl
-    : public virtual CORBA::_TAO_Container_Proxy_Impl, 
-      public virtual CORBA::_TAO_Contained_Proxy_Impl, 
+    : public virtual CORBA::_TAO_Container_Proxy_Impl,
+      public virtual CORBA::_TAO_Contained_Proxy_Impl,
       public virtual CORBA::_TAO_IDLType_Proxy_Impl
   {
   public:
     virtual ~_TAO_InterfaceDef_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -9494,10 +7318,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void base_interfaces (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::InterfaceDefSeq & base_interfaces
@@ -9506,10 +7330,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::Boolean is_a (
         CORBA::Object *_collocated_tao_target_,
         const char * interface_id
@@ -9518,10 +7342,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -9529,10 +7353,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -9545,10 +7369,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::OperationDef_ptr create_operation (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -9564,23 +7388,23 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_InterfaceDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_InterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -9590,12 +7414,12 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_InterfaceDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_InterfaceDef_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -9603,10 +7427,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void base_interfaces (
         CORBA::Object *_collocated_tao_target_,
         const CORBA::InterfaceDefSeq & base_interfaces
@@ -9615,10 +7439,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::Boolean is_a (
         CORBA::Object *_collocated_tao_target_,
         const char * interface_id
@@ -9627,10 +7451,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -9638,10 +7462,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::AttributeDef_ptr create_attribute (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -9654,10 +7478,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::OperationDef_ptr create_operation (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -9674,23 +7498,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker
   {
   public:
@@ -9699,67 +7523,83 @@ TAO_NAMESPACE  CORBA
         InterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_InterfaceDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_InterfaceDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_InterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_InterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
         InterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_InterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDef;
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct InterfaceDescription;
+
+  typedef
+    TAO_Var_Var_T<
+        InterfaceDescription
+      >
+    InterfaceDescription_var;
+
+  typedef
+    TAO_Out_T<
+        InterfaceDescription,
+        InterfaceDescription_var
+      >
+    InterfaceDescription_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class InterfaceDescription_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_IFR_Client_Export InterfaceDescription
   {
     typedef InterfaceDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -9767,161 +7607,69 @@ TAO_NAMESPACE  CORBA
     TAO_String_Manager version;
     CORBA::RepositoryIdSeq base_interfaces;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export InterfaceDescription_var
-  {
-  public:
-    InterfaceDescription_var (void);
-    InterfaceDescription_var (InterfaceDescription *);
-    InterfaceDescription_var (const InterfaceDescription_var &);
-    ~InterfaceDescription_var (void);
-    
-    InterfaceDescription_var &operator= (InterfaceDescription *);
-    InterfaceDescription_var &operator= (const InterfaceDescription_var &);
-    InterfaceDescription *operator-> (void);
-    const InterfaceDescription *operator-> (void) const;
-    
-    operator const InterfaceDescription &() const;
-    operator InterfaceDescription &();
-    operator InterfaceDescription &() const;
-    
-    // Variable-size types only.
-    operator InterfaceDescription *&();
-    
-    // in, inout, out, _retn 
-    const InterfaceDescription &in (void) const;
-    InterfaceDescription &inout (void);
-    InterfaceDescription *&out (void);
-    InterfaceDescription *_retn (void);
-    InterfaceDescription *ptr (void) const;
-  
-  private:
-    InterfaceDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export InterfaceDescription_out
-  {
-  public:
-    InterfaceDescription_out (InterfaceDescription *&);
-    InterfaceDescription_out (InterfaceDescription_var &);
-    InterfaceDescription_out (const InterfaceDescription_out &);
-    InterfaceDescription_out &operator= (const InterfaceDescription_out &);
-    InterfaceDescription_out &operator= (InterfaceDescription *);
-    operator InterfaceDescription *&();
-    InterfaceDescription *&ptr (void);
-    InterfaceDescription *operator-> (void);
-    
-  private:
-    InterfaceDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const InterfaceDescription_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceDescription;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_INTERFACEATTREXTENSION__ODDS_N_ENDS_CH_)
+#define _CORBA_INTERFACEATTREXTENSION__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_INTERFACEATTREXTENSION___PTR_CH_)
-#define _CORBA_INTERFACEATTREXTENSION___PTR_CH_
-  
   class InterfaceAttrExtension;
   typedef InterfaceAttrExtension *InterfaceAttrExtension_ptr;
+  struct tao_InterfaceAttrExtension_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        InterfaceAttrExtension,
+        tao_InterfaceAttrExtension_life
+      >
+    InterfaceAttrExtension_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        InterfaceAttrExtension,
+        tao_InterfaceAttrExtension_life
+      >
+    InterfaceAttrExtension_out;
 
-#if !defined (_CORBA_INTERFACEATTREXTENSION___VAR_CH_)
-#define _CORBA_INTERFACEATTREXTENSION___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export InterfaceAttrExtension_var : public TAO_Base_var
-  {
-  public:
-    InterfaceAttrExtension_var (void); // default constructor
-    InterfaceAttrExtension_var (InterfaceAttrExtension_ptr p) : ptr_ (p) {} 
-    InterfaceAttrExtension_var (const InterfaceAttrExtension_var &); // copy constructor
-    ~InterfaceAttrExtension_var (void); // destructor
-    
-    InterfaceAttrExtension_var &operator= (InterfaceAttrExtension_ptr);
-    InterfaceAttrExtension_var &operator= (const InterfaceAttrExtension_var &);
-    InterfaceAttrExtension_ptr operator-> (void) const;
-    
-    operator const InterfaceAttrExtension_ptr &() const;
-    operator InterfaceAttrExtension_ptr &();
-    // in, inout, out, _retn 
-    InterfaceAttrExtension_ptr in (void) const;
-    InterfaceAttrExtension_ptr &inout (void);
-    InterfaceAttrExtension_ptr &out (void);
-    InterfaceAttrExtension_ptr _retn (void);
-    InterfaceAttrExtension_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_InterfaceAttrExtension_life
+  {
     static InterfaceAttrExtension_ptr tao_duplicate (InterfaceAttrExtension_ptr);
     static void tao_release (InterfaceAttrExtension_ptr);
     static InterfaceAttrExtension_ptr tao_nil (void);
-    static InterfaceAttrExtension_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        InterfaceAttrExtension_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    InterfaceAttrExtension_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    InterfaceAttrExtension_var (const TAO_Base_var &rhs);
-    InterfaceAttrExtension_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION___OUT_CH_)
-#define _CORBA_INTERFACEATTREXTENSION___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export InterfaceAttrExtension_out
-  {
-  public:
-    InterfaceAttrExtension_out (InterfaceAttrExtension_ptr &);
-    InterfaceAttrExtension_out (InterfaceAttrExtension_var &);
-    InterfaceAttrExtension_out (const InterfaceAttrExtension_out &);
-    InterfaceAttrExtension_out &operator= (const InterfaceAttrExtension_out &);
-    InterfaceAttrExtension_out &operator= (const InterfaceAttrExtension_var &);
-    InterfaceAttrExtension_out &operator= (InterfaceAttrExtension_ptr);
-    operator InterfaceAttrExtension_ptr &();
-    InterfaceAttrExtension_ptr &ptr (void);
-    InterfaceAttrExtension_ptr operator-> (void);
-  
-  private:
-    InterfaceAttrExtension_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_InterfaceAttrExtension_cast
+  {
+    static InterfaceAttrExtension_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_CH_)
 #define _CORBA_INTERFACEATTREXTENSION_CH_
-  
+
   class _TAO_InterfaceAttrExtension_Proxy_Impl;
   class _TAO_InterfaceAttrExtension_Remote_Proxy_Impl;
   class _TAO_InterfaceAttrExtension_Proxy_Broker;
   class _TAO_InterfaceAttrExtension_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export InterfaceAttrExtension
     : public virtual CORBA::Object
   {
@@ -9929,36 +7677,52 @@ TAO_NAMESPACE  CORBA
     typedef InterfaceAttrExtension_ptr _ptr_type;
     typedef InterfaceAttrExtension_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static InterfaceAttrExtension_ptr _duplicate (InterfaceAttrExtension_ptr obj);
-    
+
     static InterfaceAttrExtension_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static InterfaceAttrExtension_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static InterfaceAttrExtension_ptr _nil (void)
       {
         return (InterfaceAttrExtension_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-    
-    class ExtFullInterfaceDescription_var;
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+    struct ExtFullInterfaceDescription;
+
+    typedef
+      TAO_Var_Var_T<
+          ExtFullInterfaceDescription
+        >
+      ExtFullInterfaceDescription_var;
+
+    typedef
+      TAO_Out_T<
+          ExtFullInterfaceDescription,
+          ExtFullInterfaceDescription_var
+        >
+      ExtFullInterfaceDescription_out;
+
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
     struct TAO_IFR_Client_Export ExtFullInterfaceDescription
     {
       typedef ExtFullInterfaceDescription_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
       TAO_String_Manager name;
       TAO_String_Manager id;
@@ -9969,80 +7733,25 @@ TAO_NAMESPACE  CORBA
       ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces;
       CORBA::TypeCode_var type;
     };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export ExtFullInterfaceDescription_var
-    {
-    public:
-      ExtFullInterfaceDescription_var (void);
-      ExtFullInterfaceDescription_var (ExtFullInterfaceDescription *);
-      ExtFullInterfaceDescription_var (const ExtFullInterfaceDescription_var &);
-      ~ExtFullInterfaceDescription_var (void);
-      
-      ExtFullInterfaceDescription_var &operator= (ExtFullInterfaceDescription *);
-      ExtFullInterfaceDescription_var &operator= (const ExtFullInterfaceDescription_var &);
-      ExtFullInterfaceDescription *operator-> (void);
-      const ExtFullInterfaceDescription *operator-> (void) const;
-      
-      operator const ExtFullInterfaceDescription &() const;
-      operator ExtFullInterfaceDescription &();
-      operator ExtFullInterfaceDescription &() const;
-      
-      // Variable-size types only.
-      operator ExtFullInterfaceDescription *&();
-      
-      // in, inout, out, _retn 
-      const ExtFullInterfaceDescription &in (void) const;
-      ExtFullInterfaceDescription &inout (void);
-      ExtFullInterfaceDescription *&out (void);
-      ExtFullInterfaceDescription *_retn (void);
-      ExtFullInterfaceDescription *ptr (void) const;
-    
-    private:
-      ExtFullInterfaceDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export ExtFullInterfaceDescription_out
-    {
-    public:
-      ExtFullInterfaceDescription_out (ExtFullInterfaceDescription *&);
-      ExtFullInterfaceDescription_out (ExtFullInterfaceDescription_var &);
-      ExtFullInterfaceDescription_out (const ExtFullInterfaceDescription_out &);
-      ExtFullInterfaceDescription_out &operator= (const ExtFullInterfaceDescription_out &);
-      ExtFullInterfaceDescription_out &operator= (ExtFullInterfaceDescription *);
-      operator ExtFullInterfaceDescription *&();
-      ExtFullInterfaceDescription *&ptr (void);
-      ExtFullInterfaceDescription *operator-> (void);
-      
-    private:
-      ExtFullInterfaceDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const ExtFullInterfaceDescription_var &);
-    };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_ExtFullInterfaceDescription;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         const char * id,
         const char * name,
@@ -10056,66 +7765,66 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_InterfaceAttrExtension_Proxy_Broker *the_TAO_InterfaceAttrExtension_Proxy_Broker_;
-  
+
   protected:
     InterfaceAttrExtension (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_InterfaceAttrExtension_setup_collocation (int collocated);
-    
+
     InterfaceAttrExtension (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~InterfaceAttrExtension (void);
-    
+
     friend class _TAO_InterfaceAttrExtension_Remote_Proxy_Impl;
     friend class _TAO_InterfaceAttrExtension_ThruPOA_Proxy_Impl;
     friend class _TAO_InterfaceAttrExtension_Direct_Proxy_Impl;
-  
+
   private:
     InterfaceAttrExtension (const InterfaceAttrExtension &);
     void operator= (const InterfaceAttrExtension &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_InterfaceAttrExtension_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_InterfaceAttrExtension_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -10123,10 +7832,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -10141,35 +7850,35 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_InterfaceAttrExtension_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_InterfaceAttrExtension_Remote_Proxy_Impl
     : public virtual _TAO_InterfaceAttrExtension_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_InterfaceAttrExtension_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_InterfaceAttrExtension_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -10177,10 +7886,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute (
         CORBA::Object *_collocated_tao_target_,
         const char * id,
@@ -10196,23 +7905,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_InterfaceAttrExtension_Proxy_Broker
   {
   public:
@@ -10221,152 +7930,115 @@ TAO_NAMESPACE  CORBA
         InterfaceAttrExtension *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_InterfaceAttrExtension_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_InterfaceAttrExtension_Remote_Proxy_Broker
     : public virtual _TAO_InterfaceAttrExtension_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_InterfaceAttrExtension_Proxy_Impl &select_proxy (
         InterfaceAttrExtension *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_InterfaceAttrExtension_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_InterfaceAttrExtension_Remote_Proxy_Broker *the_TAO_InterfaceAttrExtension_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InterfaceAttrExtension;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_EXTINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTINTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_EXTINTERFACEDEF___PTR_CH_)
-#define _CORBA_EXTINTERFACEDEF___PTR_CH_
-  
   class ExtInterfaceDef;
   typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
+  struct tao_ExtInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExtInterfaceDef,
+        tao_ExtInterfaceDef_life
+      >
+    ExtInterfaceDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ExtInterfaceDef,
+        tao_ExtInterfaceDef_life
+      >
+    ExtInterfaceDef_out;
 
-#if !defined (_CORBA_EXTINTERFACEDEF___VAR_CH_)
-#define _CORBA_EXTINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtInterfaceDef_var : public TAO_Base_var
-  {
-  public:
-    ExtInterfaceDef_var (void); // default constructor
-    ExtInterfaceDef_var (ExtInterfaceDef_ptr p) : ptr_ (p) {} 
-    ExtInterfaceDef_var (const ExtInterfaceDef_var &); // copy constructor
-    ~ExtInterfaceDef_var (void); // destructor
-    
-    ExtInterfaceDef_var &operator= (ExtInterfaceDef_ptr);
-    ExtInterfaceDef_var &operator= (const ExtInterfaceDef_var &);
-    ExtInterfaceDef_ptr operator-> (void) const;
-    
-    operator const ExtInterfaceDef_ptr &() const;
-    operator ExtInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    ExtInterfaceDef_ptr in (void) const;
-    ExtInterfaceDef_ptr &inout (void);
-    ExtInterfaceDef_ptr &out (void);
-    ExtInterfaceDef_ptr _retn (void);
-    ExtInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_ExtInterfaceDef_life
+  {
     static ExtInterfaceDef_ptr tao_duplicate (ExtInterfaceDef_ptr);
     static void tao_release (ExtInterfaceDef_ptr);
     static ExtInterfaceDef_ptr tao_nil (void);
-    static ExtInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtInterfaceDef_var (const TAO_Base_var &rhs);
-    ExtInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTINTERFACEDEF___OUT_CH_)
-#define _CORBA_EXTINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtInterfaceDef_out
-  {
-  public:
-    ExtInterfaceDef_out (ExtInterfaceDef_ptr &);
-    ExtInterfaceDef_out (ExtInterfaceDef_var &);
-    ExtInterfaceDef_out (const ExtInterfaceDef_out &);
-    ExtInterfaceDef_out &operator= (const ExtInterfaceDef_out &);
-    ExtInterfaceDef_out &operator= (const ExtInterfaceDef_var &);
-    ExtInterfaceDef_out &operator= (ExtInterfaceDef_ptr);
-    operator ExtInterfaceDef_ptr &();
-    ExtInterfaceDef_ptr &ptr (void);
-    ExtInterfaceDef_ptr operator-> (void);
-  
-  private:
-    ExtInterfaceDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_ExtInterfaceDef_cast
+  {
+    static ExtInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTINTERFACEDEF_CH_)
 #define _CORBA_EXTINTERFACEDEF_CH_
-  
+
   class _TAO_ExtInterfaceDef_Proxy_Impl;
   class _TAO_ExtInterfaceDef_Remote_Proxy_Impl;
   class _TAO_ExtInterfaceDef_Proxy_Broker;
   class _TAO_ExtInterfaceDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ExtInterfaceDef
     : public virtual CORBA::InterfaceDef,
       public virtual CORBA::InterfaceAttrExtension
@@ -10375,100 +8047,100 @@ TAO_NAMESPACE  CORBA
     typedef ExtInterfaceDef_ptr _ptr_type;
     typedef ExtInterfaceDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ExtInterfaceDef_ptr _duplicate (ExtInterfaceDef_ptr obj);
-    
+
     static ExtInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtInterfaceDef_ptr _nil (void)
       {
         return (ExtInterfaceDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ExtInterfaceDef_Proxy_Broker *the_TAO_ExtInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     ExtInterfaceDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtInterfaceDef_setup_collocation (int collocated);
-    
+
     ExtInterfaceDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ExtInterfaceDef (void);
-    
+
     friend class _TAO_ExtInterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_ExtInterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ExtInterfaceDef_Direct_Proxy_Impl;
-  
+
   private:
     ExtInterfaceDef (const ExtInterfaceDef &);
     void operator= (const ExtInterfaceDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExtInterfaceDef_Proxy_Impl
-    : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl, 
+    : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl,
       public virtual CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl
   {
   public:
     virtual ~_TAO_ExtInterfaceDef_Proxy_Impl (void) {}
-  
+
   protected:
     _TAO_ExtInterfaceDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_ExtInterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_ExtInterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -10477,26 +8149,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ExtInterfaceDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ExtInterfaceDef_Remote_Proxy_Impl (void) {}
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExtInterfaceDef_Proxy_Broker
   {
   public:
@@ -10505,152 +8177,115 @@ TAO_NAMESPACE  CORBA
         ExtInterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ExtInterfaceDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_ExtInterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_ExtInterfaceDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ExtInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ExtInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ExtInterfaceDef_Proxy_Impl &select_proxy (
         ExtInterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ExtInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ExtInterfaceDef_Remote_Proxy_Broker *the_TAO_ExtInterfaceDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtInterfaceDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
-  
   class AbstractInterfaceDef;
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
+  struct tao_AbstractInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        AbstractInterfaceDef,
+        tao_AbstractInterfaceDef_life
+      >
+    AbstractInterfaceDef_var;
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDef_var : public TAO_Base_var
-  {
-  public:
-    AbstractInterfaceDef_var (void); // default constructor
-    AbstractInterfaceDef_var (AbstractInterfaceDef_ptr p) : ptr_ (p) {} 
-    AbstractInterfaceDef_var (const AbstractInterfaceDef_var &); // copy constructor
-    ~AbstractInterfaceDef_var (void); // destructor
-    
-    AbstractInterfaceDef_var &operator= (AbstractInterfaceDef_ptr);
-    AbstractInterfaceDef_var &operator= (const AbstractInterfaceDef_var &);
-    AbstractInterfaceDef_ptr operator-> (void) const;
-    
-    operator const AbstractInterfaceDef_ptr &() const;
-    operator AbstractInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    AbstractInterfaceDef_ptr in (void) const;
-    AbstractInterfaceDef_ptr &inout (void);
-    AbstractInterfaceDef_ptr &out (void);
-    AbstractInterfaceDef_ptr _retn (void);
-    AbstractInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  typedef
+    TAO_Objref_Out_T<
+        AbstractInterfaceDef,
+        tao_AbstractInterfaceDef_life
+      >
+    AbstractInterfaceDef_out;
+
+  struct TAO_IFR_Client_Export tao_AbstractInterfaceDef_life
+  {
     static AbstractInterfaceDef_ptr tao_duplicate (AbstractInterfaceDef_ptr);
     static void tao_release (AbstractInterfaceDef_ptr);
     static AbstractInterfaceDef_ptr tao_nil (void);
-    static AbstractInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        AbstractInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    AbstractInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    AbstractInterfaceDef_var (const TAO_Base_var &rhs);
-    AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export AbstractInterfaceDef_out
-  {
-  public:
-    AbstractInterfaceDef_out (AbstractInterfaceDef_ptr &);
-    AbstractInterfaceDef_out (AbstractInterfaceDef_var &);
-    AbstractInterfaceDef_out (const AbstractInterfaceDef_out &);
-    AbstractInterfaceDef_out &operator= (const AbstractInterfaceDef_out &);
-    AbstractInterfaceDef_out &operator= (const AbstractInterfaceDef_var &);
-    AbstractInterfaceDef_out &operator= (AbstractInterfaceDef_ptr);
-    operator AbstractInterfaceDef_ptr &();
-    AbstractInterfaceDef_ptr &ptr (void);
-    AbstractInterfaceDef_ptr operator-> (void);
-  
-  private:
-    AbstractInterfaceDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_AbstractInterfaceDef_cast
+  {
+    static AbstractInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF_CH_
-  
+
   class _TAO_AbstractInterfaceDef_Proxy_Impl;
   class _TAO_AbstractInterfaceDef_Remote_Proxy_Impl;
   class _TAO_AbstractInterfaceDef_Proxy_Broker;
   class _TAO_AbstractInterfaceDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export AbstractInterfaceDef
     : public virtual CORBA::InterfaceDef
   {
@@ -10658,99 +8293,99 @@ TAO_NAMESPACE  CORBA
     typedef AbstractInterfaceDef_ptr _ptr_type;
     typedef AbstractInterfaceDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static AbstractInterfaceDef_ptr _duplicate (AbstractInterfaceDef_ptr obj);
-    
+
     static AbstractInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AbstractInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AbstractInterfaceDef_ptr _nil (void)
       {
         return (AbstractInterfaceDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_AbstractInterfaceDef_Proxy_Broker *the_TAO_AbstractInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     AbstractInterfaceDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_AbstractInterfaceDef_setup_collocation (int collocated);
-    
+
     AbstractInterfaceDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~AbstractInterfaceDef (void);
-    
+
     friend class _TAO_AbstractInterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_AbstractInterfaceDef_Direct_Proxy_Impl;
-  
+
   private:
     AbstractInterfaceDef (const AbstractInterfaceDef &);
     void operator= (const AbstractInterfaceDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Proxy_Impl
     : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_AbstractInterfaceDef_Proxy_Impl (void) {}
-  
+
   protected:
     _TAO_AbstractInterfaceDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_AbstractInterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -10758,26 +8393,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_AbstractInterfaceDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_AbstractInterfaceDef_Remote_Proxy_Impl (void) {}
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Proxy_Broker
   {
   public:
@@ -10786,152 +8421,115 @@ TAO_NAMESPACE  CORBA
         AbstractInterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_AbstractInterfaceDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_AbstractInterfaceDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_AbstractInterfaceDef_Proxy_Impl &select_proxy (
         AbstractInterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_AbstractInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_AbstractInterfaceDef_Remote_Proxy_Broker *the_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AbstractInterfaceDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___PTR_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF___PTR_CH_
-  
   class ExtAbstractInterfaceDef;
   typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
+  struct tao_ExtAbstractInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExtAbstractInterfaceDef,
+        tao_ExtAbstractInterfaceDef_life
+      >
+    ExtAbstractInterfaceDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ExtAbstractInterfaceDef,
+        tao_ExtAbstractInterfaceDef_life
+      >
+    ExtAbstractInterfaceDef_out;
 
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___VAR_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDef_var : public TAO_Base_var
-  {
-  public:
-    ExtAbstractInterfaceDef_var (void); // default constructor
-    ExtAbstractInterfaceDef_var (ExtAbstractInterfaceDef_ptr p) : ptr_ (p) {} 
-    ExtAbstractInterfaceDef_var (const ExtAbstractInterfaceDef_var &); // copy constructor
-    ~ExtAbstractInterfaceDef_var (void); // destructor
-    
-    ExtAbstractInterfaceDef_var &operator= (ExtAbstractInterfaceDef_ptr);
-    ExtAbstractInterfaceDef_var &operator= (const ExtAbstractInterfaceDef_var &);
-    ExtAbstractInterfaceDef_ptr operator-> (void) const;
-    
-    operator const ExtAbstractInterfaceDef_ptr &() const;
-    operator ExtAbstractInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    ExtAbstractInterfaceDef_ptr in (void) const;
-    ExtAbstractInterfaceDef_ptr &inout (void);
-    ExtAbstractInterfaceDef_ptr &out (void);
-    ExtAbstractInterfaceDef_ptr _retn (void);
-    ExtAbstractInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_ExtAbstractInterfaceDef_life
+  {
     static ExtAbstractInterfaceDef_ptr tao_duplicate (ExtAbstractInterfaceDef_ptr);
     static void tao_release (ExtAbstractInterfaceDef_ptr);
     static ExtAbstractInterfaceDef_ptr tao_nil (void);
-    static ExtAbstractInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtAbstractInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtAbstractInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtAbstractInterfaceDef_var (const TAO_Base_var &rhs);
-    ExtAbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF___OUT_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtAbstractInterfaceDef_out
-  {
-  public:
-    ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_ptr &);
-    ExtAbstractInterfaceDef_out (ExtAbstractInterfaceDef_var &);
-    ExtAbstractInterfaceDef_out (const ExtAbstractInterfaceDef_out &);
-    ExtAbstractInterfaceDef_out &operator= (const ExtAbstractInterfaceDef_out &);
-    ExtAbstractInterfaceDef_out &operator= (const ExtAbstractInterfaceDef_var &);
-    ExtAbstractInterfaceDef_out &operator= (ExtAbstractInterfaceDef_ptr);
-    operator ExtAbstractInterfaceDef_ptr &();
-    ExtAbstractInterfaceDef_ptr &ptr (void);
-    ExtAbstractInterfaceDef_ptr operator-> (void);
-  
-  private:
-    ExtAbstractInterfaceDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_ExtAbstractInterfaceDef_cast
+  {
+    static ExtAbstractInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF_CH_
-  
+
   class _TAO_ExtAbstractInterfaceDef_Proxy_Impl;
   class _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl;
   class _TAO_ExtAbstractInterfaceDef_Proxy_Broker;
   class _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ExtAbstractInterfaceDef
     : public virtual CORBA::AbstractInterfaceDef,
       public virtual CORBA::InterfaceAttrExtension
@@ -10940,100 +8538,100 @@ TAO_NAMESPACE  CORBA
     typedef ExtAbstractInterfaceDef_ptr _ptr_type;
     typedef ExtAbstractInterfaceDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ExtAbstractInterfaceDef_ptr _duplicate (ExtAbstractInterfaceDef_ptr obj);
-    
+
     static ExtAbstractInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtAbstractInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtAbstractInterfaceDef_ptr _nil (void)
       {
         return (ExtAbstractInterfaceDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ExtAbstractInterfaceDef_Proxy_Broker *the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     ExtAbstractInterfaceDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtAbstractInterfaceDef_setup_collocation (int collocated);
-    
+
     ExtAbstractInterfaceDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ExtAbstractInterfaceDef (void);
-    
+
     friend class _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_ExtAbstractInterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ExtAbstractInterfaceDef_Direct_Proxy_Impl;
-  
+
   private:
     ExtAbstractInterfaceDef (const ExtAbstractInterfaceDef &);
     void operator= (const ExtAbstractInterfaceDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExtAbstractInterfaceDef_Proxy_Impl
-    : public virtual CORBA::_TAO_AbstractInterfaceDef_Proxy_Impl, 
+    : public virtual CORBA::_TAO_AbstractInterfaceDef_Proxy_Impl,
       public virtual CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl
   {
   public:
     virtual ~_TAO_ExtAbstractInterfaceDef_Proxy_Impl (void) {}
-  
+
   protected:
     _TAO_ExtAbstractInterfaceDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_ExtAbstractInterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -11042,26 +8640,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl (void) {}
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExtAbstractInterfaceDef_Proxy_Broker
   {
   public:
@@ -11070,152 +8668,115 @@ TAO_NAMESPACE  CORBA
         ExtAbstractInterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ExtAbstractInterfaceDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_ExtAbstractInterfaceDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ExtAbstractInterfaceDef_Proxy_Impl &select_proxy (
         ExtAbstractInterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker *the_TAO_ExtAbstractInterfaceDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtAbstractInterfaceDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_LOCALINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_LOCALINTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
-#define _CORBA_LOCALINTERFACEDEF___PTR_CH_
-  
   class LocalInterfaceDef;
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
+  struct tao_LocalInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        LocalInterfaceDef,
+        tao_LocalInterfaceDef_life
+      >
+    LocalInterfaceDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        LocalInterfaceDef,
+        tao_LocalInterfaceDef_life
+      >
+    LocalInterfaceDef_out;
 
-#if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
-#define _CORBA_LOCALINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export LocalInterfaceDef_var : public TAO_Base_var
-  {
-  public:
-    LocalInterfaceDef_var (void); // default constructor
-    LocalInterfaceDef_var (LocalInterfaceDef_ptr p) : ptr_ (p) {} 
-    LocalInterfaceDef_var (const LocalInterfaceDef_var &); // copy constructor
-    ~LocalInterfaceDef_var (void); // destructor
-    
-    LocalInterfaceDef_var &operator= (LocalInterfaceDef_ptr);
-    LocalInterfaceDef_var &operator= (const LocalInterfaceDef_var &);
-    LocalInterfaceDef_ptr operator-> (void) const;
-    
-    operator const LocalInterfaceDef_ptr &() const;
-    operator LocalInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    LocalInterfaceDef_ptr in (void) const;
-    LocalInterfaceDef_ptr &inout (void);
-    LocalInterfaceDef_ptr &out (void);
-    LocalInterfaceDef_ptr _retn (void);
-    LocalInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_LocalInterfaceDef_life
+  {
     static LocalInterfaceDef_ptr tao_duplicate (LocalInterfaceDef_ptr);
     static void tao_release (LocalInterfaceDef_ptr);
     static LocalInterfaceDef_ptr tao_nil (void);
-    static LocalInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        LocalInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    LocalInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    LocalInterfaceDef_var (const TAO_Base_var &rhs);
-    LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
-#define _CORBA_LOCALINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export LocalInterfaceDef_out
-  {
-  public:
-    LocalInterfaceDef_out (LocalInterfaceDef_ptr &);
-    LocalInterfaceDef_out (LocalInterfaceDef_var &);
-    LocalInterfaceDef_out (const LocalInterfaceDef_out &);
-    LocalInterfaceDef_out &operator= (const LocalInterfaceDef_out &);
-    LocalInterfaceDef_out &operator= (const LocalInterfaceDef_var &);
-    LocalInterfaceDef_out &operator= (LocalInterfaceDef_ptr);
-    operator LocalInterfaceDef_ptr &();
-    LocalInterfaceDef_ptr &ptr (void);
-    LocalInterfaceDef_ptr operator-> (void);
-  
-  private:
-    LocalInterfaceDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_LocalInterfaceDef_cast
+  {
+    static LocalInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_LOCALINTERFACEDEF_CH_)
 #define _CORBA_LOCALINTERFACEDEF_CH_
-  
+
   class _TAO_LocalInterfaceDef_Proxy_Impl;
   class _TAO_LocalInterfaceDef_Remote_Proxy_Impl;
   class _TAO_LocalInterfaceDef_Proxy_Broker;
   class _TAO_LocalInterfaceDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export LocalInterfaceDef
     : public virtual CORBA::InterfaceDef
   {
@@ -11223,99 +8784,99 @@ TAO_NAMESPACE  CORBA
     typedef LocalInterfaceDef_ptr _ptr_type;
     typedef LocalInterfaceDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static LocalInterfaceDef_ptr _duplicate (LocalInterfaceDef_ptr obj);
-    
+
     static LocalInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static LocalInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static LocalInterfaceDef_ptr _nil (void)
       {
         return (LocalInterfaceDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_LocalInterfaceDef_Proxy_Broker *the_TAO_LocalInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     LocalInterfaceDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_LocalInterfaceDef_setup_collocation (int collocated);
-    
+
     LocalInterfaceDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~LocalInterfaceDef (void);
-    
+
     friend class _TAO_LocalInterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_LocalInterfaceDef_Direct_Proxy_Impl;
-  
+
   private:
     LocalInterfaceDef (const LocalInterfaceDef &);
     void operator= (const LocalInterfaceDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Proxy_Impl
     : public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl
   {
   public:
     virtual ~_TAO_LocalInterfaceDef_Proxy_Impl (void) {}
-  
+
   protected:
     _TAO_LocalInterfaceDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_LocalInterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -11323,26 +8884,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_LocalInterfaceDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_LocalInterfaceDef_Remote_Proxy_Impl (void) {}
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Proxy_Broker
   {
   public:
@@ -11351,152 +8912,115 @@ TAO_NAMESPACE  CORBA
         LocalInterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_LocalInterfaceDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_LocalInterfaceDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_LocalInterfaceDef_Proxy_Impl &select_proxy (
         LocalInterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_LocalInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_LocalInterfaceDef_Remote_Proxy_Broker *the_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LocalInterfaceDef;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTLOCALINTERFACEDEF__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF___PTR_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF___PTR_CH_
-  
   class ExtLocalInterfaceDef;
   typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
+  struct tao_ExtLocalInterfaceDef_life;
 
-#endif /* end #if !defined */
+  typedef
+    TAO_Objref_Var_T<
+        ExtLocalInterfaceDef,
+        tao_ExtLocalInterfaceDef_life
+      >
+    ExtLocalInterfaceDef_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ExtLocalInterfaceDef,
+        tao_ExtLocalInterfaceDef_life
+      >
+    ExtLocalInterfaceDef_out;
 
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF___VAR_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDef_var : public TAO_Base_var
-  {
-  public:
-    ExtLocalInterfaceDef_var (void); // default constructor
-    ExtLocalInterfaceDef_var (ExtLocalInterfaceDef_ptr p) : ptr_ (p) {} 
-    ExtLocalInterfaceDef_var (const ExtLocalInterfaceDef_var &); // copy constructor
-    ~ExtLocalInterfaceDef_var (void); // destructor
-    
-    ExtLocalInterfaceDef_var &operator= (ExtLocalInterfaceDef_ptr);
-    ExtLocalInterfaceDef_var &operator= (const ExtLocalInterfaceDef_var &);
-    ExtLocalInterfaceDef_ptr operator-> (void) const;
-    
-    operator const ExtLocalInterfaceDef_ptr &() const;
-    operator ExtLocalInterfaceDef_ptr &();
-    // in, inout, out, _retn 
-    ExtLocalInterfaceDef_ptr in (void) const;
-    ExtLocalInterfaceDef_ptr &inout (void);
-    ExtLocalInterfaceDef_ptr &out (void);
-    ExtLocalInterfaceDef_ptr _retn (void);
-    ExtLocalInterfaceDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
+  struct TAO_IFR_Client_Export tao_ExtLocalInterfaceDef_life
+  {
     static ExtLocalInterfaceDef_ptr tao_duplicate (ExtLocalInterfaceDef_ptr);
     static void tao_release (ExtLocalInterfaceDef_ptr);
     static ExtLocalInterfaceDef_ptr tao_nil (void);
-    static ExtLocalInterfaceDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtLocalInterfaceDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtLocalInterfaceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtLocalInterfaceDef_var (const TAO_Base_var &rhs);
-    ExtLocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF___OUT_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtLocalInterfaceDef_out
-  {
-  public:
-    ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_ptr &);
-    ExtLocalInterfaceDef_out (ExtLocalInterfaceDef_var &);
-    ExtLocalInterfaceDef_out (const ExtLocalInterfaceDef_out &);
-    ExtLocalInterfaceDef_out &operator= (const ExtLocalInterfaceDef_out &);
-    ExtLocalInterfaceDef_out &operator= (const ExtLocalInterfaceDef_var &);
-    ExtLocalInterfaceDef_out &operator= (ExtLocalInterfaceDef_ptr);
-    operator ExtLocalInterfaceDef_ptr &();
-    ExtLocalInterfaceDef_ptr &ptr (void);
-    ExtLocalInterfaceDef_ptr operator-> (void);
-  
-  private:
-    ExtLocalInterfaceDef_ptr &ptr_;
+  struct TAO_IFR_Client_Export tao_ExtLocalInterfaceDef_cast
+  {
+    static ExtLocalInterfaceDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF_CH_
-  
+
   class _TAO_ExtLocalInterfaceDef_Proxy_Impl;
   class _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl;
   class _TAO_ExtLocalInterfaceDef_Proxy_Broker;
   class _TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ExtLocalInterfaceDef
     : public virtual CORBA::LocalInterfaceDef,
       public virtual CORBA::InterfaceAttrExtension
@@ -11505,100 +9029,100 @@ TAO_NAMESPACE  CORBA
     typedef ExtLocalInterfaceDef_ptr _ptr_type;
     typedef ExtLocalInterfaceDef_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ExtLocalInterfaceDef_ptr _duplicate (ExtLocalInterfaceDef_ptr obj);
-    
+
     static ExtLocalInterfaceDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtLocalInterfaceDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ExtLocalInterfaceDef_ptr _nil (void)
       {
         return (ExtLocalInterfaceDef_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ExtLocalInterfaceDef_Proxy_Broker *the_TAO_ExtLocalInterfaceDef_Proxy_Broker_;
-  
+
   protected:
     ExtLocalInterfaceDef (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ExtLocalInterfaceDef_setup_collocation (int collocated);
-    
+
     ExtLocalInterfaceDef (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ExtLocalInterfaceDef (void);
-    
+
     friend class _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl;
     friend class _TAO_ExtLocalInterfaceDef_ThruPOA_Proxy_Impl;
     friend class _TAO_ExtLocalInterfaceDef_Direct_Proxy_Impl;
-  
+
   private:
     ExtLocalInterfaceDef (const ExtLocalInterfaceDef &);
     void operator= (const ExtLocalInterfaceDef &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExtLocalInterfaceDef_Proxy_Impl
-    : public virtual CORBA::_TAO_LocalInterfaceDef_Proxy_Impl, 
+    : public virtual CORBA::_TAO_LocalInterfaceDef_Proxy_Impl,
       public virtual CORBA::_TAO_InterfaceAttrExtension_Proxy_Impl
   {
   public:
     virtual ~_TAO_ExtLocalInterfaceDef_Proxy_Impl (void) {}
-  
+
   protected:
     _TAO_ExtLocalInterfaceDef_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl
     : public virtual _TAO_ExtLocalInterfaceDef_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -11607,26 +9131,26 @@ TAO_NAMESPACE  CORBA
   {
   public:
     _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl (void) {}
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_IFR_Client_Export _TAO_ExtLocalInterfaceDef_Proxy_Broker
   {
   public:
@@ -11635,56 +9159,56 @@ TAO_NAMESPACE  CORBA
         ExtLocalInterfaceDef *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ExtLocalInterfaceDef_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_IFR_Client_Export _TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker
     : public virtual _TAO_ExtLocalInterfaceDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ExtLocalInterfaceDef_Proxy_Impl &select_proxy (
         ExtLocalInterfaceDef *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ExtLocalInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker *the_TAO_ExtLocalInterfaceDef_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtLocalInterfaceDef;
 
 // TAO_IDL - Generated from
@@ -11843,50 +9367,6 @@ CORBA::_TAO_ExtLocalInterfaceDef_Proxy_Broker *
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:103
-
-// External declarations for undefined interface
-
-// CORBA::FixedDef
-TAO_IFR_Client_Export
-CORBA::FixedDef_ptr
-tao_CORBA_FixedDef_duplicate (
-    CORBA::FixedDef_ptr
-  );
-
-TAO_IFR_Client_Export
-void
-tao_CORBA_FixedDef_release (
-    CORBA::FixedDef_ptr
-  );
-
-TAO_IFR_Client_Export
-CORBA::FixedDef_ptr
-tao_CORBA_FixedDef_nil (
-    void
-  );
-
-TAO_IFR_Client_Export
-CORBA::FixedDef_ptr
-tao_CORBA_FixedDef_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_IFR_Client_Export
-CORBA::Object *
-tao_CORBA_FixedDef_upcast (
-    void *
-  );
-
-TAO_IFR_Client_Export
-CORBA::Boolean
-tao_CORBA_FixedDef_marshal (
-    CORBA::FixedDef_ptr,
-    TAO_OutputCDR &
-  );
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr); // copying
@@ -12560,7 +10040,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocal
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BasicC.i"
@@ -12576,5 +10056,3 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocal
 
 #include "ace/post.h"
 #endif /* ifndef */
-
-
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.i b/TAO/tao/IFR_Client/IFR_BasicC.i
index 61c9a836caf..4b429a2408e 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.i
+++ b/TAO/tao/IFR_Client/IFR_BasicC.i
@@ -37,13 +37,6 @@ CORBA::Repository::Repository (
   this->CORBA_Repository_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::Repository::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -74,13 +67,6 @@ CORBA::ModuleDef::ModuleDef (
   this->CORBA_ModuleDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ModuleDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -95,217 +81,6 @@ TAO::Any_Impl_T<CORBA::ModuleDef>::to_object (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ModuleDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ModuleDescription_var::ModuleDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::ModuleDescription_var (ModuleDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::ModuleDescription_var (const ::CORBA::ModuleDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ModuleDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::~ModuleDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_var &
-CORBA::ModuleDescription_var::operator= (ModuleDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ModuleDescription_var &
-CORBA::ModuleDescription_var::operator= (const ::CORBA::ModuleDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ModuleDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ModuleDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ModuleDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ModuleDescription *
-CORBA::ModuleDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ModuleDescription *
-CORBA::ModuleDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::operator const ::CORBA::ModuleDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ModuleDescription_var::operator ::CORBA::ModuleDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ModuleDescription &
-CORBA::ModuleDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ModuleDescription &
-CORBA::ModuleDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ModuleDescription *&
-CORBA::ModuleDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ModuleDescription *
-CORBA::ModuleDescription_var::_retn (void)
-{
-  ::CORBA::ModuleDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ModuleDescription *
-CORBA::ModuleDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ModuleDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ModuleDescription_out::ModuleDescription_out (::CORBA::ModuleDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_out::ModuleDescription_out (ModuleDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_out::ModuleDescription_out (const ::CORBA::ModuleDescription_out &p)
-  : ptr_ (ACE_const_cast (ModuleDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ModuleDescription_out &
-CORBA::ModuleDescription_out::operator= (const ::CORBA::ModuleDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ModuleDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ModuleDescription_out &
-CORBA::ModuleDescription_out::operator= (ModuleDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ModuleDescription_out::operator ::CORBA::ModuleDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ModuleDescription *&
-CORBA::ModuleDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ModuleDescription *
-CORBA::ModuleDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_CONSTANTDEF___CI_)
@@ -322,13 +97,6 @@ CORBA::ConstantDef::ConstantDef (
   this->CORBA_ConstantDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ConstantDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -343,217 +111,6 @@ TAO::Any_Impl_T<CORBA::ConstantDef>::to_object (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ConstantDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ConstantDescription_var::ConstantDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::ConstantDescription_var (ConstantDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::ConstantDescription_var (const ::CORBA::ConstantDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ConstantDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::~ConstantDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_var &
-CORBA::ConstantDescription_var::operator= (ConstantDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ConstantDescription_var &
-CORBA::ConstantDescription_var::operator= (const ::CORBA::ConstantDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ConstantDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ConstantDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ConstantDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ConstantDescription *
-CORBA::ConstantDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ConstantDescription *
-CORBA::ConstantDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::operator const ::CORBA::ConstantDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ConstantDescription_var::operator ::CORBA::ConstantDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ConstantDescription &
-CORBA::ConstantDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ConstantDescription &
-CORBA::ConstantDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ConstantDescription *&
-CORBA::ConstantDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ConstantDescription *
-CORBA::ConstantDescription_var::_retn (void)
-{
-  ::CORBA::ConstantDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ConstantDescription *
-CORBA::ConstantDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ConstantDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ConstantDescription_out::ConstantDescription_out (::CORBA::ConstantDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_out::ConstantDescription_out (ConstantDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_out::ConstantDescription_out (const ::CORBA::ConstantDescription_out &p)
-  : ptr_ (ACE_const_cast (ConstantDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ConstantDescription_out &
-CORBA::ConstantDescription_out::operator= (const ::CORBA::ConstantDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ConstantDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ConstantDescription_out &
-CORBA::ConstantDescription_out::operator= (ConstantDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ConstantDescription_out::operator ::CORBA::ConstantDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ConstantDescription *&
-CORBA::ConstantDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ConstantDescription *
-CORBA::ConstantDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_STRUCTDEF___CI_)
@@ -570,13 +127,6 @@ CORBA::StructDef::StructDef (
   this->CORBA_StructDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::StructDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -607,13 +157,6 @@ CORBA::UnionDef::UnionDef (
   this->CORBA_UnionDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::UnionDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -644,13 +187,6 @@ CORBA::EnumDef::EnumDef (
   this->CORBA_EnumDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::EnumDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -681,13 +217,6 @@ CORBA::AliasDef::AliasDef (
   this->CORBA_AliasDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::AliasDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -718,13 +247,6 @@ CORBA::NativeDef::NativeDef (
   this->CORBA_NativeDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::NativeDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -755,13 +277,6 @@ CORBA::PrimitiveDef::PrimitiveDef (
   this->CORBA_PrimitiveDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -792,13 +307,6 @@ CORBA::StringDef::StringDef (
   this->CORBA_StringDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::StringDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -829,13 +337,6 @@ CORBA::WstringDef::WstringDef (
   this->CORBA_WstringDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::WstringDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -866,13 +367,6 @@ CORBA::SequenceDef::SequenceDef (
   this->CORBA_SequenceDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -903,13 +397,6 @@ CORBA::ArrayDef::ArrayDef (
   this->CORBA_ArrayDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -940,13 +427,6 @@ CORBA::ExceptionDef::ExceptionDef (
   this->CORBA_ExceptionDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ExceptionDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -960,438 +440,6 @@ TAO::Any_Impl_T<CORBA::ExceptionDef>::to_object (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:107
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CI_
-
-ACE_INLINE
-CORBA::ExceptionDef **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::ExceptionDef **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::ExceptionDef*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::ExceptionDef::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (CORBA::ExceptionDef **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExceptionDef* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq(
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExceptionDef **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (this->maximum_);
-      CORBA::ExceptionDef ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::ExceptionDef::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::ExceptionDef **tmp =
-        ACE_reinterpret_cast (CORBA::ExceptionDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = CORBA::ExceptionDef::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ExceptionDef **tmp1 =
-    ACE_reinterpret_cast (CORBA::ExceptionDef **, this->buffer_);
-  
-  CORBA::ExceptionDef ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::ExceptionDef::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::ExceptionDef ** const tmp =
-    ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::ExceptionDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExceptionDef **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ExceptionDef**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ExceptionDef* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ_CI_)
-#define _CORBA_EXCEPTIONDEFSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::ExceptionDefSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::ExceptionDefSeq_var (ExceptionDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::ExceptionDefSeq_var (const ::CORBA::ExceptionDefSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExceptionDefSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::~ExceptionDefSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var &
-CORBA::ExceptionDefSeq_var::operator= (ExceptionDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq_var &
-CORBA::ExceptionDefSeq_var::operator= (const ::CORBA::ExceptionDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExceptionDefSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExceptionDefSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExceptionDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::operator const ::CORBA::ExceptionDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExceptionDefSeq_var::operator ::CORBA::ExceptionDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExceptionDef, CORBA::ExceptionDef_var>
-CORBA::ExceptionDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ExceptionDefSeq &
-CORBA::ExceptionDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq &
-CORBA::ExceptionDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq *&
-CORBA::ExceptionDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_var::_retn (void)
-{
-  ::CORBA::ExceptionDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ExceptionDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_out::ExceptionDefSeq_out (ExceptionDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_out::ExceptionDefSeq_out (ExceptionDefSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_out::ExceptionDefSeq_out (const ::CORBA::ExceptionDefSeq_out &p)
-  : ptr_ (ACE_const_cast (ExceptionDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq_out &
-CORBA::ExceptionDefSeq_out::operator= (const ::CORBA::ExceptionDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExceptionDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq_out &
-CORBA::ExceptionDefSeq_out::operator= (ExceptionDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExceptionDefSeq_out::operator ::CORBA::ExceptionDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq *&
-CORBA::ExceptionDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExceptionDefSeq *
-CORBA::ExceptionDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::ExceptionDef, CORBA::ExceptionDef_var>
-CORBA::ExceptionDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
@@ -1409,13 +457,6 @@ CORBA::AttributeDef::AttributeDef (
   this->CORBA_AttributeDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::AttributeDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1430,455 +471,26 @@ TAO::Any_Impl_T<CORBA::AttributeDef>::to_object (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::AttributeDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttributeDescription_var::AttributeDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::AttributeDescription_var (AttributeDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::AttributeDescription_var (const ::CORBA::AttributeDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::AttributeDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::~AttributeDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_var &
-CORBA::AttributeDescription_var::operator= (AttributeDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::AttributeDescription_var &
-CORBA::AttributeDescription_var::operator= (const ::CORBA::AttributeDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          AttributeDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              AttributeDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              AttributeDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::operator const ::CORBA::AttributeDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::AttributeDescription_var::operator ::CORBA::AttributeDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::AttributeDescription &
-CORBA::AttributeDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::AttributeDescription &
-CORBA::AttributeDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::AttributeDescription *&
-CORBA::AttributeDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::_retn (void)
-{
-  ::CORBA::AttributeDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::AttributeDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttributeDescription_out::AttributeDescription_out (::CORBA::AttributeDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_out::AttributeDescription_out (AttributeDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_out::AttributeDescription_out (const ::CORBA::AttributeDescription_out &p)
-  : ptr_ (ACE_const_cast (AttributeDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::AttributeDescription_out &
-CORBA::AttributeDescription_out::operator= (const ::CORBA::AttributeDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (AttributeDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription_out &
-CORBA::AttributeDescription_out::operator= (AttributeDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::AttributeDescription_out::operator ::CORBA::AttributeDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::AttributeDescription *&
-CORBA::AttributeDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::AttributeDescription *
-CORBA::AttributeDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ExtAttributeDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_var::ExtAttributeDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_var::ExtAttributeDescription_var (ExtAttributeDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_var::ExtAttributeDescription_var (const ::CORBA::ExtAttributeDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtAttributeDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_var::~ExtAttributeDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_var &
-CORBA::ExtAttributeDescription_var::operator= (ExtAttributeDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtAttributeDescription_var &
-CORBA::ExtAttributeDescription_var::operator= (const ::CORBA::ExtAttributeDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtAttributeDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtAttributeDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtAttributeDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ExtAttributeDescription *
-CORBA::ExtAttributeDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtAttributeDescription *
-CORBA::ExtAttributeDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_var::operator const ::CORBA::ExtAttributeDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_var::operator ::CORBA::ExtAttributeDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_var::operator ::CORBA::ExtAttributeDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtAttributeDescription_var::operator ::CORBA::ExtAttributeDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ExtAttributeDescription &
-CORBA::ExtAttributeDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtAttributeDescription &
-CORBA::ExtAttributeDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ExtAttributeDescription *&
-CORBA::ExtAttributeDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtAttributeDescription *
-CORBA::ExtAttributeDescription_var::_retn (void)
-{
-  ::CORBA::ExtAttributeDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ExtAttributeDescription *
-CORBA::ExtAttributeDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ExtAttributeDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_out::ExtAttributeDescription_out (::CORBA::ExtAttributeDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_out::ExtAttributeDescription_out (ExtAttributeDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_out::ExtAttributeDescription_out (const ::CORBA::ExtAttributeDescription_out &p)
-  : ptr_ (ACE_const_cast (ExtAttributeDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_out &
-CORBA::ExtAttributeDescription_out::operator= (const ::CORBA::ExtAttributeDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtAttributeDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription_out &
-CORBA::ExtAttributeDescription_out::operator= (ExtAttributeDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExtAttributeDescription_out::operator ::CORBA::ExtAttributeDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtAttributeDescription *&
-CORBA::ExtAttributeDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtAttributeDescription *
-CORBA::ExtAttributeDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF___CI_)
-#define _CORBA_EXTATTRIBUTEDEF___CI_
+#if !defined (_CORBA_OPERATIONDEF___CI_)
+#define _CORBA_OPERATIONDEF___CI_
 
 ACE_INLINE
-CORBA::ExtAttributeDef::ExtAttributeDef (
+CORBA::OperationDef::OperationDef (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
   : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->CORBA_ExtAttributeDef_setup_collocation (_tao_collocated);
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::ExtAttributeDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
+  this->CORBA_OperationDef_setup_collocation (_tao_collocated);
 }
 
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ExtAttributeDef>::to_object (
+TAO::Any_Impl_T<CORBA::OperationDef>::to_object (
     CORBA::Object_ptr &_tao_elem
   ) const
 {
@@ -1888,909 +500,18 @@ TAO::Any_Impl_T<CORBA::ExtAttributeDef>::to_object (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ParameterDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ParameterDescription_var::ParameterDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::ParameterDescription_var (ParameterDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::ParameterDescription_var (const ::CORBA::ParameterDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ParameterDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::~ParameterDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_var &
-CORBA::ParameterDescription_var::operator= (ParameterDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ParameterDescription_var &
-CORBA::ParameterDescription_var::operator= (const ::CORBA::ParameterDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ParameterDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ParameterDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ParameterDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ParameterDescription *
-CORBA::ParameterDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ParameterDescription *
-CORBA::ParameterDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::operator const ::CORBA::ParameterDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ParameterDescription_var::operator ::CORBA::ParameterDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ParameterDescription &
-CORBA::ParameterDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ParameterDescription &
-CORBA::ParameterDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ParameterDescription *&
-CORBA::ParameterDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ParameterDescription *
-CORBA::ParameterDescription_var::_retn (void)
-{
-  ::CORBA::ParameterDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ParameterDescription *
-CORBA::ParameterDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ParameterDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ParameterDescription_out::ParameterDescription_out (::CORBA::ParameterDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_out::ParameterDescription_out (ParameterDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_out::ParameterDescription_out (const ::CORBA::ParameterDescription_out &p)
-  : ptr_ (ACE_const_cast (ParameterDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ParameterDescription_out &
-CORBA::ParameterDescription_out::operator= (const ::CORBA::ParameterDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ParameterDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription_out &
-CORBA::ParameterDescription_out::operator= (ParameterDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ParameterDescription_out::operator ::CORBA::ParameterDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ParameterDescription *&
-CORBA::ParameterDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ParameterDescription *
-CORBA::ParameterDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::ParameterDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ParameterDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ParameterDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (CORBA::ParameterDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ParameterDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ParameterDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ParameterDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ParameterDescription *tmp =
-            ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ParameterDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
-  CORBA::ParameterDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ParameterDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ParameterDescription* tmp =
-    ACE_reinterpret_cast (CORBA::ParameterDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ParameterDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ParameterDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::ParameterDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ParameterDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ParameterDescription *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ParameterDescription*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ParameterDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ParameterDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ParameterDescription * ACE_CAST_CONST, this->buffer_);
-}
+#if !defined (_CORBA_INTERFACEDEF___CI_)
+#define _CORBA_INTERFACEDEF___CI_
 
 ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ParameterDescription *data,
-    CORBA::Boolean release
+CORBA::InterfaceDef::InterfaceDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ParameterDescription *tmp =
-        ACE_reinterpret_cast (CORBA::ParameterDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ_CI_)
-#define _CORBA_PARDESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ParDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::ParDescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::ParDescriptionSeq_var (ParDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::ParDescriptionSeq_var (const ::CORBA::ParDescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ParDescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::~ParDescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var &
-CORBA::ParDescriptionSeq_var::operator= (ParDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq_var &
-CORBA::ParDescriptionSeq_var::operator= (const ::CORBA::ParDescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ParDescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ParDescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ParDescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::operator const ::CORBA::ParDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ParDescriptionSeq_var::operator ::CORBA::ParDescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription &
-CORBA::ParDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ParameterDescription &
-CORBA::ParDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ParameterDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ParDescriptionSeq &
-CORBA::ParDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq &
-CORBA::ParDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq *&
-CORBA::ParDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_var::_retn (void)
-{
-  ::CORBA::ParDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ParDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_out::ParDescriptionSeq_out (ParDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_out::ParDescriptionSeq_out (ParDescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_out::ParDescriptionSeq_out (const ::CORBA::ParDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (ParDescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq_out &
-CORBA::ParDescriptionSeq_out::operator= (const ::CORBA::ParDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ParDescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq_out &
-CORBA::ParDescriptionSeq_out::operator= (ParDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ParDescriptionSeq_out::operator ::CORBA::ParDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq *&
-CORBA::ParDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ParDescriptionSeq *
-CORBA::ParDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ParameterDescription &
-CORBA::ParDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTEXTIDSEQ_CI_)
-#define _CORBA_CONTEXTIDSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ContextIdSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::ContextIdSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::ContextIdSeq_var (ContextIdSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::ContextIdSeq_var (const ::CORBA::ContextIdSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ContextIdSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::~ContextIdSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var &
-CORBA::ContextIdSeq_var::operator= (ContextIdSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq_var &
-CORBA::ContextIdSeq_var::operator= (const ::CORBA::ContextIdSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ContextIdSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ContextIdSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ContextIdSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::operator const ::CORBA::ContextIdSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ContextIdSeq_var::operator ::CORBA::ContextIdSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::ContextIdSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ContextIdSeq &
-CORBA::ContextIdSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq &
-CORBA::ContextIdSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq *&
-CORBA::ContextIdSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_var::_retn (void)
-{
-  ::CORBA::ContextIdSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ContextIdSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ContextIdSeq_out::ContextIdSeq_out (ContextIdSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_out::ContextIdSeq_out (ContextIdSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_out::ContextIdSeq_out (const ::CORBA::ContextIdSeq_out &p)
-  : ptr_ (ACE_const_cast (ContextIdSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ContextIdSeq_out &
-CORBA::ContextIdSeq_out::operator= (const ::CORBA::ContextIdSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ContextIdSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq_out &
-CORBA::ContextIdSeq_out::operator= (ContextIdSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ContextIdSeq_out::operator ::CORBA::ContextIdSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq *&
-CORBA::ContextIdSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ContextIdSeq *
-CORBA::ContextIdSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::ContextIdSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
+  this->CORBA_InterfaceDef_setup_collocation (_tao_collocated);
 }
 
 #endif /* end #if !defined */
@@ -2798,2073 +519,211 @@ CORBA::ContextIdSeq_out::operator[] (CORBA::ULong index)
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-#if !defined (_CORBA_OPERATIONDEF___CI_)
-#define _CORBA_OPERATIONDEF___CI_
+#if !defined (_CORBA_ALIASDEF___CI_)
+#define _CORBA_ALIASDEF___CI_
 
 ACE_INLINE
-CORBA::OperationDef::OperationDef (
+CORBA::AliasDef::AliasDef (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
   : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->CORBA_OperationDef_setup_collocation (_tao_collocated);
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::OperationDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::OperationDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  this->CORBA_AliasDef_setup_collocation (_tao_collocated);
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::OperationDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::OperationDescription_var::OperationDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::OperationDescription_var::OperationDescription_var (OperationDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::OperationDescription_var::OperationDescription_var (const ::CORBA::OperationDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::OperationDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::OperationDescription_var::~OperationDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_var &
-CORBA::OperationDescription_var::operator= (OperationDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::OperationDescription_var &
-CORBA::OperationDescription_var::operator= (const ::CORBA::OperationDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          OperationDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              OperationDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              OperationDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::OperationDescription *
-CORBA::OperationDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::OperationDescription *
-CORBA::OperationDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_var::operator const ::CORBA::OperationDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_var::operator ::CORBA::OperationDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_var::operator ::CORBA::OperationDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::OperationDescription_var::operator ::CORBA::OperationDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::OperationDescription &
-CORBA::OperationDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::OperationDescription &
-CORBA::OperationDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::OperationDescription *&
-CORBA::OperationDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::OperationDescription *
-CORBA::OperationDescription_var::_retn (void)
-{
-  ::CORBA::OperationDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::OperationDescription *
-CORBA::OperationDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::OperationDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::OperationDescription_out::OperationDescription_out (::CORBA::OperationDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_out::OperationDescription_out (OperationDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_out::OperationDescription_out (const ::CORBA::OperationDescription_out &p)
-  : ptr_ (ACE_const_cast (OperationDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::OperationDescription_out &
-CORBA::OperationDescription_out::operator= (const ::CORBA::OperationDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (OperationDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::OperationDescription_out &
-CORBA::OperationDescription_out::operator= (OperationDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::OperationDescription_out::operator ::CORBA::OperationDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::OperationDescription *&
-CORBA::OperationDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::OperationDescription *
-CORBA::OperationDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#if !defined (_CORBA_REPOSITORYIDSEQ_CI_)
-#define _CORBA_REPOSITORYIDSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::RepositoryIdSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::RepositoryIdSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::RepositoryIdSeq_var (RepositoryIdSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::RepositoryIdSeq_var (const ::CORBA::RepositoryIdSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::RepositoryIdSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::~RepositoryIdSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var &
-CORBA::RepositoryIdSeq_var::operator= (RepositoryIdSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq_var &
-CORBA::RepositoryIdSeq_var::operator= (const ::CORBA::RepositoryIdSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          RepositoryIdSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              RepositoryIdSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              RepositoryIdSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::operator const ::CORBA::RepositoryIdSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::RepositoryIdSeq_var::operator ::CORBA::RepositoryIdSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::RepositoryIdSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::RepositoryIdSeq &
-CORBA::RepositoryIdSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq &
-CORBA::RepositoryIdSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq *&
-CORBA::RepositoryIdSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_var::_retn (void)
-{
-  ::CORBA::RepositoryIdSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::RepositoryIdSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_out::RepositoryIdSeq_out (RepositoryIdSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_out::RepositoryIdSeq_out (RepositoryIdSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_out::RepositoryIdSeq_out (const ::CORBA::RepositoryIdSeq_out &p)
-  : ptr_ (ACE_const_cast (RepositoryIdSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq_out &
-CORBA::RepositoryIdSeq_out::operator= (const ::CORBA::RepositoryIdSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (RepositoryIdSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq_out &
-CORBA::RepositoryIdSeq_out::operator= (RepositoryIdSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::RepositoryIdSeq_out::operator ::CORBA::RepositoryIdSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq *&
-CORBA::RepositoryIdSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::RepositoryIdSeq *
-CORBA::RepositoryIdSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::RepositoryIdSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::OperationDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::OperationDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::OperationDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (CORBA::OperationDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::OperationDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::OperationDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::OperationDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::OperationDescription *tmp =
-            ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::OperationDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
-  CORBA::OperationDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::OperationDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::OperationDescription* tmp =
-    ACE_reinterpret_cast (CORBA::OperationDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::OperationDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::OperationDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::OperationDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::OperationDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::OperationDescription *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::OperationDescription*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::OperationDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-const CORBA::OperationDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::OperationDescription * ACE_CAST_CONST, this->buffer_);
-}
+#if !defined (_CORBA_NATIVEDEF___CI_)
+#define _CORBA_NATIVEDEF___CI_
 
 ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::OperationDescription *data,
-    CORBA::Boolean release
+CORBA::NativeDef::NativeDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::OperationDescription *tmp =
-        ACE_reinterpret_cast (CORBA::OperationDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
+  this->CORBA_NativeDef_setup_collocation (_tao_collocated);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CI_)
-#define _CORBA_OPDESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::OpDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::OpDescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::OpDescriptionSeq_var (OpDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::OpDescriptionSeq_var (const ::CORBA::OpDescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::OpDescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::~OpDescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var &
-CORBA::OpDescriptionSeq_var::operator= (OpDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq_var &
-CORBA::OpDescriptionSeq_var::operator= (const ::CORBA::OpDescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          OpDescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              OpDescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              OpDescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::operator const ::CORBA::OpDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::OpDescriptionSeq_var::operator ::CORBA::OpDescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OperationDescription &
-CORBA::OpDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::OperationDescription &
-CORBA::OpDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::OperationDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::OpDescriptionSeq &
-CORBA::OpDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq &
-CORBA::OpDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq *&
-CORBA::OpDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_var::_retn (void)
-{
-  ::CORBA::OpDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::OpDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_out::OpDescriptionSeq_out (OpDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_out::OpDescriptionSeq_out (OpDescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_out::OpDescriptionSeq_out (const ::CORBA::OpDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (OpDescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq_out &
-CORBA::OpDescriptionSeq_out::operator= (const ::CORBA::OpDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (OpDescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq_out &
-CORBA::OpDescriptionSeq_out::operator= (OpDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::OpDescriptionSeq_out::operator ::CORBA::OpDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OpDescriptionSeq *&
-CORBA::OpDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-::CORBA::OpDescriptionSeq *
-CORBA::OpDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_PRIMITIVEDEF___CI_)
+#define _CORBA_PRIMITIVEDEF___CI_
 
 ACE_INLINE
-CORBA::OperationDescription &
-CORBA::OpDescriptionSeq_out::operator[] (CORBA::ULong index)
+CORBA::PrimitiveDef::PrimitiveDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  return this->ptr_->operator[] (index);
+  this->CORBA_PrimitiveDef_setup_collocation (_tao_collocated);
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::AttributeDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::AttributeDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::AttributeDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (CORBA::AttributeDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::AttributeDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::AttributeDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::AttributeDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
+#if !defined (_CORBA_STRINGDEF___CI_)
+#define _CORBA_STRINGDEF___CI_
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq &rhs
+CORBA::StringDef::StringDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::AttributeDescription *tmp =
-            ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::AttributeDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
-  CORBA::AttributeDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::AttributeDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::AttributeDescription* tmp =
-    ACE_reinterpret_cast (CORBA::AttributeDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::AttributeDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::AttributeDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::AttributeDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
+  this->CORBA_StringDef_setup_collocation (_tao_collocated);
 }
 
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
+#endif /* end #if !defined */
 
-ACE_INLINE
-CORBA::AttributeDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::AttributeDescription *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::AttributeDescription*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::AttributeDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-const CORBA::AttributeDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::AttributeDescription * ACE_CAST_CONST, this->buffer_);
-}
+#if !defined (_CORBA_WSTRINGDEF___CI_)
+#define _CORBA_WSTRINGDEF___CI_
 
 ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::AttributeDescription *data,
-    CORBA::Boolean release
+CORBA::WstringDef::WstringDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::AttributeDescription *tmp =
-        ACE_reinterpret_cast (CORBA::AttributeDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
+  this->CORBA_WstringDef_setup_collocation (_tao_collocated);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CI_)
-#define _CORBA_ATTRDESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::AttrDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::AttrDescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::AttrDescriptionSeq_var (AttrDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::AttrDescriptionSeq_var (const ::CORBA::AttrDescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::AttrDescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::~AttrDescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var &
-CORBA::AttrDescriptionSeq_var::operator= (AttrDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq_var &
-CORBA::AttrDescriptionSeq_var::operator= (const ::CORBA::AttrDescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          AttrDescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              AttrDescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              AttrDescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::operator const ::CORBA::AttrDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::AttrDescriptionSeq_var::operator ::CORBA::AttrDescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::AttributeDescription &
-CORBA::AttrDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::AttributeDescription &
-CORBA::AttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::AttributeDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::AttrDescriptionSeq &
-CORBA::AttrDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq &
-CORBA::AttrDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq *&
-CORBA::AttrDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_var::_retn (void)
-{
-  ::CORBA::AttrDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::AttrDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_out::AttrDescriptionSeq_out (AttrDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_out::AttrDescriptionSeq_out (AttrDescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_out::AttrDescriptionSeq_out (const ::CORBA::AttrDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (AttrDescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq_out &
-CORBA::AttrDescriptionSeq_out::operator= (const ::CORBA::AttrDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (AttrDescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq_out &
-CORBA::AttrDescriptionSeq_out::operator= (AttrDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::AttrDescriptionSeq_out::operator ::CORBA::AttrDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::AttrDescriptionSeq *&
-CORBA::AttrDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-::CORBA::AttrDescriptionSeq *
-CORBA::AttrDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_SEQUENCEDEF___CI_)
+#define _CORBA_SEQUENCEDEF___CI_
 
 ACE_INLINE
-CORBA::AttributeDescription &
-CORBA::AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
+CORBA::SequenceDef::SequenceDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  return this->ptr_->operator[] (index);
+  this->CORBA_SequenceDef_setup_collocation (_tao_collocated);
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXTATTRDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::ExtAttributeDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ExtAttributeDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ExtAttributeDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (CORBA::ExtAttributeDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ExtAttributeDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ExtAttributeDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ExtAttributeDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ExtAttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
+#if !defined (_CORBA_ARRAYDEF___CI_)
+#define _CORBA_ARRAYDEF___CI_
 
 ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq &rhs
+CORBA::ArrayDef::ArrayDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ExtAttributeDescription *tmp =
-            ACE_reinterpret_cast (CORBA::ExtAttributeDescription *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ExtAttributeDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::ExtAttributeDescription *, this->buffer_);
-  CORBA::ExtAttributeDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ExtAttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ExtAttributeDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ExtAttributeDescription* tmp =
-    ACE_reinterpret_cast (CORBA::ExtAttributeDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ExtAttributeDescription &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ExtAttributeDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::ExtAttributeDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
+  this->CORBA_ArrayDef_setup_collocation (_tao_collocated);
 }
 
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
+#endif /* end #if !defined */
 
-ACE_INLINE
-CORBA::ExtAttributeDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ExtAttributeDescription *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ExtAttributeDescription*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ExtAttributeDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-const CORBA::ExtAttributeDescription *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ExtAttributeDescription * ACE_CAST_CONST, this->buffer_);
-}
+#if !defined (_CORBA_EXCEPTIONDEF___CI_)
+#define _CORBA_EXCEPTIONDEF___CI_
 
 ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ExtAttributeDescription *data,
-    CORBA::Boolean release
+CORBA::ExceptionDef::ExceptionDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
   )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ExtAttributeDescription *tmp =
-        ACE_reinterpret_cast (CORBA::ExtAttributeDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ExtAttrDescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
+  this->CORBA_ExceptionDef_setup_collocation (_tao_collocated);
 }
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CI_)
-#define _CORBA_EXTATTRDESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ExtAttrDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var::ExtAttrDescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var::ExtAttrDescriptionSeq_var (ExtAttrDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var::ExtAttrDescriptionSeq_var (const ::CORBA::ExtAttrDescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtAttrDescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var::~ExtAttrDescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var &
-CORBA::ExtAttrDescriptionSeq_var::operator= (ExtAttrDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq_var &
-CORBA::ExtAttrDescriptionSeq_var::operator= (const ::CORBA::ExtAttrDescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtAttrDescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtAttrDescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtAttrDescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ExtAttrDescriptionSeq *
-CORBA::ExtAttrDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq *
-CORBA::ExtAttrDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var::operator const ::CORBA::ExtAttrDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var::operator ::CORBA::ExtAttrDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var::operator ::CORBA::ExtAttrDescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_var::operator ::CORBA::ExtAttrDescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtAttributeDescription &
-CORBA::ExtAttrDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ExtAttributeDescription &
-CORBA::ExtAttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ExtAttributeDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ExtAttrDescriptionSeq &
-CORBA::ExtAttrDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq &
-CORBA::ExtAttrDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq *&
-CORBA::ExtAttrDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq *
-CORBA::ExtAttrDescriptionSeq_var::_retn (void)
-{
-  ::CORBA::ExtAttrDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq *
-CORBA::ExtAttrDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ExtAttrDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_out::ExtAttrDescriptionSeq_out (ExtAttrDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_out::ExtAttrDescriptionSeq_out (ExtAttrDescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_out::ExtAttrDescriptionSeq_out (const ::CORBA::ExtAttrDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (ExtAttrDescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq_out &
-CORBA::ExtAttrDescriptionSeq_out::operator= (const ::CORBA::ExtAttrDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtAttrDescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq_out &
-CORBA::ExtAttrDescriptionSeq_out::operator= (ExtAttrDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtAttrDescriptionSeq_out::operator ::CORBA::ExtAttrDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq *&
-CORBA::ExtAttrDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-::CORBA::ExtAttrDescriptionSeq *
-CORBA::ExtAttrDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_ATTRIBUTEDEF___CI_)
+#define _CORBA_ATTRIBUTEDEF___CI_
 
 ACE_INLINE
-CORBA::ExtAttributeDescription &
-CORBA::ExtAttrDescriptionSeq_out::operator[] (CORBA::ULong index)
+CORBA::AttributeDef::AttributeDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  return this->ptr_->operator[] (index);
+  this->CORBA_AttributeDef_setup_collocation (_tao_collocated);
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDef::FullInterfaceDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (FullInterfaceDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (const ::CORBA::InterfaceDef::FullInterfaceDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::InterfaceDef::FullInterfaceDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::~FullInterfaceDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var &
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (FullInterfaceDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDef::FullInterfaceDescription_var &
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (const ::CORBA::InterfaceDef::FullInterfaceDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          FullInterfaceDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              FullInterfaceDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              FullInterfaceDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator const ::CORBA::InterfaceDef::FullInterfaceDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription &() // cast 
-{
-  return *this->ptr_;
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription &() const // cast 
-{
-  return *this->ptr_;
-}
+#if !defined (_CORBA_EXTATTRIBUTEDEF___CI_)
+#define _CORBA_EXTATTRIBUTEDEF___CI_
 
-// Variable-size types only.
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::InterfaceDef::FullInterfaceDescription &
-CORBA::InterfaceDef::FullInterfaceDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription &
-CORBA::InterfaceDef::FullInterfaceDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *&
-CORBA::InterfaceDef::FullInterfaceDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::_retn (void)
+CORBA::ExtAttributeDef::ExtAttributeDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  ::CORBA::InterfaceDef::FullInterfaceDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
+  this->CORBA_ExtAttributeDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
+#endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDef::FullInterfaceDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (::CORBA::InterfaceDef::FullInterfaceDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (FullInterfaceDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (const ::CORBA::InterfaceDef::FullInterfaceDescription_out &p)
-  : ptr_ (ACE_const_cast (FullInterfaceDescription_out&, p).ptr_)
-{}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out &
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator= (const ::CORBA::InterfaceDef::FullInterfaceDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (FullInterfaceDescription_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_CORBA_OPERATIONDEF___CI_)
+#define _CORBA_OPERATIONDEF___CI_
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out &
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator= (FullInterfaceDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator ::CORBA::InterfaceDef::FullInterfaceDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *&
-CORBA::InterfaceDef::FullInterfaceDescription_out::ptr (void) // ptr
+CORBA::OperationDef::OperationDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_OperationDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#endif /* end #if !defined */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
@@ -4883,438 +742,9 @@ CORBA::InterfaceDef::InterfaceDef (
   this->CORBA_InterfaceDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::InterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::InterfaceDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::InterfaceDescription_var (InterfaceDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::InterfaceDescription_var (const ::CORBA::InterfaceDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::InterfaceDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::~InterfaceDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var &
-CORBA::InterfaceDescription_var::operator= (InterfaceDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::InterfaceDescription_var &
-CORBA::InterfaceDescription_var::operator= (const ::CORBA::InterfaceDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          InterfaceDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              InterfaceDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              InterfaceDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::operator const ::CORBA::InterfaceDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::InterfaceDescription_var::operator ::CORBA::InterfaceDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::InterfaceDescription &
-CORBA::InterfaceDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDescription &
-CORBA::InterfaceDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::InterfaceDescription *&
-CORBA::InterfaceDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_var::_retn (void)
-{
-  ::CORBA::InterfaceDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceDescription_out::InterfaceDescription_out (::CORBA::InterfaceDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_out::InterfaceDescription_out (InterfaceDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_out::InterfaceDescription_out (const ::CORBA::InterfaceDescription_out &p)
-  : ptr_ (ACE_const_cast (InterfaceDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::InterfaceDescription_out &
-CORBA::InterfaceDescription_out::operator= (const ::CORBA::InterfaceDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (InterfaceDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::InterfaceDescription_out &
-CORBA::InterfaceDescription_out::operator= (InterfaceDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InterfaceDescription_out::operator ::CORBA::InterfaceDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDescription *&
-CORBA::InterfaceDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceDescription *
-CORBA::InterfaceDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::ExtFullInterfaceDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::ExtFullInterfaceDescription_var (ExtFullInterfaceDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::ExtFullInterfaceDescription_var (const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::~ExtFullInterfaceDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator= (ExtFullInterfaceDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator= (const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtFullInterfaceDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtFullInterfaceDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtFullInterfaceDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::operator ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::_retn (void)
-{
-  ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::ExtFullInterfaceDescription_out (::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::ExtFullInterfaceDescription_out (ExtFullInterfaceDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::ExtFullInterfaceDescription_out (const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out &p)
-  : ptr_ (ACE_const_cast (ExtFullInterfaceDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out &
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::operator= (const ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtFullInterfaceDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out &
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::operator= (ExtFullInterfaceDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::operator ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION___CI_)
@@ -5331,13 +761,6 @@ CORBA::InterfaceAttrExtension::InterfaceAttrExtension (
   this->CORBA_InterfaceAttrExtension_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -5357,13 +780,6 @@ CORBA::ExtInterfaceDef::ExtInterfaceDef (
   this->CORBA_ExtInterfaceDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -5394,13 +810,6 @@ CORBA::AbstractInterfaceDef::AbstractInterfaceDef (
   this->CORBA_AbstractInterfaceDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -5431,13 +840,6 @@ CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (
   this->CORBA_ExtAbstractInterfaceDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -5468,13 +870,6 @@ CORBA::LocalInterfaceDef::LocalInterfaceDef (
   this->CORBA_LocalInterfaceDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -5505,13 +900,6 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
   this->CORBA_ExtLocalInterfaceDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ExtLocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -5618,12 +1006,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::PrimitiveKind &_tao_enumva
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (CORBA::PrimitiveKind, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -5654,7 +1042,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5712,7 +1100,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5871,12 +1259,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeMode &_tao_enumva
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (CORBA::AttributeMode, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -5894,7 +1282,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -5943,7 +1331,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6023,17 +1411,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationMode &_tao_enumva
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (CORBA::OperationMode, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6127,7 +1515,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6267,7 +1655,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6320,7 +1708,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6380,7 +1768,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -6496,5 +1884,3 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CORBA::ExtLocalInterfaceDef_ptr &
   );
-
-
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index 9d6b4e59ef1..b4b1f9a0571 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -50,7 +49,7 @@
 int CORBA::ComponentIR::EventDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::EventDef_ptr
-tao_CORBA_ComponentIR_EventDef_duplicate (
+CORBA::ComponentIR::tao_EventDef_life::tao_duplicate (
     CORBA::ComponentIR::EventDef_ptr p
   )
 {
@@ -58,7 +57,7 @@ tao_CORBA_ComponentIR_EventDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_EventDef_release (
+CORBA::ComponentIR::tao_EventDef_life::tao_release (
     CORBA::ComponentIR::EventDef_ptr p
   )
 {
@@ -66,228 +65,64 @@ tao_CORBA_ComponentIR_EventDef_release (
 }
 
 CORBA::ComponentIR::EventDef_ptr
-tao_CORBA_ComponentIR_EventDef_nil (
+CORBA::ComponentIR::tao_EventDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::EventDef::_nil ();
 }
 
-CORBA::ComponentIR::EventDef_ptr
-tao_CORBA_ComponentIR_EventDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_EventDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::EventDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::EventDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_EventDef_marshal (
+CORBA::ComponentIR::tao_EventDef_life::tao_marshal (
     CORBA::ComponentIR::EventDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::EventDef_var
-// *************************************************************
-
-CORBA::ComponentIR::EventDef_var::EventDef_var (void)
-  : ptr_ (EventDef::_nil ())
-{}
-
-::CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::EventDef_var::EventDef_var (const ::CORBA::ComponentIR::EventDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (EventDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::EventDef_var::~EventDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::EventDef_var &
-CORBA::ComponentIR::EventDef_var::operator= (EventDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return p->marshal (cdr);
 }
 
-CORBA::ComponentIR::EventDef_var &
-CORBA::ComponentIR::EventDef_var::operator= (const ::CORBA::ComponentIR::EventDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::EventDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::EventDef_var::operator const ::CORBA::ComponentIR::EventDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::EventDef_var::operator ::CORBA::ComponentIR::EventDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventDef_ptr &
-CORBA::ComponentIR::EventDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventDef_ptr &
-CORBA::ComponentIR::EventDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::EventDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::EventDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::EventDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef_var::tao_duplicate (EventDef_ptr p)
-{
-  return ::CORBA::ComponentIR::EventDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::EventDef_var::tao_release (EventDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::EventDef::_nil ();
-}
-
-::CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef_var::tao_narrow (
+CORBA::ComponentIR::EventDef_ptr
+CORBA::ComponentIR::tao_EventDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::EventDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_EventDef_cast::tao_upcast (
+    void *src
+  )
 {
-  EventDef **tmp =
-    ACE_static_cast (EventDef **, src);
+  CORBA::ComponentIR::EventDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::EventDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::EventDef_out
-// *************************************************************
-
-CORBA::ComponentIR::EventDef_out::EventDef_out (EventDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::EventDef::_nil ();
-}
-
-CORBA::ComponentIR::EventDef_out::EventDef_out (EventDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::EventDef::_nil ();
-}
-
-CORBA::ComponentIR::EventDef_out::EventDef_out (const ::CORBA::ComponentIR::EventDef_out &p)
-  : ptr_ (ACE_const_cast (EventDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::EventDef_out &
-CORBA::ComponentIR::EventDef_out::operator= (const ::CORBA::ComponentIR::EventDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (EventDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::EventDef_out &
-CORBA::ComponentIR::EventDef_out::operator= (const ::CORBA::ComponentIR::EventDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::EventDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::EventDef_out &
-CORBA::ComponentIR::EventDef_out::operator= (EventDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::EventDef_out::operator ::CORBA::ComponentIR::EventDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventDef_ptr &
-CORBA::ComponentIR::EventDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventDef_ptr
-CORBA::ComponentIR::EventDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::EventDef,
+        CORBA::ComponentIR::tao_EventDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::EventDef,
+        CORBA::ComponentIR::tao_EventDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::EventDef, \
+        CORBA::ComponentIR::tao_EventDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::EventDef, \
+        CORBA::ComponentIR::tao_EventDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -300,7 +135,7 @@ CORBA::ComponentIR::EventDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
@@ -312,7 +147,7 @@ CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -363,8 +198,8 @@ CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::EventDef::EventDef (int collocated)
 {
@@ -380,14 +215,14 @@ CORBA::ComponentIR::EventDef::CORBA_ComponentIR_EventDef_setup_collocation (int
   else
     this->the_TAO_EventDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_ExtValueDef_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::EventDef::~EventDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EventDef *tmp = ACE_static_cast (EventDef *, _tao_void_pointer);
@@ -404,7 +239,7 @@ CORBA::ComponentIR::EventDef::_narrow (
     {
       return EventDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -413,17 +248,17 @@ CORBA::ComponentIR::EventDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (EventDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return EventDef::_nil ();
         }
     }
-  
+
   return EventDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::EventDef_ptr 
+CORBA::ComponentIR::EventDef_ptr
 CORBA::ComponentIR::EventDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -433,18 +268,18 @@ CORBA::ComponentIR::EventDef::_unchecked_narrow (
     {
       return EventDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       EventDef_ptr default_proxy = EventDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -462,7 +297,7 @@ CORBA::ComponentIR::EventDef::_unchecked_narrow (
               EventDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -475,10 +310,10 @@ CORBA::ComponentIR::EventDef::_unchecked_narrow (
               EventDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           EventDef_ptr,
@@ -498,7 +333,7 @@ CORBA::ComponentIR::EventDef::_duplicate (EventDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -557,7 +392,7 @@ CORBA::ComponentIR::EventDef::_is_a (
 void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventDef)::_tao_class_id)
@@ -660,12 +495,12 @@ void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -674,6 +509,12 @@ const char* CORBA::ComponentIR::EventDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -681,20 +522,20 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f4576), 
-  ACE_NTOHL (0x656e7444), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f4576),
+  ACE_NTOHL (0x656e7444),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventDef:1.0
     9,
-  ACE_NTOHL (0x4576656e), 
-  ACE_NTOHL (0x74446566), 
+  ACE_NTOHL (0x4576656e),
+  ACE_NTOHL (0x74446566),
   ACE_NTOHL (0x0),  // name = EventDef
   };
 
@@ -723,7 +564,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::Container::_tao_class_id = 0;
 
 CORBA::ComponentIR::Container_ptr
-tao_CORBA_ComponentIR_Container_duplicate (
+CORBA::ComponentIR::tao_Container_life::tao_duplicate (
     CORBA::ComponentIR::Container_ptr p
   )
 {
@@ -731,7 +572,7 @@ tao_CORBA_ComponentIR_Container_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_Container_release (
+CORBA::ComponentIR::tao_Container_life::tao_release (
     CORBA::ComponentIR::Container_ptr p
   )
 {
@@ -739,228 +580,64 @@ tao_CORBA_ComponentIR_Container_release (
 }
 
 CORBA::ComponentIR::Container_ptr
-tao_CORBA_ComponentIR_Container_nil (
+CORBA::ComponentIR::tao_Container_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::Container::_nil ();
 }
 
-CORBA::ComponentIR::Container_ptr
-tao_CORBA_ComponentIR_Container_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_Container_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::Container **tmp =
-    ACE_static_cast (CORBA::ComponentIR::Container **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_Container_marshal (
+CORBA::ComponentIR::tao_Container_life::tao_marshal (
     CORBA::ComponentIR::Container_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::Container_var
-// *************************************************************
-
-CORBA::ComponentIR::Container_var::Container_var (void)
-  : ptr_ (Container::_nil ())
-{}
-
-::CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::Container_var::Container_var (const ::CORBA::ComponentIR::Container_var &p)
-  : TAO_Base_var (),
-    ptr_ (Container::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::Container_var::~Container_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::Container_var &
-CORBA::ComponentIR::Container_var::operator= (Container_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::Container_var &
-CORBA::ComponentIR::Container_var::operator= (const ::CORBA::ComponentIR::Container_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::Container::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::Container_var::operator const ::CORBA::ComponentIR::Container_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::Container_var::operator ::CORBA::ComponentIR::Container_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Container_ptr &
-CORBA::ComponentIR::Container_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Container_ptr &
-CORBA::ComponentIR::Container_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::Container::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::Container_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::Container::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container_var::tao_duplicate (Container_ptr p)
-{
-  return ::CORBA::ComponentIR::Container::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::Container_var::tao_release (Container_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::Container::_nil ();
+  return p->marshal (cdr);
 }
 
-::CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container_var::tao_narrow (
+CORBA::ComponentIR::Container_ptr
+CORBA::ComponentIR::tao_Container_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::Container::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::Container_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_Container_cast::tao_upcast (
+    void *src
+  )
 {
-  Container **tmp =
-    ACE_static_cast (Container **, src);
+  CORBA::ComponentIR::Container **tmp =
+    ACE_static_cast (CORBA::ComponentIR::Container **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::Container_out
-// *************************************************************
-
-CORBA::ComponentIR::Container_out::Container_out (Container_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::Container::_nil ();
-}
-
-CORBA::ComponentIR::Container_out::Container_out (Container_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::Container::_nil ();
-}
-
-CORBA::ComponentIR::Container_out::Container_out (const ::CORBA::ComponentIR::Container_out &p)
-  : ptr_ (ACE_const_cast (Container_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::Container_out &
-CORBA::ComponentIR::Container_out::operator= (const ::CORBA::ComponentIR::Container_out &p)
-{
-  this->ptr_ = ACE_const_cast (Container_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::Container_out &
-CORBA::ComponentIR::Container_out::operator= (const ::CORBA::ComponentIR::Container_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::Container::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::Container_out &
-CORBA::ComponentIR::Container_out::operator= (Container_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::Container_out::operator ::CORBA::ComponentIR::Container_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Container_ptr &
-CORBA::ComponentIR::Container_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Container_ptr
-CORBA::ComponentIR::Container_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::Container,
+        CORBA::ComponentIR::tao_Container_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::Container,
+        CORBA::ComponentIR::tao_Container_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::Container, \
+        CORBA::ComponentIR::tao_Container_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::Container, \
+        CORBA::ComponentIR::tao_Container_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -985,15 +662,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::ComponentDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component &);
@@ -1002,13 +679,13 @@ public:
     const char * version_;
     CORBA::ComponentIR::ComponentDef_ptr base_component_;
     const CORBA::InterfaceDefSeq & supports_interfaces_;
-    
+
     ::CORBA::ComponentIR::ComponentDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -1017,7 +694,7 @@ public:
       const char * version,
       CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq & supports_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -1035,31 +712,31 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->base_component_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->supports_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1071,11 +748,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1084,17 +761,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component::result (::CORBA::ComponentIR::ComponentDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -1118,15 +795,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::HomeDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home &);
@@ -1137,13 +814,13 @@ public:
     CORBA::ComponentIR::ComponentDef_ptr managed_component_;
     const CORBA::InterfaceDefSeq & supports_interfaces_;
     CORBA::ValueDef_ptr primary_key_;
-    
+
     ::CORBA::ComponentIR::HomeDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -1154,7 +831,7 @@ public:
       CORBA::ComponentIR::ComponentDef_ptr managed_component,
       const CORBA::InterfaceDefSeq & supports_interfaces,
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -1174,39 +851,39 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (7);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->base_home_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->managed_component_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->supports_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->primary_key_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1218,11 +895,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1231,17 +908,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home::result (::CORBA::ComponentIR::HomeDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -1268,15 +945,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::EventDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event &);
@@ -1290,13 +967,13 @@ public:
     const CORBA::ValueDefSeq & abstract_base_values_;
     const CORBA::InterfaceDefSeq & supported_interfaces_;
     const CORBA::ExtInitializerSeq & initializers_;
-    
+
     ::CORBA::ComponentIR::EventDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -1310,7 +987,7 @@ public:
       const CORBA::ValueDefSeq & abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::ExtInitializerSeq & initializers
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -1333,51 +1010,51 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (10);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->base_value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->abstract_base_values_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->supported_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -1389,11 +1066,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1402,17 +1079,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::result (::CORBA::ComponentIR::EventDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -1422,7 +1099,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event::result (::CORBA:
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
@@ -1451,12 +1128,12 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
 {
   CORBA::ComponentIR::ComponentDef_var _tao_retval (CORBA::ComponentIR::ComponentDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_component",
@@ -1464,22 +1141,22 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_component _tao_ri (
           &_tao_call,
@@ -1492,14 +1169,14 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1507,95 +1184,99 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << base_component) &&
-              (_tao_out << supports_interfaces)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << base_component) &&
+                  (_tao_out << supports_interfaces)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::ComponentDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::ComponentDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1605,59 +1286,57 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -1680,12 +1359,12 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
 {
   CORBA::ComponentIR::HomeDef_var _tao_retval (CORBA::ComponentIR::HomeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_home",
@@ -1693,22 +1372,22 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
       7,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_home _tao_ri (
           &_tao_call,
@@ -1723,14 +1402,14 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1738,97 +1417,101 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << base_home) &&
-              (_tao_out << managed_component) &&
-              (_tao_out << supports_interfaces) &&
-              (_tao_out << primary_key)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << base_home) &&
+                  (_tao_out << managed_component) &&
+                  (_tao_out << supports_interfaces) &&
+                  (_tao_out << primary_key)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::HomeDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::HomeDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1838,59 +1521,57 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -1916,12 +1597,12 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
 {
   CORBA::ComponentIR::EventDef_var _tao_retval (CORBA::ComponentIR::EventDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_event",
@@ -1929,22 +1610,22 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
       10,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_Container_create_event _tao_ri (
           &_tao_call,
@@ -1962,14 +1643,14 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1977,100 +1658,104 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
-              (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
-              (_tao_out << base_value) &&
-              (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
-              (_tao_out << abstract_base_values) &&
-              (_tao_out << supported_interfaces) &&
-              (_tao_out << initializers)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
+                  (_tao_out << base_value) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
+                  (_tao_out << abstract_base_values) &&
+                  (_tao_out << supported_interfaces) &&
+                  (_tao_out << initializers)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::EventDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::EventDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -2080,63 +1765,61 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Prox
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -2187,8 +1870,8 @@ CORBA::ComponentIR::_TAO_Container_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::Container::Container (int collocated)
 {
@@ -2209,7 +1892,7 @@ CORBA::ComponentIR::Container::CORBA_ComponentIR_Container_setup_collocation (in
 CORBA::ComponentIR::Container::~Container (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::Container::_tao_any_destructor (void *_tao_void_pointer)
 {
   Container *tmp = ACE_static_cast (Container *, _tao_void_pointer);
@@ -2226,7 +1909,7 @@ CORBA::ComponentIR::Container::_narrow (
     {
       return Container::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -2235,17 +1918,17 @@ CORBA::ComponentIR::Container::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Container::_nil ());
-      
+
       if (is_a == 0)
         {
           return Container::_nil ();
         }
     }
-  
+
   return Container::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::Container_ptr 
+CORBA::ComponentIR::Container_ptr
 CORBA::ComponentIR::Container::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2255,18 +1938,18 @@ CORBA::ComponentIR::Container::_unchecked_narrow (
     {
       return Container::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       Container_ptr default_proxy = Container::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -2284,7 +1967,7 @@ CORBA::ComponentIR::Container::_unchecked_narrow (
               Container::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -2297,10 +1980,10 @@ CORBA::ComponentIR::Container::_unchecked_narrow (
               Container::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           Container_ptr,
@@ -2320,7 +2003,7 @@ CORBA::ComponentIR::Container::_duplicate (Container_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2355,7 +2038,7 @@ CORBA::ComponentIR::Container::_is_a (
 void *CORBA::ComponentIR::Container::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, Container)::_tao_class_id)
@@ -2374,12 +2057,12 @@ void *CORBA::ComponentIR::Container::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2388,6 +2071,12 @@ const char* CORBA::ComponentIR::Container::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ComponentIR/Container:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -2403,10 +2092,10 @@ const char* CORBA::ComponentIR::Container::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_component (
       this,
       id,
@@ -2435,10 +2124,10 @@ const char* CORBA::ComponentIR::Container::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_home (
       this,
       id,
@@ -2472,10 +2161,10 @@ const char* CORBA::ComponentIR::Container::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
+  _TAO_Container_Proxy_Impl &proxy =
     this->the_TAO_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_event (
       this,
       id,
@@ -2499,20 +2188,20 @@ static const CORBA::Long _oc_CORBA_ComponentIR_Container[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65723a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/Container:1.0
     10,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x61696e65), 
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x61696e65),
   ACE_NTOHL (0x72000000),  // name = Container
   };
 
@@ -2541,7 +2230,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::ModuleDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::ModuleDef_ptr
-tao_CORBA_ComponentIR_ModuleDef_duplicate (
+CORBA::ComponentIR::tao_ModuleDef_life::tao_duplicate (
     CORBA::ComponentIR::ModuleDef_ptr p
   )
 {
@@ -2549,7 +2238,7 @@ tao_CORBA_ComponentIR_ModuleDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_ModuleDef_release (
+CORBA::ComponentIR::tao_ModuleDef_life::tao_release (
     CORBA::ComponentIR::ModuleDef_ptr p
   )
 {
@@ -2557,228 +2246,64 @@ tao_CORBA_ComponentIR_ModuleDef_release (
 }
 
 CORBA::ComponentIR::ModuleDef_ptr
-tao_CORBA_ComponentIR_ModuleDef_nil (
+CORBA::ComponentIR::tao_ModuleDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::ModuleDef::_nil ();
 }
 
-CORBA::ComponentIR::ModuleDef_ptr
-tao_CORBA_ComponentIR_ModuleDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_ModuleDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::ModuleDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::ModuleDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_ModuleDef_marshal (
+CORBA::ComponentIR::tao_ModuleDef_life::tao_marshal (
     CORBA::ComponentIR::ModuleDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::ModuleDef_var
-// *************************************************************
-
-CORBA::ComponentIR::ModuleDef_var::ModuleDef_var (void)
-  : ptr_ (ModuleDef::_nil ())
-{}
-
-::CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::ModuleDef_var::ModuleDef_var (const ::CORBA::ComponentIR::ModuleDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ModuleDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::ModuleDef_var::~ModuleDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::ModuleDef_var &
-CORBA::ComponentIR::ModuleDef_var::operator= (ModuleDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::ModuleDef_var &
-CORBA::ComponentIR::ModuleDef_var::operator= (const ::CORBA::ComponentIR::ModuleDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_duplicate (p.ptr ());
-  }
-  return *this;
+  return p->marshal (cdr);
 }
 
-CORBA::ComponentIR::ModuleDef_var::operator const ::CORBA::ComponentIR::ModuleDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::ModuleDef_var::operator ::CORBA::ComponentIR::ModuleDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr &
-CORBA::ComponentIR::ModuleDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr &
-CORBA::ComponentIR::ModuleDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::ModuleDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef_var::tao_duplicate (ModuleDef_ptr p)
-{
-  return ::CORBA::ComponentIR::ModuleDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::ModuleDef_var::tao_release (ModuleDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::ModuleDef::_nil ();
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef_var::tao_narrow (
+CORBA::ComponentIR::ModuleDef_ptr
+CORBA::ComponentIR::tao_ModuleDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::ModuleDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_ModuleDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ModuleDef **tmp =
-    ACE_static_cast (ModuleDef **, src);
+  CORBA::ComponentIR::ModuleDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::ModuleDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::ModuleDef_out
-// *************************************************************
-
-CORBA::ComponentIR::ModuleDef_out::ModuleDef_out (ModuleDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_nil ();
-}
-
-CORBA::ComponentIR::ModuleDef_out::ModuleDef_out (ModuleDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_nil ();
-}
-
-CORBA::ComponentIR::ModuleDef_out::ModuleDef_out (const ::CORBA::ComponentIR::ModuleDef_out &p)
-  : ptr_ (ACE_const_cast (ModuleDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::ModuleDef_out &
-CORBA::ComponentIR::ModuleDef_out::operator= (const ::CORBA::ComponentIR::ModuleDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ModuleDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::ModuleDef_out &
-CORBA::ComponentIR::ModuleDef_out::operator= (const ::CORBA::ComponentIR::ModuleDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::ModuleDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::ModuleDef_out &
-CORBA::ComponentIR::ModuleDef_out::operator= (ModuleDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::ModuleDef_out::operator ::CORBA::ComponentIR::ModuleDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr &
-CORBA::ComponentIR::ModuleDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ModuleDef_ptr
-CORBA::ComponentIR::ModuleDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::ModuleDef,
+        CORBA::ComponentIR::tao_ModuleDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::ModuleDef,
+        CORBA::ComponentIR::tao_ModuleDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::ModuleDef, \
+        CORBA::ComponentIR::tao_ModuleDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::ModuleDef, \
+        CORBA::ComponentIR::tao_ModuleDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -2791,7 +2316,7 @@ CORBA::ComponentIR::ModuleDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
@@ -2803,7 +2328,7 @@ CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Prox
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -2854,8 +2379,8 @@ CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::ModuleDef::ModuleDef (int collocated)
 {
@@ -2871,7 +2396,7 @@ CORBA::ComponentIR::ModuleDef::CORBA_ComponentIR_ModuleDef_setup_collocation (in
   else
     this->the_TAO_ModuleDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_ModuleDef_setup_collocation (collocated);
   this->CORBA_ComponentIR_Container_setup_collocation (collocated);
 }
@@ -2879,7 +2404,7 @@ CORBA::ComponentIR::ModuleDef::CORBA_ComponentIR_ModuleDef_setup_collocation (in
 CORBA::ComponentIR::ModuleDef::~ModuleDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ModuleDef *tmp = ACE_static_cast (ModuleDef *, _tao_void_pointer);
@@ -2896,7 +2421,7 @@ CORBA::ComponentIR::ModuleDef::_narrow (
     {
       return ModuleDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -2905,17 +2430,17 @@ CORBA::ComponentIR::ModuleDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ModuleDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ModuleDef::_nil ();
         }
     }
-  
+
   return ModuleDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::ModuleDef_ptr 
+CORBA::ComponentIR::ModuleDef_ptr
 CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2925,18 +2450,18 @@ CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
     {
       return ModuleDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ModuleDef_ptr default_proxy = ModuleDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -2954,7 +2479,7 @@ CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
               ModuleDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -2967,10 +2492,10 @@ CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
               ModuleDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ModuleDef_ptr,
@@ -2990,7 +2515,7 @@ CORBA::ComponentIR::ModuleDef::_duplicate (ModuleDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3045,7 +2570,7 @@ CORBA::ComponentIR::ModuleDef::_is_a (
 void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, ModuleDef)::_tao_class_id)
@@ -3134,12 +2659,12 @@ void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3148,6 +2673,12 @@ const char* CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3155,20 +2686,20 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ModuleDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f4d6f), 
-  ACE_NTOHL (0x64756c65), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f4d6f),
+  ACE_NTOHL (0x64756c65),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0
     10,
-  ACE_NTOHL (0x4d6f6475), 
-  ACE_NTOHL (0x6c654465), 
+  ACE_NTOHL (0x4d6f6475),
+  ACE_NTOHL (0x6c654465),
   ACE_NTOHL (0x66000000),  // name = ModuleDef
   };
 
@@ -3197,7 +2728,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::Repository::_tao_class_id = 0;
 
 CORBA::ComponentIR::Repository_ptr
-tao_CORBA_ComponentIR_Repository_duplicate (
+CORBA::ComponentIR::tao_Repository_life::tao_duplicate (
     CORBA::ComponentIR::Repository_ptr p
   )
 {
@@ -3205,7 +2736,7 @@ tao_CORBA_ComponentIR_Repository_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_Repository_release (
+CORBA::ComponentIR::tao_Repository_life::tao_release (
     CORBA::ComponentIR::Repository_ptr p
   )
 {
@@ -3213,228 +2744,64 @@ tao_CORBA_ComponentIR_Repository_release (
 }
 
 CORBA::ComponentIR::Repository_ptr
-tao_CORBA_ComponentIR_Repository_nil (
+CORBA::ComponentIR::tao_Repository_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::Repository::_nil ();
 }
 
-CORBA::ComponentIR::Repository_ptr
-tao_CORBA_ComponentIR_Repository_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_Repository_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::Repository **tmp =
-    ACE_static_cast (CORBA::ComponentIR::Repository **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_Repository_marshal (
+CORBA::ComponentIR::tao_Repository_life::tao_marshal (
     CORBA::ComponentIR::Repository_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::Repository_var
-// *************************************************************
-
-CORBA::ComponentIR::Repository_var::Repository_var (void)
-  : ptr_ (Repository::_nil ())
-{}
-
-::CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::Repository_var::Repository_var (const ::CORBA::ComponentIR::Repository_var &p)
-  : TAO_Base_var (),
-    ptr_ (Repository::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::Repository_var::~Repository_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::Repository_var &
-CORBA::ComponentIR::Repository_var::operator= (Repository_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::Repository_var &
-CORBA::ComponentIR::Repository_var::operator= (const ::CORBA::ComponentIR::Repository_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::Repository::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::Repository_var::operator const ::CORBA::ComponentIR::Repository_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::Repository_var::operator ::CORBA::ComponentIR::Repository_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Repository_ptr &
-CORBA::ComponentIR::Repository_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Repository_ptr &
-CORBA::ComponentIR::Repository_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::Repository::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::Repository_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::Repository::_nil ();
-  return val;
+  return p->marshal (cdr);
 }
 
-::CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository_var::tao_duplicate (Repository_ptr p)
-{
-  return ::CORBA::ComponentIR::Repository::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::Repository_var::tao_release (Repository_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::Repository::_nil ();
-}
-
-::CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository_var::tao_narrow (
+CORBA::ComponentIR::Repository_ptr
+CORBA::ComponentIR::tao_Repository_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::Repository_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_Repository_cast::tao_upcast (
+    void *src
+  )
 {
-  Repository **tmp =
-    ACE_static_cast (Repository **, src);
+  CORBA::ComponentIR::Repository **tmp =
+    ACE_static_cast (CORBA::ComponentIR::Repository **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::Repository_out
-// *************************************************************
-
-CORBA::ComponentIR::Repository_out::Repository_out (Repository_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::Repository::_nil ();
-}
-
-CORBA::ComponentIR::Repository_out::Repository_out (Repository_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::Repository::_nil ();
-}
-
-CORBA::ComponentIR::Repository_out::Repository_out (const ::CORBA::ComponentIR::Repository_out &p)
-  : ptr_ (ACE_const_cast (Repository_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::Repository_out &
-CORBA::ComponentIR::Repository_out::operator= (const ::CORBA::ComponentIR::Repository_out &p)
-{
-  this->ptr_ = ACE_const_cast (Repository_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::Repository_out &
-CORBA::ComponentIR::Repository_out::operator= (const ::CORBA::ComponentIR::Repository_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::Repository::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::Repository_out &
-CORBA::ComponentIR::Repository_out::operator= (Repository_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::Repository_out::operator ::CORBA::ComponentIR::Repository_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Repository_ptr &
-CORBA::ComponentIR::Repository_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::Repository_ptr
-CORBA::ComponentIR::Repository_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::Repository,
+        CORBA::ComponentIR::tao_Repository_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::Repository,
+        CORBA::ComponentIR::tao_Repository_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::Repository, \
+        CORBA::ComponentIR::tao_Repository_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::Repository, \
+        CORBA::ComponentIR::tao_Repository_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -3447,7 +2814,7 @@ CORBA::ComponentIR::Repository_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
@@ -3459,7 +2826,7 @@ CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Pr
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -3510,8 +2877,8 @@ CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::Repository::Repository (int collocated)
 {
@@ -3527,7 +2894,7 @@ CORBA::ComponentIR::Repository::CORBA_ComponentIR_Repository_setup_collocation (
   else
     this->the_TAO_Repository_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Repository_setup_collocation (collocated);
   this->CORBA_ComponentIR_Container_setup_collocation (collocated);
 }
@@ -3535,7 +2902,7 @@ CORBA::ComponentIR::Repository::CORBA_ComponentIR_Repository_setup_collocation (
 CORBA::ComponentIR::Repository::~Repository (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
   Repository *tmp = ACE_static_cast (Repository *, _tao_void_pointer);
@@ -3552,7 +2919,7 @@ CORBA::ComponentIR::Repository::_narrow (
     {
       return Repository::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -3561,17 +2928,17 @@ CORBA::ComponentIR::Repository::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Repository::_nil ());
-      
+
       if (is_a == 0)
         {
           return Repository::_nil ();
         }
     }
-  
+
   return Repository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::Repository_ptr 
+CORBA::ComponentIR::Repository_ptr
 CORBA::ComponentIR::Repository::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3581,18 +2948,18 @@ CORBA::ComponentIR::Repository::_unchecked_narrow (
     {
       return Repository::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       Repository_ptr default_proxy = Repository::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -3610,7 +2977,7 @@ CORBA::ComponentIR::Repository::_unchecked_narrow (
               Repository::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -3623,10 +2990,10 @@ CORBA::ComponentIR::Repository::_unchecked_narrow (
               Repository::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           Repository_ptr,
@@ -3646,7 +3013,7 @@ CORBA::ComponentIR::Repository::_duplicate (Repository_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3697,7 +3064,7 @@ CORBA::ComponentIR::Repository::_is_a (
 void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, Repository)::_tao_class_id)
@@ -3772,12 +3139,12 @@ void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3786,6 +3153,12 @@ const char* CORBA::ComponentIR::Repository::_interface_repository_id (void) cons
   return "IDL:omg.org/CORBA/ComponentIR/Repository:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3793,21 +3166,21 @@ static const CORBA::Long _oc_CORBA_ComponentIR_Repository[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/Repository:1.0
     11,
-  ACE_NTOHL (0x5265706f), 
-  ACE_NTOHL (0x7369746f), 
+  ACE_NTOHL (0x5265706f),
+  ACE_NTOHL (0x7369746f),
   ACE_NTOHL (0x72790000),  // name = Repository
   };
 
@@ -3836,7 +3209,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::ProvidesDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::ProvidesDef_ptr
-tao_CORBA_ComponentIR_ProvidesDef_duplicate (
+CORBA::ComponentIR::tao_ProvidesDef_life::tao_duplicate (
     CORBA::ComponentIR::ProvidesDef_ptr p
   )
 {
@@ -3844,7 +3217,7 @@ tao_CORBA_ComponentIR_ProvidesDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_ProvidesDef_release (
+CORBA::ComponentIR::tao_ProvidesDef_life::tao_release (
     CORBA::ComponentIR::ProvidesDef_ptr p
   )
 {
@@ -3852,228 +3225,64 @@ tao_CORBA_ComponentIR_ProvidesDef_release (
 }
 
 CORBA::ComponentIR::ProvidesDef_ptr
-tao_CORBA_ComponentIR_ProvidesDef_nil (
+CORBA::ComponentIR::tao_ProvidesDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::ProvidesDef::_nil ();
 }
 
-CORBA::ComponentIR::ProvidesDef_ptr
-tao_CORBA_ComponentIR_ProvidesDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_ProvidesDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::ProvidesDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::ProvidesDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_ProvidesDef_marshal (
+CORBA::ComponentIR::tao_ProvidesDef_life::tao_marshal (
     CORBA::ComponentIR::ProvidesDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::ProvidesDef_var
-// *************************************************************
-
-CORBA::ComponentIR::ProvidesDef_var::ProvidesDef_var (void)
-  : ptr_ (ProvidesDef::_nil ())
-{}
-
-::CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::ProvidesDef_var::ProvidesDef_var (const ::CORBA::ComponentIR::ProvidesDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ProvidesDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::ProvidesDef_var::~ProvidesDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::ProvidesDef_var &
-CORBA::ComponentIR::ProvidesDef_var::operator= (ProvidesDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::ProvidesDef_var &
-CORBA::ComponentIR::ProvidesDef_var::operator= (const ::CORBA::ComponentIR::ProvidesDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::ProvidesDef_var::operator const ::CORBA::ComponentIR::ProvidesDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::ProvidesDef_var::operator ::CORBA::ComponentIR::ProvidesDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef_var::operator-> (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr &
-CORBA::ComponentIR::ProvidesDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr &
-CORBA::ComponentIR::ProvidesDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::ProvidesDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef_var::tao_duplicate (ProvidesDef_ptr p)
-{
-  return ::CORBA::ComponentIR::ProvidesDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::ProvidesDef_var::tao_release (ProvidesDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::ProvidesDef::_nil ();
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef_var::tao_narrow (
+CORBA::ComponentIR::ProvidesDef_ptr
+CORBA::ComponentIR::tao_ProvidesDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::ProvidesDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_ProvidesDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ProvidesDef **tmp =
-    ACE_static_cast (ProvidesDef **, src);
+  CORBA::ComponentIR::ProvidesDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::ProvidesDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::ProvidesDef_out
-// *************************************************************
-
-CORBA::ComponentIR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_nil ();
-}
-
-CORBA::ComponentIR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_nil ();
-}
-
-CORBA::ComponentIR::ProvidesDef_out::ProvidesDef_out (const ::CORBA::ComponentIR::ProvidesDef_out &p)
-  : ptr_ (ACE_const_cast (ProvidesDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::ProvidesDef_out &
-CORBA::ComponentIR::ProvidesDef_out::operator= (const ::CORBA::ComponentIR::ProvidesDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ProvidesDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::ProvidesDef_out &
-CORBA::ComponentIR::ProvidesDef_out::operator= (const ::CORBA::ComponentIR::ProvidesDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::ProvidesDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::ProvidesDef_out &
-CORBA::ComponentIR::ProvidesDef_out::operator= (ProvidesDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::ProvidesDef_out::operator ::CORBA::ComponentIR::ProvidesDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr &
-CORBA::ComponentIR::ProvidesDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ProvidesDef_ptr
-CORBA::ComponentIR::ProvidesDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::ProvidesDef,
+        CORBA::ComponentIR::tao_ProvidesDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::ProvidesDef,
+        CORBA::ComponentIR::tao_ProvidesDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::ProvidesDef, \
+        CORBA::ComponentIR::tao_ProvidesDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::ProvidesDef, \
+        CORBA::ComponentIR::tao_ProvidesDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -4093,29 +3302,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get &);
-    
+
     ::CORBA::InterfaceDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -4128,7 +3337,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::argument
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4140,11 +3349,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::exceptio
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4153,17 +3362,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::result (::CORBA::InterfaceDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -4181,10 +3390,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4193,15 +3402,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set &);
     CORBA::InterfaceDef_ptr interface_type_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       interface_type_ (interface_type)
@@ -4215,15 +3424,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::argument
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->interface_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -4235,11 +3444,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::exceptio
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4248,7 +3457,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4260,7 +3469,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::result (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
@@ -4284,12 +3493,12 @@ CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_
 {
   CORBA::InterfaceDef_var _tao_retval (CORBA::InterfaceDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_interface_type",
@@ -4297,22 +3506,22 @@ CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get _tao_ri (
           &_tao_call,
@@ -4320,14 +3529,14 @@ CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4335,78 +3544,85 @@ CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4416,59 +3632,57 @@ CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -4484,12 +3698,12 @@ void CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_interface_type",
@@ -4497,22 +3711,22 @@ void CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set _tao_ri (
           &_tao_call,
@@ -4521,14 +3735,14 @@ void CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4536,70 +3750,76 @@ void CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << interface_type)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << interface_type)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4609,61 +3829,59 @@ void CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -4714,8 +3932,8 @@ CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::ProvidesDef::ProvidesDef (int collocated)
 {
@@ -4731,14 +3949,14 @@ CORBA::ComponentIR::ProvidesDef::CORBA_ComponentIR_ProvidesDef_setup_collocation
   else
     this->the_TAO_ProvidesDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProvidesDef *tmp = ACE_static_cast (ProvidesDef *, _tao_void_pointer);
@@ -4755,7 +3973,7 @@ CORBA::ComponentIR::ProvidesDef::_narrow (
     {
       return ProvidesDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -4764,17 +3982,17 @@ CORBA::ComponentIR::ProvidesDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ProvidesDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ProvidesDef::_nil ();
         }
     }
-  
+
   return ProvidesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::ProvidesDef_ptr 
+CORBA::ComponentIR::ProvidesDef_ptr
 CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4784,18 +4002,18 @@ CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
     {
       return ProvidesDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ProvidesDef_ptr default_proxy = ProvidesDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -4813,7 +4031,7 @@ CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
               ProvidesDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -4826,10 +4044,10 @@ CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
               ProvidesDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ProvidesDef_ptr,
@@ -4849,7 +4067,7 @@ CORBA::ComponentIR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4892,7 +4110,7 @@ CORBA::ComponentIR::ProvidesDef::_is_a (
 void *CORBA::ComponentIR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, ProvidesDef)::_tao_class_id)
@@ -4939,12 +4157,12 @@ void *CORBA::ComponentIR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4953,6 +4171,12 @@ const char* CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void) con
   return "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::ProvidesDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -4963,10 +4187,10 @@ const char* CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void) con
     CORBA::SystemException
   ))
 {
-  _TAO_ProvidesDef_Proxy_Impl &proxy = 
+  _TAO_ProvidesDef_Proxy_Impl &proxy =
     this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.interface_type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -4984,10 +4208,10 @@ void CORBA::ComponentIR::ProvidesDef::interface_type (
     CORBA::SystemException
   ))
 {
-  _TAO_ProvidesDef_Proxy_Impl &proxy = 
+  _TAO_ProvidesDef_Proxy_Impl &proxy =
     this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.interface_type (
       this,
       interface_type
@@ -5002,21 +4226,21 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f5072), 
-  ACE_NTOHL (0x6f766964), 
-  ACE_NTOHL (0x65734465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f5072),
+  ACE_NTOHL (0x6f766964),
+  ACE_NTOHL (0x65734465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0
     12,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
+  ACE_NTOHL (0x50726f76),
+  ACE_NTOHL (0x69646573),
   ACE_NTOHL (0x44656600),  // name = ProvidesDef
   };
 
@@ -5046,48 +4270,48 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f5072), 
-  ACE_NTOHL (0x6f766964), 
-  ACE_NTOHL (0x65734465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f5072),
+  ACE_NTOHL (0x6f766964),
+  ACE_NTOHL (0x65734465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
     20,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x50726f76),
+  ACE_NTOHL (0x69646573),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -5096,56 +4320,56 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   15,
-  ACE_NTOHL (0x696e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x655f7479), 
+  ACE_NTOHL (0x696e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x655f7479),
   ACE_NTOHL (0x70650000),  // name = interface_type
     0xffffffff, // indirection
   0xffffff28, // negative offset (-216)
@@ -5170,7 +4394,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -5180,12 +4404,43 @@ void CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor (void *_tao_vo
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ProvidesDescription
+    >;
+
+template class
+  TAO_Out_T<
+      ProvidesDescription,
+      ProvidesDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ProvidesDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ProvidesDescription, \
+      ProvidesDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ComponentIR::UsesDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::UsesDef_ptr
-tao_CORBA_ComponentIR_UsesDef_duplicate (
+CORBA::ComponentIR::tao_UsesDef_life::tao_duplicate (
     CORBA::ComponentIR::UsesDef_ptr p
   )
 {
@@ -5193,7 +4448,7 @@ tao_CORBA_ComponentIR_UsesDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_UsesDef_release (
+CORBA::ComponentIR::tao_UsesDef_life::tao_release (
     CORBA::ComponentIR::UsesDef_ptr p
   )
 {
@@ -5201,228 +4456,64 @@ tao_CORBA_ComponentIR_UsesDef_release (
 }
 
 CORBA::ComponentIR::UsesDef_ptr
-tao_CORBA_ComponentIR_UsesDef_nil (
+CORBA::ComponentIR::tao_UsesDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::UsesDef::_nil ();
 }
 
-CORBA::ComponentIR::UsesDef_ptr
-tao_CORBA_ComponentIR_UsesDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_UsesDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::UsesDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::UsesDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_UsesDef_marshal (
+CORBA::ComponentIR::tao_UsesDef_life::tao_marshal (
     CORBA::ComponentIR::UsesDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::UsesDef_var
-// *************************************************************
-
-CORBA::ComponentIR::UsesDef_var::UsesDef_var (void)
-  : ptr_ (UsesDef::_nil ())
-{}
-
-::CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::UsesDef_var::UsesDef_var (const ::CORBA::ComponentIR::UsesDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (UsesDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::UsesDef_var::~UsesDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::UsesDef_var &
-CORBA::ComponentIR::UsesDef_var::operator= (UsesDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::UsesDef_var &
-CORBA::ComponentIR::UsesDef_var::operator= (const ::CORBA::ComponentIR::UsesDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::UsesDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::UsesDef_var::operator const ::CORBA::ComponentIR::UsesDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::UsesDef_var::operator ::CORBA::ComponentIR::UsesDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::UsesDef_ptr &
-CORBA::ComponentIR::UsesDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::UsesDef_ptr &
-CORBA::ComponentIR::UsesDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::UsesDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_nil ();
-  return val;
+  return p->marshal (cdr);
 }
 
-::CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef_var::tao_duplicate (UsesDef_ptr p)
-{
-  return ::CORBA::ComponentIR::UsesDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::UsesDef_var::tao_release (UsesDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::UsesDef::_nil ();
-}
-
-::CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef_var::tao_narrow (
+CORBA::ComponentIR::UsesDef_ptr
+CORBA::ComponentIR::tao_UsesDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::UsesDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_UsesDef_cast::tao_upcast (
+    void *src
+  )
 {
-  UsesDef **tmp =
-    ACE_static_cast (UsesDef **, src);
+  CORBA::ComponentIR::UsesDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::UsesDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::UsesDef_out
-// *************************************************************
-
-CORBA::ComponentIR::UsesDef_out::UsesDef_out (UsesDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_nil ();
-}
-
-CORBA::ComponentIR::UsesDef_out::UsesDef_out (UsesDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_nil ();
-}
-
-CORBA::ComponentIR::UsesDef_out::UsesDef_out (const ::CORBA::ComponentIR::UsesDef_out &p)
-  : ptr_ (ACE_const_cast (UsesDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::UsesDef_out &
-CORBA::ComponentIR::UsesDef_out::operator= (const ::CORBA::ComponentIR::UsesDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (UsesDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::UsesDef_out &
-CORBA::ComponentIR::UsesDef_out::operator= (const ::CORBA::ComponentIR::UsesDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::UsesDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::UsesDef_out &
-CORBA::ComponentIR::UsesDef_out::operator= (UsesDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::UsesDef_out::operator ::CORBA::ComponentIR::UsesDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::UsesDef_ptr &
-CORBA::ComponentIR::UsesDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::UsesDef_ptr
-CORBA::ComponentIR::UsesDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::UsesDef,
+        CORBA::ComponentIR::tao_UsesDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::UsesDef,
+        CORBA::ComponentIR::tao_UsesDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::UsesDef, \
+        CORBA::ComponentIR::tao_UsesDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::UsesDef, \
+        CORBA::ComponentIR::tao_UsesDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -5442,29 +4533,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get &);
-    
+
     ::CORBA::InterfaceDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5477,7 +4568,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5489,11 +4580,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5502,17 +4593,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::result (::CORBA::InterfaceDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -5530,10 +4621,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5542,15 +4633,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set &);
     CORBA::InterfaceDef_ptr interface_type_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       interface_type_ (interface_type)
@@ -5564,15 +4655,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->interface_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5584,11 +4675,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5597,7 +4688,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -5616,29 +4707,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get &);
-    
+
     ::CORBA::Boolean _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5651,7 +4742,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::arguments (ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5663,11 +4754,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::exceptions (ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5676,17 +4767,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::result (ACE_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -5704,10 +4795,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5716,15 +4807,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set &);
     const CORBA::Boolean & is_multiple_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_multiple
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       is_multiple_ (is_multiple)
@@ -5738,15 +4829,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::arguments (ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5758,11 +4849,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::exceptions (ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5771,7 +4862,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::result (ACE_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -5783,7 +4874,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::result (ACE_ENV
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
@@ -5807,12 +4898,12 @@ CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Im
 {
   CORBA::InterfaceDef_var _tao_retval (CORBA::InterfaceDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_interface_type",
@@ -5820,22 +4911,22 @@ CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Im
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get _tao_ri (
           &_tao_call,
@@ -5843,14 +4934,14 @@ CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Im
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5858,78 +4949,85 @@ CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Im
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -5939,59 +5037,57 @@ CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Im
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -6007,12 +5103,12 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_interface_type",
@@ -6020,22 +5116,22 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set _tao_ri (
           &_tao_call,
@@ -6044,14 +5140,14 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6059,70 +5155,76 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << interface_type)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << interface_type)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -6132,56 +5234,54 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -6198,12 +5298,12 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_multiple",
@@ -6211,22 +5311,22 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get _tao_ri (
           &_tao_call,
@@ -6234,14 +5334,14 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6249,77 +5349,84 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Boolean _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -6329,59 +5436,57 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -6397,12 +5502,12 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_multiple",
@@ -6410,22 +5515,22 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set _tao_ri (
           &_tao_call,
@@ -6434,14 +5539,14 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6449,70 +5554,76 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << CORBA::Any::from_boolean (is_multiple))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << CORBA::Any::from_boolean (is_multiple))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -6522,61 +5633,59 @@ void CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -6627,8 +5736,8 @@ CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::UsesDef::UsesDef (int collocated)
 {
@@ -6644,14 +5753,14 @@ CORBA::ComponentIR::UsesDef::CORBA_ComponentIR_UsesDef_setup_collocation (int co
   else
     this->the_TAO_UsesDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::UsesDef::~UsesDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UsesDef *tmp = ACE_static_cast (UsesDef *, _tao_void_pointer);
@@ -6668,7 +5777,7 @@ CORBA::ComponentIR::UsesDef::_narrow (
     {
       return UsesDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -6677,17 +5786,17 @@ CORBA::ComponentIR::UsesDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (UsesDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return UsesDef::_nil ();
         }
     }
-  
+
   return UsesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::UsesDef_ptr 
+CORBA::ComponentIR::UsesDef_ptr
 CORBA::ComponentIR::UsesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6697,18 +5806,18 @@ CORBA::ComponentIR::UsesDef::_unchecked_narrow (
     {
       return UsesDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       UsesDef_ptr default_proxy = UsesDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -6726,7 +5835,7 @@ CORBA::ComponentIR::UsesDef::_unchecked_narrow (
               UsesDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -6739,10 +5848,10 @@ CORBA::ComponentIR::UsesDef::_unchecked_narrow (
               UsesDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           UsesDef_ptr,
@@ -6762,7 +5871,7 @@ CORBA::ComponentIR::UsesDef::_duplicate (UsesDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -6805,7 +5914,7 @@ CORBA::ComponentIR::UsesDef::_is_a (
 void *CORBA::ComponentIR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, UsesDef)::_tao_class_id)
@@ -6852,12 +5961,12 @@ void *CORBA::ComponentIR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -6866,6 +5975,12 @@ const char* CORBA::ComponentIR::UsesDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::UsesDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -6876,10 +5991,10 @@ const char* CORBA::ComponentIR::UsesDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_UsesDef_Proxy_Impl &proxy = 
+  _TAO_UsesDef_Proxy_Impl &proxy =
     this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.interface_type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -6897,10 +6012,10 @@ void CORBA::ComponentIR::UsesDef::interface_type (
     CORBA::SystemException
   ))
 {
-  _TAO_UsesDef_Proxy_Impl &proxy = 
+  _TAO_UsesDef_Proxy_Impl &proxy =
     this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.interface_type (
       this,
       interface_type
@@ -6918,10 +6033,10 @@ CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple (
     CORBA::SystemException
   ))
 {
-  _TAO_UsesDef_Proxy_Impl &proxy = 
+  _TAO_UsesDef_Proxy_Impl &proxy =
     this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_multiple (
       this
       ACE_ENV_ARG_PARAMETER
@@ -6939,10 +6054,10 @@ void CORBA::ComponentIR::UsesDef::is_multiple (
     CORBA::SystemException
   ))
 {
-  _TAO_UsesDef_Proxy_Impl &proxy = 
+  _TAO_UsesDef_Proxy_Impl &proxy =
     this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.is_multiple (
       this,
       is_multiple
@@ -6957,19 +6072,19 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f5573), 
-  ACE_NTOHL (0x65734465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f5573),
+  ACE_NTOHL (0x65734465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0
     8,
-  ACE_NTOHL (0x55736573), 
+  ACE_NTOHL (0x55736573),
   ACE_NTOHL (0x44656600),  // name = UsesDef
   };
 
@@ -6999,46 +6114,46 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f5573), 
-  ACE_NTOHL (0x65734465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f5573),
+  ACE_NTOHL (0x65734465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
     16,
-  ACE_NTOHL (0x55736573), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x55736573),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = UsesDescription
   6, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -7047,62 +6162,62 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   15,
-  ACE_NTOHL (0x696e7465), 
-  ACE_NTOHL (0x72666163), 
-  ACE_NTOHL (0x655f7479), 
+  ACE_NTOHL (0x696e7465),
+  ACE_NTOHL (0x72666163),
+  ACE_NTOHL (0x655f7479),
   ACE_NTOHL (0x70650000),  // name = interface_type
     0xffffffff, // indirection
   0xffffff28, // negative offset (-216)
   12,
-  ACE_NTOHL (0x69735f6d), 
-  ACE_NTOHL (0x756c7469), 
+  ACE_NTOHL (0x69735f6d),
+  ACE_NTOHL (0x756c7469),
   ACE_NTOHL (0x706c6500),  // name = is_multiple
     CORBA::tk_boolean,
 
@@ -7127,7 +6242,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ComponentIR::UsesDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -7137,12 +6252,43 @@ void CORBA::ComponentIR::UsesDescription::_tao_any_destructor (void *_tao_void_p
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      UsesDescription
+    >;
+
+template class
+  TAO_Out_T<
+      UsesDescription,
+      UsesDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      UsesDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      UsesDescription, \
+      UsesDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ComponentIR::EventPortDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::EventPortDef_ptr
-tao_CORBA_ComponentIR_EventPortDef_duplicate (
+CORBA::ComponentIR::tao_EventPortDef_life::tao_duplicate (
     CORBA::ComponentIR::EventPortDef_ptr p
   )
 {
@@ -7150,7 +6296,7 @@ tao_CORBA_ComponentIR_EventPortDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_EventPortDef_release (
+CORBA::ComponentIR::tao_EventPortDef_life::tao_release (
     CORBA::ComponentIR::EventPortDef_ptr p
   )
 {
@@ -7158,228 +6304,64 @@ tao_CORBA_ComponentIR_EventPortDef_release (
 }
 
 CORBA::ComponentIR::EventPortDef_ptr
-tao_CORBA_ComponentIR_EventPortDef_nil (
+CORBA::ComponentIR::tao_EventPortDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::EventPortDef::_nil ();
 }
 
-CORBA::ComponentIR::EventPortDef_ptr
-tao_CORBA_ComponentIR_EventPortDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::EventPortDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_EventPortDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::EventPortDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::EventPortDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_EventPortDef_marshal (
+CORBA::ComponentIR::tao_EventPortDef_life::tao_marshal (
     CORBA::ComponentIR::EventPortDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::EventPortDef_var
-// *************************************************************
-
-CORBA::ComponentIR::EventPortDef_var::EventPortDef_var (void)
-  : ptr_ (EventPortDef::_nil ())
-{}
-
-::CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::EventPortDef_var::EventPortDef_var (const ::CORBA::ComponentIR::EventPortDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (EventPortDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::EventPortDef_var::~EventPortDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::EventPortDef_var &
-CORBA::ComponentIR::EventPortDef_var::operator= (EventPortDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::EventPortDef_var &
-CORBA::ComponentIR::EventPortDef_var::operator= (const ::CORBA::ComponentIR::EventPortDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::EventPortDef_var::operator const ::CORBA::ComponentIR::EventPortDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::EventPortDef_var::operator ::CORBA::ComponentIR::EventPortDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr &
-CORBA::ComponentIR::EventPortDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr &
-CORBA::ComponentIR::EventPortDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::EventPortDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef_var::tao_duplicate (EventPortDef_ptr p)
-{
-  return ::CORBA::ComponentIR::EventPortDef::_duplicate (p);
+  return p->marshal (cdr);
 }
 
-void
-CORBA::ComponentIR::EventPortDef_var::tao_release (EventPortDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::EventPortDef::_nil ();
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef_var::tao_narrow (
+CORBA::ComponentIR::EventPortDef_ptr
+CORBA::ComponentIR::tao_EventPortDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::EventPortDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EventPortDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::EventPortDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_EventPortDef_cast::tao_upcast (
+    void *src
+  )
 {
-  EventPortDef **tmp =
-    ACE_static_cast (EventPortDef **, src);
+  CORBA::ComponentIR::EventPortDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::EventPortDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::EventPortDef_out
-// *************************************************************
-
-CORBA::ComponentIR::EventPortDef_out::EventPortDef_out (EventPortDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_nil ();
-}
-
-CORBA::ComponentIR::EventPortDef_out::EventPortDef_out (EventPortDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_nil ();
-}
-
-CORBA::ComponentIR::EventPortDef_out::EventPortDef_out (const ::CORBA::ComponentIR::EventPortDef_out &p)
-  : ptr_ (ACE_const_cast (EventPortDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::EventPortDef_out &
-CORBA::ComponentIR::EventPortDef_out::operator= (const ::CORBA::ComponentIR::EventPortDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (EventPortDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::EventPortDef_out &
-CORBA::ComponentIR::EventPortDef_out::operator= (const ::CORBA::ComponentIR::EventPortDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::EventPortDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::EventPortDef_out &
-CORBA::ComponentIR::EventPortDef_out::operator= (EventPortDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::EventPortDef_out::operator ::CORBA::ComponentIR::EventPortDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr &
-CORBA::ComponentIR::EventPortDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EventPortDef_ptr
-CORBA::ComponentIR::EventPortDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::EventPortDef,
+        CORBA::ComponentIR::tao_EventPortDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::EventPortDef,
+        CORBA::ComponentIR::tao_EventPortDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::EventPortDef, \
+        CORBA::ComponentIR::tao_EventPortDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::EventPortDef, \
+        CORBA::ComponentIR::tao_EventPortDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -7399,29 +6381,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::EventDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get &);
-    
+
     ::CORBA::ComponentIR::EventDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -7434,7 +6416,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -7446,11 +6428,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -7459,17 +6441,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::result (::CORBA::ComponentIR::EventDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -7487,10 +6469,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7499,15 +6481,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set &);
     CORBA::ComponentIR::EventDef_ptr event_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::ComponentIR::EventDef_ptr event
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       event_ (event)
@@ -7521,15 +6503,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->event_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -7541,11 +6523,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -7554,7 +6536,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -7574,31 +6556,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a &);
     const char * event_id_;
-    
+
     ::CORBA::Boolean _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * event_id
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       event_id_ (event_id)
@@ -7612,15 +6594,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::arguments (ACE_ENV_SI
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= event_id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -7632,11 +6614,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::exceptions (ACE_ENV_S
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -7645,17 +6627,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::result (ACE_ENV_SINGL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::result (CORBA::Boolean result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -7665,7 +6647,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::result (CORBA::Boolea
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_EventPortDef_Proxy_Impl::_TAO_EventPortDef_Proxy_Impl (void)
@@ -7689,12 +6671,12 @@ CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::_TAO_EventPortDef_Remot
 {
   CORBA::ComponentIR::EventDef_var _tao_retval (CORBA::ComponentIR::EventDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_event",
@@ -7702,22 +6684,22 @@ CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::_TAO_EventPortDef_Remot
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_get _tao_ri (
           &_tao_call,
@@ -7725,14 +6707,14 @@ CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::_TAO_EventPortDef_Remot
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7740,78 +6722,85 @@ CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::_TAO_EventPortDef_Remot
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::EventDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::EventDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7821,59 +6810,57 @@ CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::_TAO_EventPortDef_Remot
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -7889,12 +6876,12 @@ void CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::event (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_event",
@@ -7902,22 +6889,22 @@ void CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::event (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_event_set _tao_ri (
           &_tao_call,
@@ -7926,14 +6913,14 @@ void CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::event (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7941,70 +6928,76 @@ void CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::event (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << event)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << event)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -8014,56 +7007,54 @@ void CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::event (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -8081,12 +7072,12 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "is_a",
@@ -8094,22 +7085,22 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::is_a (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_EventPortDef_is_a _tao_ri (
           &_tao_call,
@@ -8118,14 +7109,14 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8133,90 +7124,94 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << event_id)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << event_id)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Boolean _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -8226,63 +7221,61 @@ CORBA::Boolean CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -8333,8 +7326,8 @@ CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::EventPortDef::EventPortDef (int collocated)
 {
@@ -8350,14 +7343,14 @@ CORBA::ComponentIR::EventPortDef::CORBA_ComponentIR_EventPortDef_setup_collocati
   else
     this->the_TAO_EventPortDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_EventPortDef_Remote_Proxy_Broker::the_TAO_EventPortDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::EventPortDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EventPortDef *tmp = ACE_static_cast (EventPortDef *, _tao_void_pointer);
@@ -8374,7 +7367,7 @@ CORBA::ComponentIR::EventPortDef::_narrow (
     {
       return EventPortDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -8383,17 +7376,17 @@ CORBA::ComponentIR::EventPortDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (EventPortDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return EventPortDef::_nil ();
         }
     }
-  
+
   return EventPortDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::EventPortDef_ptr 
+CORBA::ComponentIR::EventPortDef_ptr
 CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -8403,18 +7396,18 @@ CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
     {
       return EventPortDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       EventPortDef_ptr default_proxy = EventPortDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -8432,7 +7425,7 @@ CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
               EventPortDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -8445,10 +7438,10 @@ CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
               EventPortDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           EventPortDef_ptr,
@@ -8468,7 +7461,7 @@ CORBA::ComponentIR::EventPortDef::_duplicate (EventPortDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -8511,7 +7504,7 @@ CORBA::ComponentIR::EventPortDef::_is_a (
 void *CORBA::ComponentIR::EventPortDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id)
@@ -8558,12 +7551,12 @@ void *CORBA::ComponentIR::EventPortDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -8572,6 +7565,12 @@ const char* CORBA::ComponentIR::EventPortDef::_interface_repository_id (void) co
   return "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::EventPortDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -8582,10 +7581,10 @@ const char* CORBA::ComponentIR::EventPortDef::_interface_repository_id (void) co
     CORBA::SystemException
   ))
 {
-  _TAO_EventPortDef_Proxy_Impl &proxy = 
+  _TAO_EventPortDef_Proxy_Impl &proxy =
     this->the_TAO_EventPortDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.event (
       this
       ACE_ENV_ARG_PARAMETER
@@ -8603,10 +7602,10 @@ void CORBA::ComponentIR::EventPortDef::event (
     CORBA::SystemException
   ))
 {
-  _TAO_EventPortDef_Proxy_Impl &proxy = 
+  _TAO_EventPortDef_Proxy_Impl &proxy =
     this->the_TAO_EventPortDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.event (
       this,
       event
@@ -8625,10 +7624,10 @@ CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_EventPortDef_Proxy_Impl &proxy = 
+  _TAO_EventPortDef_Proxy_Impl &proxy =
     this->the_TAO_EventPortDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_a (
       this,
       event_id
@@ -8643,22 +7642,22 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f4576), 
-  ACE_NTOHL (0x656e7450), 
-  ACE_NTOHL (0x6f727444), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f4576),
+  ACE_NTOHL (0x656e7450),
+  ACE_NTOHL (0x6f727444),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0
     13,
-  ACE_NTOHL (0x4576656e), 
-  ACE_NTOHL (0x74506f72), 
-  ACE_NTOHL (0x74446566), 
+  ACE_NTOHL (0x4576656e),
+  ACE_NTOHL (0x74506f72),
+  ACE_NTOHL (0x74446566),
   ACE_NTOHL (0x0),  // name = EventPortDef
   };
 
@@ -8688,49 +7687,49 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f4576), 
-  ACE_NTOHL (0x656e7450), 
-  ACE_NTOHL (0x6f727444), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f4576),
+  ACE_NTOHL (0x656e7450),
+  ACE_NTOHL (0x6f727444),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
     21,
-  ACE_NTOHL (0x4576656e), 
-  ACE_NTOHL (0x74506f72), 
-  ACE_NTOHL (0x74446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x4576656e),
+  ACE_NTOHL (0x74506f72),
+  ACE_NTOHL (0x74446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = EventPortDescription
   5, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -8739,54 +7738,54 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   6,
-  ACE_NTOHL (0x6576656e), 
+  ACE_NTOHL (0x6576656e),
   ACE_NTOHL (0x74000000),  // name = event
     0xffffffff, // indirection
   0xffffff30, // negative offset (-208)
@@ -8811,7 +7810,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ComponentIR::EventPortDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -8821,12 +7820,43 @@ void CORBA::ComponentIR::EventPortDescription::_tao_any_destructor (void *_tao_v
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      EventPortDescription
+    >;
+
+template class
+  TAO_Out_T<
+      EventPortDescription,
+      EventPortDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      EventPortDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      EventPortDescription, \
+      EventPortDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ComponentIR::EmitsDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::EmitsDef_ptr
-tao_CORBA_ComponentIR_EmitsDef_duplicate (
+CORBA::ComponentIR::tao_EmitsDef_life::tao_duplicate (
     CORBA::ComponentIR::EmitsDef_ptr p
   )
 {
@@ -8834,7 +7864,7 @@ tao_CORBA_ComponentIR_EmitsDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_EmitsDef_release (
+CORBA::ComponentIR::tao_EmitsDef_life::tao_release (
     CORBA::ComponentIR::EmitsDef_ptr p
   )
 {
@@ -8842,228 +7872,64 @@ tao_CORBA_ComponentIR_EmitsDef_release (
 }
 
 CORBA::ComponentIR::EmitsDef_ptr
-tao_CORBA_ComponentIR_EmitsDef_nil (
+CORBA::ComponentIR::tao_EmitsDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::EmitsDef::_nil ();
 }
 
-CORBA::ComponentIR::EmitsDef_ptr
-tao_CORBA_ComponentIR_EmitsDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_EmitsDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::EmitsDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::EmitsDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_EmitsDef_marshal (
+CORBA::ComponentIR::tao_EmitsDef_life::tao_marshal (
     CORBA::ComponentIR::EmitsDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::EmitsDef_var
-// *************************************************************
-
-CORBA::ComponentIR::EmitsDef_var::EmitsDef_var (void)
-  : ptr_ (EmitsDef::_nil ())
-{}
-
-::CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::EmitsDef_var::EmitsDef_var (const ::CORBA::ComponentIR::EmitsDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (EmitsDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::EmitsDef_var::~EmitsDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::EmitsDef_var &
-CORBA::ComponentIR::EmitsDef_var::operator= (EmitsDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::EmitsDef_var &
-CORBA::ComponentIR::EmitsDef_var::operator= (const ::CORBA::ComponentIR::EmitsDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::EmitsDef_var::operator const ::CORBA::ComponentIR::EmitsDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::EmitsDef_var::operator ::CORBA::ComponentIR::EmitsDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef_var::operator-> (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr &
-CORBA::ComponentIR::EmitsDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr &
-CORBA::ComponentIR::EmitsDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::EmitsDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef_var::tao_duplicate (EmitsDef_ptr p)
-{
-  return ::CORBA::ComponentIR::EmitsDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::EmitsDef_var::tao_release (EmitsDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::EmitsDef::_nil ();
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef_var::tao_narrow (
+CORBA::ComponentIR::EmitsDef_ptr
+CORBA::ComponentIR::tao_EmitsDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::EmitsDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_EmitsDef_cast::tao_upcast (
+    void *src
+  )
 {
-  EmitsDef **tmp =
-    ACE_static_cast (EmitsDef **, src);
+  CORBA::ComponentIR::EmitsDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::EmitsDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::EmitsDef_out
-// *************************************************************
-
-CORBA::ComponentIR::EmitsDef_out::EmitsDef_out (EmitsDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_nil ();
-}
-
-CORBA::ComponentIR::EmitsDef_out::EmitsDef_out (EmitsDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_nil ();
-}
-
-CORBA::ComponentIR::EmitsDef_out::EmitsDef_out (const ::CORBA::ComponentIR::EmitsDef_out &p)
-  : ptr_ (ACE_const_cast (EmitsDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::EmitsDef_out &
-CORBA::ComponentIR::EmitsDef_out::operator= (const ::CORBA::ComponentIR::EmitsDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (EmitsDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::EmitsDef_out &
-CORBA::ComponentIR::EmitsDef_out::operator= (const ::CORBA::ComponentIR::EmitsDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::EmitsDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::EmitsDef_out &
-CORBA::ComponentIR::EmitsDef_out::operator= (EmitsDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::EmitsDef_out::operator ::CORBA::ComponentIR::EmitsDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr &
-CORBA::ComponentIR::EmitsDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::EmitsDef_ptr
-CORBA::ComponentIR::EmitsDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::EmitsDef,
+        CORBA::ComponentIR::tao_EmitsDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::EmitsDef,
+        CORBA::ComponentIR::tao_EmitsDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::EmitsDef, \
+        CORBA::ComponentIR::tao_EmitsDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::EmitsDef, \
+        CORBA::ComponentIR::tao_EmitsDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -9076,7 +7942,7 @@ CORBA::ComponentIR::EmitsDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
@@ -9088,7 +7954,7 @@ CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -9139,8 +8005,8 @@ CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::EmitsDef::EmitsDef (int collocated)
 {
@@ -9156,14 +8022,14 @@ CORBA::ComponentIR::EmitsDef::CORBA_ComponentIR_EmitsDef_setup_collocation (int
   else
     this->the_TAO_EmitsDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_ComponentIR_EventPortDef_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::EmitsDef::~EmitsDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EmitsDef *tmp = ACE_static_cast (EmitsDef *, _tao_void_pointer);
@@ -9180,7 +8046,7 @@ CORBA::ComponentIR::EmitsDef::_narrow (
     {
       return EmitsDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -9189,17 +8055,17 @@ CORBA::ComponentIR::EmitsDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (EmitsDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return EmitsDef::_nil ();
         }
     }
-  
+
   return EmitsDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::EmitsDef_ptr 
+CORBA::ComponentIR::EmitsDef_ptr
 CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -9209,18 +8075,18 @@ CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
     {
       return EmitsDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       EmitsDef_ptr default_proxy = EmitsDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -9238,7 +8104,7 @@ CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
               EmitsDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -9251,10 +8117,10 @@ CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
               EmitsDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           EmitsDef_ptr,
@@ -9274,7 +8140,7 @@ CORBA::ComponentIR::EmitsDef::_duplicate (EmitsDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -9321,7 +8187,7 @@ CORBA::ComponentIR::EmitsDef::_is_a (
 void *CORBA::ComponentIR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, EmitsDef)::_tao_class_id)
@@ -9382,12 +8248,12 @@ void *CORBA::ComponentIR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -9396,6 +8262,12 @@ const char* CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -9403,20 +8275,20 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EmitsDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f456d), 
-  ACE_NTOHL (0x69747344), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f456d),
+  ACE_NTOHL (0x69747344),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0
     9,
-  ACE_NTOHL (0x456d6974), 
-  ACE_NTOHL (0x73446566), 
+  ACE_NTOHL (0x456d6974),
+  ACE_NTOHL (0x73446566),
   ACE_NTOHL (0x0),  // name = EmitsDef
   };
 
@@ -9445,7 +8317,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::PublishesDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::PublishesDef_ptr
-tao_CORBA_ComponentIR_PublishesDef_duplicate (
+CORBA::ComponentIR::tao_PublishesDef_life::tao_duplicate (
     CORBA::ComponentIR::PublishesDef_ptr p
   )
 {
@@ -9453,7 +8325,7 @@ tao_CORBA_ComponentIR_PublishesDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_PublishesDef_release (
+CORBA::ComponentIR::tao_PublishesDef_life::tao_release (
     CORBA::ComponentIR::PublishesDef_ptr p
   )
 {
@@ -9461,228 +8333,64 @@ tao_CORBA_ComponentIR_PublishesDef_release (
 }
 
 CORBA::ComponentIR::PublishesDef_ptr
-tao_CORBA_ComponentIR_PublishesDef_nil (
+CORBA::ComponentIR::tao_PublishesDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::PublishesDef::_nil ();
 }
 
-CORBA::ComponentIR::PublishesDef_ptr
-tao_CORBA_ComponentIR_PublishesDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_PublishesDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::PublishesDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::PublishesDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_PublishesDef_marshal (
+CORBA::ComponentIR::tao_PublishesDef_life::tao_marshal (
     CORBA::ComponentIR::PublishesDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::PublishesDef_var
-// *************************************************************
-
-CORBA::ComponentIR::PublishesDef_var::PublishesDef_var (void)
-  : ptr_ (PublishesDef::_nil ())
-{}
-
-::CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::PublishesDef_var::PublishesDef_var (const ::CORBA::ComponentIR::PublishesDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (PublishesDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::PublishesDef_var::~PublishesDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::PublishesDef_var &
-CORBA::ComponentIR::PublishesDef_var::operator= (PublishesDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::PublishesDef_var &
-CORBA::ComponentIR::PublishesDef_var::operator= (const ::CORBA::ComponentIR::PublishesDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::PublishesDef_var::operator const ::CORBA::ComponentIR::PublishesDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::PublishesDef_var::operator ::CORBA::ComponentIR::PublishesDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr &
-CORBA::ComponentIR::PublishesDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr &
-CORBA::ComponentIR::PublishesDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::PublishesDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef_var::tao_duplicate (PublishesDef_ptr p)
-{
-  return ::CORBA::ComponentIR::PublishesDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::PublishesDef_var::tao_release (PublishesDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::PublishesDef::_nil ();
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef_var::tao_narrow (
+CORBA::ComponentIR::PublishesDef_ptr
+CORBA::ComponentIR::tao_PublishesDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::PublishesDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_PublishesDef_cast::tao_upcast (
+    void *src
+  )
 {
-  PublishesDef **tmp =
-    ACE_static_cast (PublishesDef **, src);
+  CORBA::ComponentIR::PublishesDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::PublishesDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::PublishesDef_out
-// *************************************************************
-
-CORBA::ComponentIR::PublishesDef_out::PublishesDef_out (PublishesDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_nil ();
-}
-
-CORBA::ComponentIR::PublishesDef_out::PublishesDef_out (PublishesDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_nil ();
-}
-
-CORBA::ComponentIR::PublishesDef_out::PublishesDef_out (const ::CORBA::ComponentIR::PublishesDef_out &p)
-  : ptr_ (ACE_const_cast (PublishesDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::PublishesDef_out &
-CORBA::ComponentIR::PublishesDef_out::operator= (const ::CORBA::ComponentIR::PublishesDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (PublishesDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::PublishesDef_out &
-CORBA::ComponentIR::PublishesDef_out::operator= (const ::CORBA::ComponentIR::PublishesDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::PublishesDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::PublishesDef_out &
-CORBA::ComponentIR::PublishesDef_out::operator= (PublishesDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::PublishesDef_out::operator ::CORBA::ComponentIR::PublishesDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr &
-CORBA::ComponentIR::PublishesDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::PublishesDef_ptr
-CORBA::ComponentIR::PublishesDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::PublishesDef,
+        CORBA::ComponentIR::tao_PublishesDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::PublishesDef,
+        CORBA::ComponentIR::tao_PublishesDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::PublishesDef, \
+        CORBA::ComponentIR::tao_PublishesDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::PublishesDef, \
+        CORBA::ComponentIR::tao_PublishesDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -9695,7 +8403,7 @@ CORBA::ComponentIR::PublishesDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
@@ -9707,7 +8415,7 @@ CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remot
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -9758,8 +8466,8 @@ CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::PublishesDef::PublishesDef (int collocated)
 {
@@ -9775,14 +8483,14 @@ CORBA::ComponentIR::PublishesDef::CORBA_ComponentIR_PublishesDef_setup_collocati
   else
     this->the_TAO_PublishesDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_ComponentIR_EventPortDef_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::PublishesDef::~PublishesDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PublishesDef *tmp = ACE_static_cast (PublishesDef *, _tao_void_pointer);
@@ -9799,7 +8507,7 @@ CORBA::ComponentIR::PublishesDef::_narrow (
     {
       return PublishesDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -9808,17 +8516,17 @@ CORBA::ComponentIR::PublishesDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (PublishesDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return PublishesDef::_nil ();
         }
     }
-  
+
   return PublishesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::PublishesDef_ptr 
+CORBA::ComponentIR::PublishesDef_ptr
 CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -9828,18 +8536,18 @@ CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
     {
       return PublishesDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       PublishesDef_ptr default_proxy = PublishesDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -9857,7 +8565,7 @@ CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
               PublishesDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -9870,10 +8578,10 @@ CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
               PublishesDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           PublishesDef_ptr,
@@ -9893,7 +8601,7 @@ CORBA::ComponentIR::PublishesDef::_duplicate (PublishesDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -9940,7 +8648,7 @@ CORBA::ComponentIR::PublishesDef::_is_a (
 void *CORBA::ComponentIR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, PublishesDef)::_tao_class_id)
@@ -10001,12 +8709,12 @@ void *CORBA::ComponentIR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -10015,6 +8723,12 @@ const char* CORBA::ComponentIR::PublishesDef::_interface_repository_id (void) co
   return "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -10022,22 +8736,22 @@ static const CORBA::Long _oc_CORBA_ComponentIR_PublishesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f5075), 
-  ACE_NTOHL (0x626c6973), 
-  ACE_NTOHL (0x68657344), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f5075),
+  ACE_NTOHL (0x626c6973),
+  ACE_NTOHL (0x68657344),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0
     13,
-  ACE_NTOHL (0x5075626c), 
-  ACE_NTOHL (0x69736865), 
-  ACE_NTOHL (0x73446566), 
+  ACE_NTOHL (0x5075626c),
+  ACE_NTOHL (0x69736865),
+  ACE_NTOHL (0x73446566),
   ACE_NTOHL (0x0),  // name = PublishesDef
   };
 
@@ -10066,7 +8780,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::ConsumesDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::ConsumesDef_ptr
-tao_CORBA_ComponentIR_ConsumesDef_duplicate (
+CORBA::ComponentIR::tao_ConsumesDef_life::tao_duplicate (
     CORBA::ComponentIR::ConsumesDef_ptr p
   )
 {
@@ -10074,7 +8788,7 @@ tao_CORBA_ComponentIR_ConsumesDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_ConsumesDef_release (
+CORBA::ComponentIR::tao_ConsumesDef_life::tao_release (
     CORBA::ComponentIR::ConsumesDef_ptr p
   )
 {
@@ -10082,228 +8796,64 @@ tao_CORBA_ComponentIR_ConsumesDef_release (
 }
 
 CORBA::ComponentIR::ConsumesDef_ptr
-tao_CORBA_ComponentIR_ConsumesDef_nil (
+CORBA::ComponentIR::tao_ConsumesDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::ConsumesDef::_nil ();
 }
 
-CORBA::ComponentIR::ConsumesDef_ptr
-tao_CORBA_ComponentIR_ConsumesDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_ConsumesDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::ConsumesDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::ConsumesDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_ConsumesDef_marshal (
+CORBA::ComponentIR::tao_ConsumesDef_life::tao_marshal (
     CORBA::ComponentIR::ConsumesDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::ConsumesDef_var
-// *************************************************************
-
-CORBA::ComponentIR::ConsumesDef_var::ConsumesDef_var (void)
-  : ptr_ (ConsumesDef::_nil ())
-{}
-
-::CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::ConsumesDef_var::ConsumesDef_var (const ::CORBA::ComponentIR::ConsumesDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ConsumesDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::ConsumesDef_var::~ConsumesDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::ConsumesDef_var &
-CORBA::ComponentIR::ConsumesDef_var::operator= (ConsumesDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::ConsumesDef_var &
-CORBA::ComponentIR::ConsumesDef_var::operator= (const ::CORBA::ComponentIR::ConsumesDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::ConsumesDef_var::operator const ::CORBA::ComponentIR::ConsumesDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::ConsumesDef_var::operator ::CORBA::ComponentIR::ConsumesDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr &
-CORBA::ComponentIR::ConsumesDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr &
-CORBA::ComponentIR::ConsumesDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::ConsumesDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_nil ();
-  return val;
+  return p->marshal (cdr);
 }
 
-::CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef_var::tao_duplicate (ConsumesDef_ptr p)
-{
-  return ::CORBA::ComponentIR::ConsumesDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::ConsumesDef_var::tao_release (ConsumesDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::ConsumesDef::_nil ();
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef_var::tao_narrow (
+CORBA::ComponentIR::ConsumesDef_ptr
+CORBA::ComponentIR::tao_ConsumesDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::ConsumesDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_ConsumesDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ConsumesDef **tmp =
-    ACE_static_cast (ConsumesDef **, src);
+  CORBA::ComponentIR::ConsumesDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::ConsumesDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::ConsumesDef_out
-// *************************************************************
-
-CORBA::ComponentIR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_nil ();
-}
-
-CORBA::ComponentIR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_nil ();
-}
-
-CORBA::ComponentIR::ConsumesDef_out::ConsumesDef_out (const ::CORBA::ComponentIR::ConsumesDef_out &p)
-  : ptr_ (ACE_const_cast (ConsumesDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::ConsumesDef_out &
-CORBA::ComponentIR::ConsumesDef_out::operator= (const ::CORBA::ComponentIR::ConsumesDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ConsumesDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::ConsumesDef_out &
-CORBA::ComponentIR::ConsumesDef_out::operator= (const ::CORBA::ComponentIR::ConsumesDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::ConsumesDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::ConsumesDef_out &
-CORBA::ComponentIR::ConsumesDef_out::operator= (ConsumesDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::ConsumesDef_out::operator ::CORBA::ComponentIR::ConsumesDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr &
-CORBA::ComponentIR::ConsumesDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ConsumesDef_ptr
-CORBA::ComponentIR::ConsumesDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::ConsumesDef,
+        CORBA::ComponentIR::tao_ConsumesDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::ConsumesDef,
+        CORBA::ComponentIR::tao_ConsumesDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::ConsumesDef, \
+        CORBA::ComponentIR::tao_ConsumesDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::ConsumesDef, \
+        CORBA::ComponentIR::tao_ConsumesDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -10316,7 +8866,7 @@ CORBA::ComponentIR::ConsumesDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
@@ -10328,7 +8878,7 @@ CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -10379,8 +8929,8 @@ CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::ConsumesDef::ConsumesDef (int collocated)
 {
@@ -10396,14 +8946,14 @@ CORBA::ComponentIR::ConsumesDef::CORBA_ComponentIR_ConsumesDef_setup_collocation
   else
     this->the_TAO_ConsumesDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_ComponentIR_EventPortDef_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConsumesDef *tmp = ACE_static_cast (ConsumesDef *, _tao_void_pointer);
@@ -10420,7 +8970,7 @@ CORBA::ComponentIR::ConsumesDef::_narrow (
     {
       return ConsumesDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -10429,17 +8979,17 @@ CORBA::ComponentIR::ConsumesDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ConsumesDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ConsumesDef::_nil ();
         }
     }
-  
+
   return ConsumesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::ConsumesDef_ptr 
+CORBA::ComponentIR::ConsumesDef_ptr
 CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -10449,18 +8999,18 @@ CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
     {
       return ConsumesDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ConsumesDef_ptr default_proxy = ConsumesDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -10478,7 +9028,7 @@ CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
               ConsumesDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -10491,10 +9041,10 @@ CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
               ConsumesDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ConsumesDef_ptr,
@@ -10514,7 +9064,7 @@ CORBA::ComponentIR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -10561,7 +9111,7 @@ CORBA::ComponentIR::ConsumesDef::_is_a (
 void *CORBA::ComponentIR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, ConsumesDef)::_tao_class_id)
@@ -10622,12 +9172,12 @@ void *CORBA::ComponentIR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -10636,6 +9186,12 @@ const char* CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void) con
   return "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -10643,21 +9199,21 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ConsumesDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f436f), 
-  ACE_NTOHL (0x6e73756d), 
-  ACE_NTOHL (0x65734465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f436f),
+  ACE_NTOHL (0x6e73756d),
+  ACE_NTOHL (0x65734465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0
     12,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x756d6573), 
+  ACE_NTOHL (0x436f6e73),
+  ACE_NTOHL (0x756d6573),
   ACE_NTOHL (0x44656600),  // name = ConsumesDef
   };
 
@@ -10686,7 +9242,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::ComponentDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::ComponentDef_ptr
-tao_CORBA_ComponentIR_ComponentDef_duplicate (
+CORBA::ComponentIR::tao_ComponentDef_life::tao_duplicate (
     CORBA::ComponentIR::ComponentDef_ptr p
   )
 {
@@ -10694,7 +9250,7 @@ tao_CORBA_ComponentIR_ComponentDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_ComponentDef_release (
+CORBA::ComponentIR::tao_ComponentDef_life::tao_release (
     CORBA::ComponentIR::ComponentDef_ptr p
   )
 {
@@ -10702,228 +9258,64 @@ tao_CORBA_ComponentIR_ComponentDef_release (
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-tao_CORBA_ComponentIR_ComponentDef_nil (
+CORBA::ComponentIR::tao_ComponentDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::ComponentDef::_nil ();
 }
 
-CORBA::ComponentIR::ComponentDef_ptr
-tao_CORBA_ComponentIR_ComponentDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_ComponentDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::ComponentDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::ComponentDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_ComponentDef_marshal (
+CORBA::ComponentIR::tao_ComponentDef_life::tao_marshal (
     CORBA::ComponentIR::ComponentDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::ComponentDef_var
-// *************************************************************
-
-CORBA::ComponentIR::ComponentDef_var::ComponentDef_var (void)
-  : ptr_ (ComponentDef::_nil ())
-{}
-
-::CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef_var::ptr (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-CORBA::ComponentIR::ComponentDef_var::ComponentDef_var (const ::CORBA::ComponentIR::ComponentDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ComponentDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::ComponentDef_var::~ComponentDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::ComponentDef_var &
-CORBA::ComponentIR::ComponentDef_var::operator= (ComponentDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::ComponentDef_var &
-CORBA::ComponentIR::ComponentDef_var::operator= (const ::CORBA::ComponentIR::ComponentDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::ComponentDef_var::operator const ::CORBA::ComponentIR::ComponentDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::ComponentDef_var::operator ::CORBA::ComponentIR::ComponentDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr &
-CORBA::ComponentIR::ComponentDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr &
-CORBA::ComponentIR::ComponentDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::ComponentDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef_var::tao_duplicate (ComponentDef_ptr p)
-{
-  return ::CORBA::ComponentIR::ComponentDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::ComponentDef_var::tao_release (ComponentDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::ComponentDef::_nil ();
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef_var::tao_narrow (
+CORBA::ComponentIR::ComponentDef_ptr
+CORBA::ComponentIR::tao_ComponentDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::ComponentDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_ComponentDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ComponentDef **tmp =
-    ACE_static_cast (ComponentDef **, src);
+  CORBA::ComponentIR::ComponentDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::ComponentDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::ComponentDef_out
-// *************************************************************
-
-CORBA::ComponentIR::ComponentDef_out::ComponentDef_out (ComponentDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_nil ();
-}
-
-CORBA::ComponentIR::ComponentDef_out::ComponentDef_out (ComponentDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_nil ();
-}
-
-CORBA::ComponentIR::ComponentDef_out::ComponentDef_out (const ::CORBA::ComponentIR::ComponentDef_out &p)
-  : ptr_ (ACE_const_cast (ComponentDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::ComponentDef_out &
-CORBA::ComponentIR::ComponentDef_out::operator= (const ::CORBA::ComponentIR::ComponentDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ComponentDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::ComponentDef_out &
-CORBA::ComponentIR::ComponentDef_out::operator= (const ::CORBA::ComponentIR::ComponentDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::ComponentDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::ComponentDef_out &
-CORBA::ComponentIR::ComponentDef_out::operator= (ComponentDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::ComponentDef_out::operator ::CORBA::ComponentIR::ComponentDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr &
-CORBA::ComponentIR::ComponentDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::ComponentDef_ptr
-CORBA::ComponentIR::ComponentDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::ComponentDef,
+        CORBA::ComponentIR::tao_ComponentDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::ComponentDef,
+        CORBA::ComponentIR::tao_ComponentDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::ComponentDef, \
+        CORBA::ComponentIR::tao_ComponentDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::ComponentDef, \
+        CORBA::ComponentIR::tao_ComponentDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -10943,29 +9335,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::ComponentDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get &);
-    
+
     ::CORBA::ComponentIR::ComponentDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -10978,7 +9370,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::argumen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -10990,11 +9382,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::excepti
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11003,17 +9395,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::result
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::result (::CORBA::ComponentIR::ComponentDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11031,10 +9423,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -11043,15 +9435,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set &);
     CORBA::ComponentIR::ComponentDef_ptr base_component_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::ComponentIR::ComponentDef_ptr base_component
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       base_component_ (base_component)
@@ -11065,15 +9457,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::argumen
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->base_component_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11085,11 +9477,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::excepti
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11098,7 +9490,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::result
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -11117,29 +9509,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDefSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get &);
-    
+
     ::CORBA::InterfaceDefSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -11152,7 +9544,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -11164,11 +9556,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11177,17 +9569,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11205,10 +9597,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -11217,15 +9609,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set &);
     const CORBA::InterfaceDefSeq & supported_interfaces_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::InterfaceDefSeq & supported_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       supported_interfaces_ (supported_interfaces)
@@ -11239,15 +9631,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->supported_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11259,11 +9651,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11272,7 +9664,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -11295,15 +9687,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::ProvidesDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides &);
@@ -11311,13 +9703,13 @@ public:
     const char * name_;
     const char * version_;
     CORBA::InterfaceDef_ptr interface_type_;
-    
+
     ::CORBA::ComponentIR::ProvidesDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11325,7 +9717,7 @@ public:
       const char * name,
       const char * version,
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11342,27 +9734,27 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->interface_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11374,11 +9766,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::exceptions
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11387,17 +9779,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::result (AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::result (::CORBA::ComponentIR::ProvidesDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11419,15 +9811,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::UsesDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses &);
@@ -11436,13 +9828,13 @@ public:
     const char * version_;
     CORBA::InterfaceDef_ptr interface_type_;
     const CORBA::Boolean & is_multiple_;
-    
+
     ::CORBA::ComponentIR::UsesDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11451,7 +9843,7 @@ public:
       const char * version,
       CORBA::InterfaceDef_ptr interface_type,
       const CORBA::Boolean & is_multiple
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11469,31 +9861,31 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::arguments (ACE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->interface_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11505,11 +9897,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::exceptions (AC
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11518,17 +9910,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::result (ACE_EN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::result (::CORBA::ComponentIR::UsesDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11549,15 +9941,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::EmitsDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits &);
@@ -11565,13 +9957,13 @@ public:
     const char * name_;
     const char * version_;
     CORBA::ComponentIR::EventDef_ptr event_;
-    
+
     ::CORBA::ComponentIR::EmitsDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11579,7 +9971,7 @@ public:
       const char * name,
       const char * version,
       CORBA::ComponentIR::EventDef_ptr event
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11596,27 +9988,27 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::arguments (AC
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->event_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11628,11 +10020,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::exceptions (A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11641,17 +10033,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::result (ACE_E
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::result (::CORBA::ComponentIR::EmitsDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11672,15 +10064,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::PublishesDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes &);
@@ -11688,13 +10080,13 @@ public:
     const char * name_;
     const char * version_;
     CORBA::ComponentIR::EventDef_ptr event_;
-    
+
     ::CORBA::ComponentIR::PublishesDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11702,7 +10094,7 @@ public:
       const char * name,
       const char * version,
       CORBA::ComponentIR::EventDef_ptr event
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11719,27 +10111,27 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->event_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11751,11 +10143,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::exception
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11764,17 +10156,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::result (A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::result (::CORBA::ComponentIR::PublishesDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11795,15 +10187,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::ConsumesDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes &);
@@ -11811,13 +10203,13 @@ public:
     const char * name_;
     const char * version_;
     CORBA::ComponentIR::EventDef_ptr event_;
-    
+
     ::CORBA::ComponentIR::ConsumesDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -11825,7 +10217,7 @@ public:
       const char * name,
       const char * version,
       CORBA::ComponentIR::EventDef_ptr event
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -11842,27 +10234,27 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->event_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -11874,11 +10266,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::exceptions
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -11887,17 +10279,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::result (AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::result (::CORBA::ComponentIR::ConsumesDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -11907,7 +10299,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::result (::
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
@@ -11931,12 +10323,12 @@ CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remot
 {
   CORBA::ComponentIR::ComponentDef_var _tao_retval (CORBA::ComponentIR::ComponentDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_component",
@@ -11944,22 +10336,22 @@ CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remot
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get _tao_ri (
           &_tao_call,
@@ -11967,14 +10359,14 @@ CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remot
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -11982,78 +10374,85 @@ CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remot
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::ComponentDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::ComponentDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -12063,59 +10462,57 @@ CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remot
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -12131,12 +10528,12 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_base_component",
@@ -12144,22 +10541,22 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set _tao_ri (
           &_tao_call,
@@ -12168,14 +10565,14 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -12183,70 +10580,76 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << base_component)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << base_component)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -12256,56 +10659,54 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -12322,18 +10723,18 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
 {
   CORBA::InterfaceDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::InterfaceDefSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_supported_interfaces",
@@ -12341,22 +10742,22 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get _tao_ri (
           &_tao_call,
@@ -12364,14 +10765,14 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -12379,78 +10780,85 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceDefSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceDefSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -12460,59 +10868,57 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -12528,12 +10934,12 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_supported_interfaces",
@@ -12541,22 +10947,22 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set _tao_ri (
           &_tao_call,
@@ -12565,14 +10971,14 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -12580,70 +10986,76 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << supported_interfaces)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << supported_interfaces)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -12653,56 +11065,54 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -12723,12 +11133,12 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
 {
   CORBA::ComponentIR::ProvidesDef_var _tao_retval (CORBA::ComponentIR::ProvidesDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_provides",
@@ -12736,22 +11146,22 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides _tao_ri (
           &_tao_call,
@@ -12763,14 +11173,14 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -12778,94 +11188,98 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << interface_type)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << interface_type)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::ProvidesDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::ProvidesDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -12875,59 +11289,57 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -12948,12 +11360,12 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
 {
   CORBA::ComponentIR::UsesDef_var _tao_retval (CORBA::ComponentIR::UsesDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_uses",
@@ -12961,22 +11373,22 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses _tao_ri (
           &_tao_call,
@@ -12989,14 +11401,14 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13004,95 +11416,99 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << interface_type) &&
-              (_tao_out << CORBA::Any::from_boolean (is_multiple))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << interface_type) &&
+                  (_tao_out << CORBA::Any::from_boolean (is_multiple))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::UsesDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::UsesDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13102,59 +11518,57 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13174,12 +11588,12 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
 {
   CORBA::ComponentIR::EmitsDef_var _tao_retval (CORBA::ComponentIR::EmitsDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_emits",
@@ -13187,22 +11601,22 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits _tao_ri (
           &_tao_call,
@@ -13214,14 +11628,14 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13229,94 +11643,98 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << event)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << event)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::EmitsDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::EmitsDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13326,59 +11744,57 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13398,12 +11814,12 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
 {
   CORBA::ComponentIR::PublishesDef_var _tao_retval (CORBA::ComponentIR::PublishesDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_publishes",
@@ -13411,22 +11827,22 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes _tao_ri (
           &_tao_call,
@@ -13438,14 +11854,14 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13453,94 +11869,98 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << event)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << event)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::PublishesDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::PublishesDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13550,59 +11970,57 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13622,12 +12040,12 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
 {
   CORBA::ComponentIR::ConsumesDef_var _tao_retval (CORBA::ComponentIR::ConsumesDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_consumes",
@@ -13635,22 +12053,22 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
       4,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes _tao_ri (
           &_tao_call,
@@ -13662,14 +12080,14 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13677,94 +12095,98 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << event)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << event)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::ConsumesDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::ConsumesDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13774,63 +12196,61 @@ void CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfac
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -13881,8 +12301,8 @@ CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::ComponentDef::ComponentDef (int collocated)
 {
@@ -13898,14 +12318,14 @@ CORBA::ComponentIR::ComponentDef::CORBA_ComponentIR_ComponentDef_setup_collocati
   else
     this->the_TAO_ComponentDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_ExtInterfaceDef_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ComponentDef *tmp = ACE_static_cast (ComponentDef *, _tao_void_pointer);
@@ -13922,7 +12342,7 @@ CORBA::ComponentIR::ComponentDef::_narrow (
     {
       return ComponentDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -13931,17 +12351,17 @@ CORBA::ComponentIR::ComponentDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ComponentDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ComponentDef::_nil ();
         }
     }
-  
+
   return ComponentDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::ComponentDef_ptr 
+CORBA::ComponentIR::ComponentDef_ptr
 CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -13951,18 +12371,18 @@ CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
     {
       return ComponentDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ComponentDef_ptr default_proxy = ComponentDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -13980,7 +12400,7 @@ CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
               ComponentDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -13993,10 +12413,10 @@ CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
               ComponentDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ComponentDef_ptr,
@@ -14016,7 +12436,7 @@ CORBA::ComponentIR::ComponentDef::_duplicate (ComponentDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -14079,7 +12499,7 @@ CORBA::ComponentIR::ComponentDef::_is_a (
 void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, ComponentDef)::_tao_class_id)
@@ -14196,12 +12616,12 @@ void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -14210,6 +12630,12 @@ const char* CORBA::ComponentIR::ComponentDef::_interface_repository_id (void) co
   return "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::ComponentDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -14220,10 +12646,10 @@ const char* CORBA::ComponentIR::ComponentDef::_interface_repository_id (void) co
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.base_component (
       this
       ACE_ENV_ARG_PARAMETER
@@ -14241,10 +12667,10 @@ void CORBA::ComponentIR::ComponentDef::base_component (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.base_component (
       this,
       base_component
@@ -14262,10 +12688,10 @@ void CORBA::ComponentIR::ComponentDef::base_component (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.supported_interfaces (
       this
       ACE_ENV_ARG_PARAMETER
@@ -14283,10 +12709,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.supported_interfaces (
       this,
       supported_interfaces
@@ -14308,10 +12734,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_provides (
       this,
       id,
@@ -14337,10 +12763,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_uses (
       this,
       id,
@@ -14366,10 +12792,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_emits (
       this,
       id,
@@ -14394,10 +12820,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_publishes (
       this,
       id,
@@ -14422,10 +12848,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ComponentDef_Proxy_Impl &proxy = 
+  _TAO_ComponentDef_Proxy_Impl &proxy =
     this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_consumes (
       this,
       id,
@@ -14443,22 +12869,22 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7444), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7444),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0
     13,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74446566), 
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x74446566),
   ACE_NTOHL (0x0),  // name = ComponentDef
   };
 
@@ -14481,117 +12907,39 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_
-
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ComponentIR::ProvidesDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ComponentIR::ProvidesDescription *old =
-        ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ComponentIR::ProvidesDescription *tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_)
-#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ComponentIR::ProvidesDescriptionSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (void)
 {}
 
 CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::ProvidesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::ProvidesDescription
+      >
+    (max)
 {}
 
 CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ComponentIR::ProvidesDescription *buffer,
+    CORBA::ComponentIR::ProvidesDescription* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::ProvidesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::ProvidesDescription
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (const ProvidesDescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::ProvidesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::ProvidesDescription
+      >
+    (seq)
 {}
 
-CORBA::ComponentIR::ProvidesDescriptionSeq::~ProvidesDescriptionSeq (void) // dtor
+CORBA::ComponentIR::ProvidesDescriptionSeq::~ProvidesDescriptionSeq (void)
 {}
 
 void CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -14600,7 +12948,37 @@ void CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor (void *_tao
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      ProvidesDescriptionSeq,
+      CORBA::ComponentIR::ProvidesDescription
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ProvidesDescriptionSeq,
+      ProvidesDescriptionSeq_var,
+      CORBA::ComponentIR::ProvidesDescription
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ProvidesDescriptionSeq, \
+      CORBA::ComponentIR::ProvidesDescription \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ProvidesDescriptionSeq, \
+      ProvidesDescriptionSeq_var, \
+      CORBA::ComponentIR::ProvidesDescription \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -14609,27 +12987,27 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f5072), 
-  ACE_NTOHL (0x6f766964), 
-  ACE_NTOHL (0x65734465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e536571), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f5072),
+  ACE_NTOHL (0x6f766964),
+  ACE_NTOHL (0x65734465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e536571),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0
     23,
-  ACE_NTOHL (0x50726f76), 
-  ACE_NTOHL (0x69646573), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x50726f76),
+  ACE_NTOHL (0x69646573),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e53),
   ACE_NTOHL (0x65710000),  // name = ProvidesDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   424, // encapsulation length
@@ -14638,48 +13016,48 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescriptionSeq[] =
     408, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       54,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e7449), 
-      ACE_NTOHL (0x522f5072), 
-      ACE_NTOHL (0x6f766964), 
-      ACE_NTOHL (0x65734465), 
-      ACE_NTOHL (0x73637269), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e3a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f436f),
+      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x656e7449),
+      ACE_NTOHL (0x522f5072),
+      ACE_NTOHL (0x6f766964),
+      ACE_NTOHL (0x65734465),
+      ACE_NTOHL (0x73637269),
+      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x6e3a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
             20,
-      ACE_NTOHL (0x50726f76), 
-      ACE_NTOHL (0x69646573), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x50726f76),
+      ACE_NTOHL (0x69646573),
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
       ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
       5, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       3,
@@ -14688,56 +13066,56 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ProvidesDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
             0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5665),
+        ACE_NTOHL (0x7273696f),
+        ACE_NTOHL (0x6e537065),
+        ACE_NTOHL (0x633a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       15,
-      ACE_NTOHL (0x696e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x655f7479), 
+      ACE_NTOHL (0x696e7465),
+      ACE_NTOHL (0x72666163),
+      ACE_NTOHL (0x655f7479),
       ACE_NTOHL (0x70650000),  // name = interface_type
             0xffffffff, // indirection
       0xffffff28, // negative offset (-216)
@@ -14765,117 +13143,39 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_
-
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ComponentIR::UsesDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ComponentIR::UsesDescription *old =
-        ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ComponentIR::UsesDescription *tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_)
-#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ComponentIR::UsesDescriptionSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (void)
 {}
 
 CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::UsesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::UsesDescription
+      >
+    (max)
 {}
 
 CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ComponentIR::UsesDescription *buffer,
+    CORBA::ComponentIR::UsesDescription* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::UsesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::UsesDescription
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (const UsesDescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::UsesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::UsesDescription
+      >
+    (seq)
 {}
 
-CORBA::ComponentIR::UsesDescriptionSeq::~UsesDescriptionSeq (void) // dtor
+CORBA::ComponentIR::UsesDescriptionSeq::~UsesDescriptionSeq (void)
 {}
 
 void CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -14884,7 +13184,37 @@ void CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor (void *_tao_voi
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      UsesDescriptionSeq,
+      CORBA::ComponentIR::UsesDescription
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      UsesDescriptionSeq,
+      UsesDescriptionSeq_var,
+      CORBA::ComponentIR::UsesDescription
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      UsesDescriptionSeq, \
+      CORBA::ComponentIR::UsesDescription \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      UsesDescriptionSeq, \
+      UsesDescriptionSeq_var, \
+      CORBA::ComponentIR::UsesDescription \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -14893,25 +13223,25 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f5573), 
-  ACE_NTOHL (0x65734465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e536571), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f5573),
+  ACE_NTOHL (0x65734465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e536571),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0
     19,
-  ACE_NTOHL (0x55736573), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x55736573),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e53),
   ACE_NTOHL (0x65710000),  // name = UsesDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   436, // encapsulation length
@@ -14920,46 +13250,46 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescriptionSeq[] =
     420, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       50,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e7449), 
-      ACE_NTOHL (0x522f5573), 
-      ACE_NTOHL (0x65734465), 
-      ACE_NTOHL (0x73637269), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e3a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f436f),
+      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x656e7449),
+      ACE_NTOHL (0x522f5573),
+      ACE_NTOHL (0x65734465),
+      ACE_NTOHL (0x73637269),
+      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x6e3a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
             16,
-      ACE_NTOHL (0x55736573), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x55736573),
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
       ACE_NTOHL (0x696f6e00),  // name = UsesDescription
       6, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       3,
@@ -14968,62 +13298,62 @@ static const CORBA::Long _oc_CORBA_ComponentIR_UsesDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
             0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5665),
+        ACE_NTOHL (0x7273696f),
+        ACE_NTOHL (0x6e537065),
+        ACE_NTOHL (0x633a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       15,
-      ACE_NTOHL (0x696e7465), 
-      ACE_NTOHL (0x72666163), 
-      ACE_NTOHL (0x655f7479), 
+      ACE_NTOHL (0x696e7465),
+      ACE_NTOHL (0x72666163),
+      ACE_NTOHL (0x655f7479),
       ACE_NTOHL (0x70650000),  // name = interface_type
             0xffffffff, // indirection
       0xffffff28, // negative offset (-216)
       12,
-      ACE_NTOHL (0x69735f6d), 
-      ACE_NTOHL (0x756c7469), 
+      ACE_NTOHL (0x69735f6d),
+      ACE_NTOHL (0x756c7469),
       ACE_NTOHL (0x706c6500),  // name = is_multiple
             CORBA::tk_boolean,
 
@@ -15051,117 +13381,39 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_
-
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ComponentIR::EventPortDescription* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ComponentIR::EventPortDescription *old =
-        ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ComponentIR::EventPortDescription *tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_)
-#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ComponentIR::EventPortDescriptionSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (void)
 {}
 
 CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::EventPortDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::EventPortDescription
+      >
+    (max)
 {}
 
 CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ComponentIR::EventPortDescription *buffer,
+    CORBA::ComponentIR::EventPortDescription* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::EventPortDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::EventPortDescription
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (const EventPortDescriptionSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ComponentIR::EventPortDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::ComponentIR::EventPortDescription
+      >
+    (seq)
 {}
 
-CORBA::ComponentIR::EventPortDescriptionSeq::~EventPortDescriptionSeq (void) // dtor
+CORBA::ComponentIR::EventPortDescriptionSeq::~EventPortDescriptionSeq (void)
 {}
 
 void CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -15170,7 +13422,37 @@ void CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor (void *_ta
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      EventPortDescriptionSeq,
+      CORBA::ComponentIR::EventPortDescription
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      EventPortDescriptionSeq,
+      EventPortDescriptionSeq_var,
+      CORBA::ComponentIR::EventPortDescription
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      EventPortDescriptionSeq, \
+      CORBA::ComponentIR::EventPortDescription \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      EventPortDescriptionSeq, \
+      EventPortDescriptionSeq_var, \
+      CORBA::ComponentIR::EventPortDescription \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -15179,27 +13461,27 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescriptionSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   58,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f4576), 
-  ACE_NTOHL (0x656e7450), 
-  ACE_NTOHL (0x6f727444), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e5365), 
-  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f4576),
+  ACE_NTOHL (0x656e7450),
+  ACE_NTOHL (0x6f727444),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e5365),
+  ACE_NTOHL (0x713a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0
     24,
-  ACE_NTOHL (0x4576656e), 
-  ACE_NTOHL (0x74506f72), 
-  ACE_NTOHL (0x74446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x4576656e),
+  ACE_NTOHL (0x74506f72),
+  ACE_NTOHL (0x74446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x53657100),  // name = EventPortDescriptionSeq
     CORBA::tk_sequence, // typecode kind
   420, // encapsulation length
@@ -15208,49 +13490,49 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescriptionSeq[] =
     404, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       55,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e7449), 
-      ACE_NTOHL (0x522f4576), 
-      ACE_NTOHL (0x656e7450), 
-      ACE_NTOHL (0x6f727444), 
-      ACE_NTOHL (0x65736372), 
-      ACE_NTOHL (0x69707469), 
-      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f436f),
+      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x656e7449),
+      ACE_NTOHL (0x522f4576),
+      ACE_NTOHL (0x656e7450),
+      ACE_NTOHL (0x6f727444),
+      ACE_NTOHL (0x65736372),
+      ACE_NTOHL (0x69707469),
+      ACE_NTOHL (0x6f6e3a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
             21,
-      ACE_NTOHL (0x4576656e), 
-      ACE_NTOHL (0x74506f72), 
-      ACE_NTOHL (0x74446573), 
-      ACE_NTOHL (0x63726970), 
-      ACE_NTOHL (0x74696f6e), 
+      ACE_NTOHL (0x4576656e),
+      ACE_NTOHL (0x74506f72),
+      ACE_NTOHL (0x74446573),
+      ACE_NTOHL (0x63726970),
+      ACE_NTOHL (0x74696f6e),
       ACE_NTOHL (0x0),  // name = EventPortDescription
       5, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       3,
@@ -15259,54 +13541,54 @@ static const CORBA::Long _oc_CORBA_ComponentIR_EventPortDescriptionSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
             0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5665),
+        ACE_NTOHL (0x7273696f),
+        ACE_NTOHL (0x6e537065),
+        ACE_NTOHL (0x633a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       6,
-      ACE_NTOHL (0x6576656e), 
+      ACE_NTOHL (0x6576656e),
       ACE_NTOHL (0x74000000),  // name = event
             0xffffffff, // indirection
       0xffffff30, // negative offset (-208)
@@ -15341,49 +13623,49 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7444), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7444),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0
     21,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x74446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x74446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = ComponentDescription
   13, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -15392,84 +13674,84 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   15,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f636f6d), 
-  ACE_NTOHL (0x706f6e65), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f636f6d),
+  ACE_NTOHL (0x706f6e65),
   ACE_NTOHL (0x6e740000),  // name = base_component
     0xffffffff, // indirection
   0xffffff28, // negative offset (-216)
   21,
-  ACE_NTOHL (0x73757070), 
-  ACE_NTOHL (0x6f727465), 
-  ACE_NTOHL (0x645f696e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636573), 
+  ACE_NTOHL (0x73757070),
+  ACE_NTOHL (0x6f727465),
+  ACE_NTOHL (0x645f696e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636573),
   ACE_NTOHL (0x0),  // name = supported_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
@@ -15480,36 +13762,36 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   20,
-  ACE_NTOHL (0x70726f76), 
-  ACE_NTOHL (0x69646564), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x70726f76),
+  ACE_NTOHL (0x69646564),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = provided_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   320, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     57,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f436f), 
-    ACE_NTOHL (0x6d706f6e), 
-    ACE_NTOHL (0x656e7449), 
-    ACE_NTOHL (0x522f5072), 
-    ACE_NTOHL (0x6f766964), 
-    ACE_NTOHL (0x65734465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f436f),
+    ACE_NTOHL (0x6d706f6e),
+    ACE_NTOHL (0x656e7449),
+    ACE_NTOHL (0x522f5072),
+    ACE_NTOHL (0x6f766964),
+    ACE_NTOHL (0x65734465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0
         23,
-    ACE_NTOHL (0x50726f76), 
-    ACE_NTOHL (0x69646573), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x50726f76),
+    ACE_NTOHL (0x69646573),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x65710000),  // name = ProvidesDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     216, // encapsulation length
@@ -15518,29 +13800,29 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       200, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         54,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f436f), 
-        ACE_NTOHL (0x6d706f6e), 
-        ACE_NTOHL (0x656e7449), 
-        ACE_NTOHL (0x522f5072), 
-        ACE_NTOHL (0x6f766964), 
-        ACE_NTOHL (0x65734465), 
-        ACE_NTOHL (0x73637269), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f436f),
+        ACE_NTOHL (0x6d706f6e),
+        ACE_NTOHL (0x656e7449),
+        ACE_NTOHL (0x522f5072),
+        ACE_NTOHL (0x6f766964),
+        ACE_NTOHL (0x65734465),
+        ACE_NTOHL (0x73637269),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e3a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0
                 20,
-        ACE_NTOHL (0x50726f76), 
-        ACE_NTOHL (0x69646573), 
-        ACE_NTOHL (0x44657363), 
-        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x50726f76),
+        ACE_NTOHL (0x69646573),
+        ACE_NTOHL (0x44657363),
+        ACE_NTOHL (0x72697074),
         ACE_NTOHL (0x696f6e00),  // name = ProvidesDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffd50, // negative offset (-688)
@@ -15549,20 +13831,20 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
                 0xffffffff, // indirection
         0xfffffd94, // negative offset (-620)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffd7c, // negative offset (-644)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffddc, // negative offset (-548)
         15,
-        ACE_NTOHL (0x696e7465), 
-        ACE_NTOHL (0x72666163), 
-        ACE_NTOHL (0x655f7479), 
+        ACE_NTOHL (0x696e7465),
+        ACE_NTOHL (0x72666163),
+        ACE_NTOHL (0x655f7479),
         ACE_NTOHL (0x70650000),  // name = interface_type
                 0xffffffff, // indirection
         0xfffffd4c, // negative offset (-692)
@@ -15571,33 +13853,33 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   16,
-  ACE_NTOHL (0x75736564), 
-  ACE_NTOHL (0x5f696e74), 
-  ACE_NTOHL (0x65726661), 
+  ACE_NTOHL (0x75736564),
+  ACE_NTOHL (0x5f696e74),
+  ACE_NTOHL (0x65726661),
   ACE_NTOHL (0x63657300),  // name = used_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   324, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     53,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f436f), 
-    ACE_NTOHL (0x6d706f6e), 
-    ACE_NTOHL (0x656e7449), 
-    ACE_NTOHL (0x522f5573), 
-    ACE_NTOHL (0x65734465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f436f),
+    ACE_NTOHL (0x6d706f6e),
+    ACE_NTOHL (0x656e7449),
+    ACE_NTOHL (0x522f5573),
+    ACE_NTOHL (0x65734465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0
         19,
-    ACE_NTOHL (0x55736573), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x55736573),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x65710000),  // name = UsesDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     228, // encapsulation length
@@ -15606,27 +13888,27 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       212, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         50,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f436f), 
-        ACE_NTOHL (0x6d706f6e), 
-        ACE_NTOHL (0x656e7449), 
-        ACE_NTOHL (0x522f5573), 
-        ACE_NTOHL (0x65734465), 
-        ACE_NTOHL (0x73637269), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f436f),
+        ACE_NTOHL (0x6d706f6e),
+        ACE_NTOHL (0x656e7449),
+        ACE_NTOHL (0x522f5573),
+        ACE_NTOHL (0x65734465),
+        ACE_NTOHL (0x73637269),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e3a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0
                 16,
-        ACE_NTOHL (0x55736573), 
-        ACE_NTOHL (0x44657363), 
-        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x55736573),
+        ACE_NTOHL (0x44657363),
+        ACE_NTOHL (0x72697074),
         ACE_NTOHL (0x696f6e00),  // name = UsesDescription
         6, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffc04, // negative offset (-1020)
@@ -15635,26 +13917,26 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
                 0xffffffff, // indirection
         0xfffffc48, // negative offset (-952)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffc30, // negative offset (-976)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffc90, // negative offset (-880)
         15,
-        ACE_NTOHL (0x696e7465), 
-        ACE_NTOHL (0x72666163), 
-        ACE_NTOHL (0x655f7479), 
+        ACE_NTOHL (0x696e7465),
+        ACE_NTOHL (0x72666163),
+        ACE_NTOHL (0x655f7479),
         ACE_NTOHL (0x70650000),  // name = interface_type
                 0xffffffff, // indirection
         0xfffffc00, // negative offset (-1024)
         12,
-        ACE_NTOHL (0x69735f6d), 
-        ACE_NTOHL (0x756c7469), 
+        ACE_NTOHL (0x69735f6d),
+        ACE_NTOHL (0x756c7469),
         ACE_NTOHL (0x706c6500),  // name = is_multiple
                 CORBA::tk_boolean,
 
@@ -15663,35 +13945,35 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   13,
-  ACE_NTOHL (0x656d6974), 
-  ACE_NTOHL (0x735f6576), 
-  ACE_NTOHL (0x656e7473), 
+  ACE_NTOHL (0x656d6974),
+  ACE_NTOHL (0x735f6576),
+  ACE_NTOHL (0x656e7473),
   ACE_NTOHL (0x0),  // name = emits_events
     CORBA::tk_alias, // typecode kind for typedefs
   316, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     58,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f436f), 
-    ACE_NTOHL (0x6d706f6e), 
-    ACE_NTOHL (0x656e7449), 
-    ACE_NTOHL (0x522f4576), 
-    ACE_NTOHL (0x656e7450), 
-    ACE_NTOHL (0x6f727444), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f436f),
+    ACE_NTOHL (0x6d706f6e),
+    ACE_NTOHL (0x656e7449),
+    ACE_NTOHL (0x522f4576),
+    ACE_NTOHL (0x656e7450),
+    ACE_NTOHL (0x6f727444),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e5365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0
         24,
-    ACE_NTOHL (0x4576656e), 
-    ACE_NTOHL (0x74506f72), 
-    ACE_NTOHL (0x74446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x4576656e),
+    ACE_NTOHL (0x74506f72),
+    ACE_NTOHL (0x74446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x53657100),  // name = EventPortDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     212, // encapsulation length
@@ -15700,30 +13982,30 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       196, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         55,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f436f), 
-        ACE_NTOHL (0x6d706f6e), 
-        ACE_NTOHL (0x656e7449), 
-        ACE_NTOHL (0x522f4576), 
-        ACE_NTOHL (0x656e7450), 
-        ACE_NTOHL (0x6f727444), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f436f),
+        ACE_NTOHL (0x6d706f6e),
+        ACE_NTOHL (0x656e7449),
+        ACE_NTOHL (0x522f4576),
+        ACE_NTOHL (0x656e7450),
+        ACE_NTOHL (0x6f727444),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0
                 21,
-        ACE_NTOHL (0x4576656e), 
-        ACE_NTOHL (0x74506f72), 
-        ACE_NTOHL (0x74446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4576656e),
+        ACE_NTOHL (0x74506f72),
+        ACE_NTOHL (0x74446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = EventPortDescription
         5, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffa90, // negative offset (-1392)
@@ -15732,18 +14014,18 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
                 0xffffffff, // indirection
         0xfffffad4, // negative offset (-1324)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffabc, // negative offset (-1348)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffb1c, // negative offset (-1252)
         6,
-        ACE_NTOHL (0x6576656e), 
+        ACE_NTOHL (0x6576656e),
         ACE_NTOHL (0x74000000),  // name = event
                 0xffffffff, // indirection
         0xfffffa94, // negative offset (-1388)
@@ -15752,45 +14034,45 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
 
 
   17,
-  ACE_NTOHL (0x7075626c), 
-  ACE_NTOHL (0x69736865), 
-  ACE_NTOHL (0x735f6576), 
-  ACE_NTOHL (0x656e7473), 
+  ACE_NTOHL (0x7075626c),
+  ACE_NTOHL (0x69736865),
+  ACE_NTOHL (0x735f6576),
+  ACE_NTOHL (0x656e7473),
   ACE_NTOHL (0x0),  // name = publishes_events
     0xffffffff, // indirection
   0xfffffea0, // negative offset (-352)
   16,
-  ACE_NTOHL (0x636f6e73), 
-  ACE_NTOHL (0x756d6573), 
-  ACE_NTOHL (0x5f657665), 
+  ACE_NTOHL (0x636f6e73),
+  ACE_NTOHL (0x756d6573),
+  ACE_NTOHL (0x5f657665),
   ACE_NTOHL (0x6e747300),  // name = consumes_events
     0xffffffff, // indirection
   0xfffffe84, // negative offset (-380)
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   744, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4578), 
-    ACE_NTOHL (0x74417474), 
-    ACE_NTOHL (0x72446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4578),
+    ACE_NTOHL (0x74417474),
+    ACE_NTOHL (0x72446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
         22,
-    ACE_NTOHL (0x45787441), 
-    ACE_NTOHL (0x74747244), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x45787441),
+    ACE_NTOHL (0x74747244),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e5365),
     ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     656, // encapsulation length
@@ -15799,28 +14081,28 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
       640, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         46,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x74417474), 
-        ACE_NTOHL (0x72696275), 
-        ACE_NTOHL (0x74654465), 
-        ACE_NTOHL (0x73637269), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x74417474),
+        ACE_NTOHL (0x72696275),
+        ACE_NTOHL (0x74654465),
+        ACE_NTOHL (0x73637269),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e3a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
                 24,
-        ACE_NTOHL (0x45787441), 
-        ACE_NTOHL (0x74747269), 
-        ACE_NTOHL (0x62757465), 
-        ACE_NTOHL (0x44657363), 
-        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x45787441),
+        ACE_NTOHL (0x74747269),
+        ACE_NTOHL (0x62757465),
+        ACE_NTOHL (0x44657363),
+        ACE_NTOHL (0x72697074),
         ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
         8, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff918, // negative offset (-1768)
@@ -15829,77 +14111,77 @@ static const CORBA::Long _oc_CORBA_ComponentIR_ComponentDescription[] =
                 0xffffffff, // indirection
         0xfffff95c, // negative offset (-1700)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffff944, // negative offset (-1724)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffff9a4, // negative offset (-1628)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-          
+
         15,
-        ACE_NTOHL (0x6765745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6765745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
@@ -15908,27 +14190,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             180, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff770, // negative offset (-2192)
@@ -15937,18 +14219,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                             0xffffffff, // indirection
               0xfffff7b4, // negative offset (-2124)
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             0xffffffff, // indirection
               0xfffff79c, // negative offset (-2148)
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
                             0xffffffff, // indirection
               0xfffff7fc, // negative offset (-2052)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -15957,9 +14239,9 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         15,
-        ACE_NTOHL (0x7075745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x7075745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
                 0xffffffff, // indirection
         0xfffffecc, // negative offset (-308)
@@ -15968,7 +14250,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -15993,7 +14275,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ComponentIR::ComponentDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -16003,12 +14285,43 @@ void CORBA::ComponentIR::ComponentDescription::_tao_any_destructor (void *_tao_v
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ComponentDescription
+    >;
+
+template class
+  TAO_Out_T<
+      ComponentDescription,
+      ComponentDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ComponentDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ComponentDescription, \
+      ComponentDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ComponentIR::FactoryDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::FactoryDef_ptr
-tao_CORBA_ComponentIR_FactoryDef_duplicate (
+CORBA::ComponentIR::tao_FactoryDef_life::tao_duplicate (
     CORBA::ComponentIR::FactoryDef_ptr p
   )
 {
@@ -16016,7 +14329,7 @@ tao_CORBA_ComponentIR_FactoryDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_FactoryDef_release (
+CORBA::ComponentIR::tao_FactoryDef_life::tao_release (
     CORBA::ComponentIR::FactoryDef_ptr p
   )
 {
@@ -16024,228 +14337,64 @@ tao_CORBA_ComponentIR_FactoryDef_release (
 }
 
 CORBA::ComponentIR::FactoryDef_ptr
-tao_CORBA_ComponentIR_FactoryDef_nil (
+CORBA::ComponentIR::tao_FactoryDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::FactoryDef::_nil ();
 }
 
-CORBA::ComponentIR::FactoryDef_ptr
-tao_CORBA_ComponentIR_FactoryDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_FactoryDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::FactoryDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::FactoryDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_FactoryDef_marshal (
+CORBA::ComponentIR::tao_FactoryDef_life::tao_marshal (
     CORBA::ComponentIR::FactoryDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::FactoryDef_var
-// *************************************************************
-
-CORBA::ComponentIR::FactoryDef_var::FactoryDef_var (void)
-  : ptr_ (FactoryDef::_nil ())
-{}
-
-::CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::FactoryDef_var::FactoryDef_var (const ::CORBA::ComponentIR::FactoryDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (FactoryDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::FactoryDef_var::~FactoryDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::FactoryDef_var &
-CORBA::ComponentIR::FactoryDef_var::operator= (FactoryDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::FactoryDef_var &
-CORBA::ComponentIR::FactoryDef_var::operator= (const ::CORBA::ComponentIR::FactoryDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::FactoryDef_var::operator const ::CORBA::ComponentIR::FactoryDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::FactoryDef_var::operator ::CORBA::ComponentIR::FactoryDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr &
-CORBA::ComponentIR::FactoryDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr &
-CORBA::ComponentIR::FactoryDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_nil ();
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::FactoryDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef_var::tao_duplicate (FactoryDef_ptr p)
-{
-  return ::CORBA::ComponentIR::FactoryDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::FactoryDef_var::tao_release (FactoryDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::FactoryDef::_nil ();
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef_var::tao_narrow (
+CORBA::ComponentIR::FactoryDef_ptr
+CORBA::ComponentIR::tao_FactoryDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::FactoryDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_FactoryDef_cast::tao_upcast (
+    void *src
+  )
 {
-  FactoryDef **tmp =
-    ACE_static_cast (FactoryDef **, src);
+  CORBA::ComponentIR::FactoryDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::FactoryDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::FactoryDef_out
-// *************************************************************
-
-CORBA::ComponentIR::FactoryDef_out::FactoryDef_out (FactoryDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_nil ();
-}
-
-CORBA::ComponentIR::FactoryDef_out::FactoryDef_out (FactoryDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_nil ();
-}
-
-CORBA::ComponentIR::FactoryDef_out::FactoryDef_out (const ::CORBA::ComponentIR::FactoryDef_out &p)
-  : ptr_ (ACE_const_cast (FactoryDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::FactoryDef_out &
-CORBA::ComponentIR::FactoryDef_out::operator= (const ::CORBA::ComponentIR::FactoryDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (FactoryDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::FactoryDef_out &
-CORBA::ComponentIR::FactoryDef_out::operator= (const ::CORBA::ComponentIR::FactoryDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::FactoryDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::FactoryDef_out &
-CORBA::ComponentIR::FactoryDef_out::operator= (FactoryDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::FactoryDef_out::operator ::CORBA::ComponentIR::FactoryDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr &
-CORBA::ComponentIR::FactoryDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FactoryDef_ptr
-CORBA::ComponentIR::FactoryDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::FactoryDef,
+        CORBA::ComponentIR::tao_FactoryDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::FactoryDef,
+        CORBA::ComponentIR::tao_FactoryDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::FactoryDef, \
+        CORBA::ComponentIR::tao_FactoryDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::FactoryDef, \
+        CORBA::ComponentIR::tao_FactoryDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -16258,7 +14407,7 @@ CORBA::ComponentIR::FactoryDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
@@ -16270,7 +14419,7 @@ CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Pr
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -16321,8 +14470,8 @@ CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::FactoryDef::FactoryDef (int collocated)
 {
@@ -16338,14 +14487,14 @@ CORBA::ComponentIR::FactoryDef::CORBA_ComponentIR_FactoryDef_setup_collocation (
   else
     this->the_TAO_FactoryDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_OperationDef_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::FactoryDef::~FactoryDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FactoryDef *tmp = ACE_static_cast (FactoryDef *, _tao_void_pointer);
@@ -16362,7 +14511,7 @@ CORBA::ComponentIR::FactoryDef::_narrow (
     {
       return FactoryDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -16371,17 +14520,17 @@ CORBA::ComponentIR::FactoryDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (FactoryDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return FactoryDef::_nil ();
         }
     }
-  
+
   return FactoryDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::FactoryDef_ptr 
+CORBA::ComponentIR::FactoryDef_ptr
 CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16391,18 +14540,18 @@ CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
     {
       return FactoryDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       FactoryDef_ptr default_proxy = FactoryDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -16420,7 +14569,7 @@ CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
               FactoryDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -16433,10 +14582,10 @@ CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
               FactoryDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           FactoryDef_ptr,
@@ -16456,7 +14605,7 @@ CORBA::ComponentIR::FactoryDef::_duplicate (FactoryDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -16503,7 +14652,7 @@ CORBA::ComponentIR::FactoryDef::_is_a (
 void *CORBA::ComponentIR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, FactoryDef)::_tao_class_id)
@@ -16564,12 +14713,12 @@ void *CORBA::ComponentIR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -16578,6 +14727,12 @@ const char* CORBA::ComponentIR::FactoryDef::_interface_repository_id (void) cons
   return "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -16585,21 +14740,21 @@ static const CORBA::Long _oc_CORBA_ComponentIR_FactoryDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f4661), 
-  ACE_NTOHL (0x63746f72), 
-  ACE_NTOHL (0x79446566), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f4661),
+  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x79446566),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0
     11,
-  ACE_NTOHL (0x46616374), 
-  ACE_NTOHL (0x6f727944), 
+  ACE_NTOHL (0x46616374),
+  ACE_NTOHL (0x6f727944),
   ACE_NTOHL (0x65660000),  // name = FactoryDef
   };
 
@@ -16628,7 +14783,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::FinderDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::FinderDef_ptr
-tao_CORBA_ComponentIR_FinderDef_duplicate (
+CORBA::ComponentIR::tao_FinderDef_life::tao_duplicate (
     CORBA::ComponentIR::FinderDef_ptr p
   )
 {
@@ -16636,7 +14791,7 @@ tao_CORBA_ComponentIR_FinderDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_FinderDef_release (
+CORBA::ComponentIR::tao_FinderDef_life::tao_release (
     CORBA::ComponentIR::FinderDef_ptr p
   )
 {
@@ -16644,228 +14799,64 @@ tao_CORBA_ComponentIR_FinderDef_release (
 }
 
 CORBA::ComponentIR::FinderDef_ptr
-tao_CORBA_ComponentIR_FinderDef_nil (
+CORBA::ComponentIR::tao_FinderDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::FinderDef::_nil ();
 }
 
-CORBA::ComponentIR::FinderDef_ptr
-tao_CORBA_ComponentIR_FinderDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_FinderDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::FinderDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::FinderDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_FinderDef_marshal (
+CORBA::ComponentIR::tao_FinderDef_life::tao_marshal (
     CORBA::ComponentIR::FinderDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::FinderDef_var
-// *************************************************************
-
-CORBA::ComponentIR::FinderDef_var::FinderDef_var (void)
-  : ptr_ (FinderDef::_nil ())
-{}
-
-::CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::FinderDef_var::FinderDef_var (const ::CORBA::ComponentIR::FinderDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (FinderDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::FinderDef_var::~FinderDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::FinderDef_var &
-CORBA::ComponentIR::FinderDef_var::operator= (FinderDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::FinderDef_var &
-CORBA::ComponentIR::FinderDef_var::operator= (const ::CORBA::ComponentIR::FinderDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::FinderDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::FinderDef_var::operator const ::CORBA::ComponentIR::FinderDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::FinderDef_var::operator ::CORBA::ComponentIR::FinderDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FinderDef_ptr &
-CORBA::ComponentIR::FinderDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FinderDef_ptr &
-CORBA::ComponentIR::FinderDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_nil ();
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::FinderDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef_var::tao_duplicate (FinderDef_ptr p)
-{
-  return ::CORBA::ComponentIR::FinderDef::_duplicate (p);
-}
-
-void
-CORBA::ComponentIR::FinderDef_var::tao_release (FinderDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::FinderDef::_nil ();
-}
-
-::CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef_var::tao_narrow (
+CORBA::ComponentIR::FinderDef_ptr
+CORBA::ComponentIR::tao_FinderDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::FinderDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_FinderDef_cast::tao_upcast (
+    void *src
+  )
 {
-  FinderDef **tmp =
-    ACE_static_cast (FinderDef **, src);
+  CORBA::ComponentIR::FinderDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::FinderDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::FinderDef_out
-// *************************************************************
-
-CORBA::ComponentIR::FinderDef_out::FinderDef_out (FinderDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_nil ();
-}
-
-CORBA::ComponentIR::FinderDef_out::FinderDef_out (FinderDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_nil ();
-}
-
-CORBA::ComponentIR::FinderDef_out::FinderDef_out (const ::CORBA::ComponentIR::FinderDef_out &p)
-  : ptr_ (ACE_const_cast (FinderDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::FinderDef_out &
-CORBA::ComponentIR::FinderDef_out::operator= (const ::CORBA::ComponentIR::FinderDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (FinderDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::FinderDef_out &
-CORBA::ComponentIR::FinderDef_out::operator= (const ::CORBA::ComponentIR::FinderDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::FinderDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::FinderDef_out &
-CORBA::ComponentIR::FinderDef_out::operator= (FinderDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::FinderDef_out::operator ::CORBA::ComponentIR::FinderDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FinderDef_ptr &
-CORBA::ComponentIR::FinderDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::FinderDef_ptr
-CORBA::ComponentIR::FinderDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::FinderDef,
+        CORBA::ComponentIR::tao_FinderDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::FinderDef,
+        CORBA::ComponentIR::tao_FinderDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::FinderDef, \
+        CORBA::ComponentIR::tao_FinderDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::FinderDef, \
+        CORBA::ComponentIR::tao_FinderDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -16878,7 +14869,7 @@ CORBA::ComponentIR::FinderDef_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
@@ -16890,7 +14881,7 @@ CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Prox
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -16941,8 +14932,8 @@ CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::FinderDef::FinderDef (int collocated)
 {
@@ -16958,14 +14949,14 @@ CORBA::ComponentIR::FinderDef::CORBA_ComponentIR_FinderDef_setup_collocation (in
   else
     this->the_TAO_FinderDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_OperationDef_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::FinderDef::~FinderDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FinderDef *tmp = ACE_static_cast (FinderDef *, _tao_void_pointer);
@@ -16982,7 +14973,7 @@ CORBA::ComponentIR::FinderDef::_narrow (
     {
       return FinderDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -16991,17 +14982,17 @@ CORBA::ComponentIR::FinderDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (FinderDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return FinderDef::_nil ();
         }
     }
-  
+
   return FinderDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::FinderDef_ptr 
+CORBA::ComponentIR::FinderDef_ptr
 CORBA::ComponentIR::FinderDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -17011,18 +15002,18 @@ CORBA::ComponentIR::FinderDef::_unchecked_narrow (
     {
       return FinderDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       FinderDef_ptr default_proxy = FinderDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -17040,7 +15031,7 @@ CORBA::ComponentIR::FinderDef::_unchecked_narrow (
               FinderDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -17053,10 +15044,10 @@ CORBA::ComponentIR::FinderDef::_unchecked_narrow (
               FinderDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           FinderDef_ptr,
@@ -17076,7 +15067,7 @@ CORBA::ComponentIR::FinderDef::_duplicate (FinderDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -17123,7 +15114,7 @@ CORBA::ComponentIR::FinderDef::_is_a (
 void *CORBA::ComponentIR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, FinderDef)::_tao_class_id)
@@ -17184,12 +15175,12 @@ void *CORBA::ComponentIR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -17198,6 +15189,12 @@ const char* CORBA::ComponentIR::FinderDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -17205,20 +15202,20 @@ static const CORBA::Long _oc_CORBA_ComponentIR_FinderDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f4669), 
-  ACE_NTOHL (0x6e646572), 
-  ACE_NTOHL (0x4465663a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f4669),
+  ACE_NTOHL (0x6e646572),
+  ACE_NTOHL (0x4465663a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0
     10,
-  ACE_NTOHL (0x46696e64), 
-  ACE_NTOHL (0x65724465), 
+  ACE_NTOHL (0x46696e64),
+  ACE_NTOHL (0x65724465),
   ACE_NTOHL (0x66000000),  // name = FinderDef
   };
 
@@ -17247,7 +15244,7 @@ TAO_NAMESPACE_END
 int CORBA::ComponentIR::HomeDef::_tao_class_id = 0;
 
 CORBA::ComponentIR::HomeDef_ptr
-tao_CORBA_ComponentIR_HomeDef_duplicate (
+CORBA::ComponentIR::tao_HomeDef_life::tao_duplicate (
     CORBA::ComponentIR::HomeDef_ptr p
   )
 {
@@ -17255,7 +15252,7 @@ tao_CORBA_ComponentIR_HomeDef_duplicate (
 }
 
 void
-tao_CORBA_ComponentIR_HomeDef_release (
+CORBA::ComponentIR::tao_HomeDef_life::tao_release (
     CORBA::ComponentIR::HomeDef_ptr p
   )
 {
@@ -17263,228 +15260,64 @@ tao_CORBA_ComponentIR_HomeDef_release (
 }
 
 CORBA::ComponentIR::HomeDef_ptr
-tao_CORBA_ComponentIR_HomeDef_nil (
+CORBA::ComponentIR::tao_HomeDef_life::tao_nil (
     void
   )
 {
   return CORBA::ComponentIR::HomeDef::_nil ();
 }
 
-CORBA::ComponentIR::HomeDef_ptr
-tao_CORBA_ComponentIR_HomeDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ComponentIR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ComponentIR_HomeDef_upcast (
-    void *src
-  )
-{
-  CORBA::ComponentIR::HomeDef **tmp =
-    ACE_static_cast (CORBA::ComponentIR::HomeDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ComponentIR_HomeDef_marshal (
+CORBA::ComponentIR::tao_HomeDef_life::tao_marshal (
     CORBA::ComponentIR::HomeDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ComponentIR::HomeDef_var
-// *************************************************************
-
-CORBA::ComponentIR::HomeDef_var::HomeDef_var (void)
-  : ptr_ (HomeDef::_nil ())
-{}
-
-::CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::HomeDef_var::HomeDef_var (const ::CORBA::ComponentIR::HomeDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (HomeDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ComponentIR::HomeDef_var::~HomeDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ComponentIR::HomeDef_var &
-CORBA::ComponentIR::HomeDef_var::operator= (HomeDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::HomeDef_var &
-CORBA::ComponentIR::HomeDef_var::operator= (const ::CORBA::ComponentIR::HomeDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ComponentIR::HomeDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ComponentIR::HomeDef_var::operator const ::CORBA::ComponentIR::HomeDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ComponentIR::HomeDef_var::operator ::CORBA::ComponentIR::HomeDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::HomeDef_ptr &
-CORBA::ComponentIR::HomeDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::HomeDef_ptr &
-CORBA::ComponentIR::HomeDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ComponentIR::HomeDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_nil ();
-  return val;
-}
-
-::CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef_var::tao_duplicate (HomeDef_ptr p)
-{
-  return ::CORBA::ComponentIR::HomeDef::_duplicate (p);
+  return p->marshal (cdr);
 }
 
-void
-CORBA::ComponentIR::HomeDef_var::tao_release (HomeDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef_var::tao_nil (void)
-{
-  return ::CORBA::ComponentIR::HomeDef::_nil ();
-}
-
-::CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef_var::tao_narrow (
+CORBA::ComponentIR::HomeDef_ptr
+CORBA::ComponentIR::tao_HomeDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ComponentIR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ComponentIR::HomeDef_var::tao_upcast (void *src)
+CORBA::ComponentIR::tao_HomeDef_cast::tao_upcast (
+    void *src
+  )
 {
-  HomeDef **tmp =
-    ACE_static_cast (HomeDef **, src);
+  CORBA::ComponentIR::HomeDef **tmp =
+    ACE_static_cast (CORBA::ComponentIR::HomeDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ComponentIR::HomeDef_out
-// *************************************************************
-
-CORBA::ComponentIR::HomeDef_out::HomeDef_out (HomeDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_nil ();
-}
-
-CORBA::ComponentIR::HomeDef_out::HomeDef_out (HomeDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_nil ();
-}
-
-CORBA::ComponentIR::HomeDef_out::HomeDef_out (const ::CORBA::ComponentIR::HomeDef_out &p)
-  : ptr_ (ACE_const_cast (HomeDef_out &, p).ptr_)
-{}
-
-::CORBA::ComponentIR::HomeDef_out &
-CORBA::ComponentIR::HomeDef_out::operator= (const ::CORBA::ComponentIR::HomeDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (HomeDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ComponentIR::HomeDef_out &
-CORBA::ComponentIR::HomeDef_out::operator= (const ::CORBA::ComponentIR::HomeDef_var &p)
-{
-  this->ptr_ = ::CORBA::ComponentIR::HomeDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ComponentIR::HomeDef_out &
-CORBA::ComponentIR::HomeDef_out::operator= (HomeDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ComponentIR::HomeDef_out::operator ::CORBA::ComponentIR::HomeDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::HomeDef_ptr &
-CORBA::ComponentIR::HomeDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ComponentIR::HomeDef_ptr
-CORBA::ComponentIR::HomeDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ComponentIR::HomeDef,
+        CORBA::ComponentIR::tao_HomeDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ComponentIR::HomeDef,
+        CORBA::ComponentIR::tao_HomeDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ComponentIR::HomeDef, \
+        CORBA::ComponentIR::tao_HomeDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ComponentIR::HomeDef, \
+        CORBA::ComponentIR::tao_HomeDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -17504,29 +15337,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::HomeDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get &);
-    
+
     ::CORBA::ComponentIR::HomeDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -17539,7 +15372,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -17551,11 +15384,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17564,17 +15397,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::result (::CORBA::ComponentIR::HomeDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -17592,10 +15425,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17604,15 +15437,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set &);
     CORBA::ComponentIR::HomeDef_ptr base_home_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::ComponentIR::HomeDef_ptr base_home
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       base_home_ (base_home)
@@ -17626,15 +15459,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->base_home_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -17646,11 +15479,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17659,7 +15492,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -17678,29 +15511,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDefSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get &);
-    
+
     ::CORBA::InterfaceDefSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -17713,7 +15546,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::argume
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -17725,11 +15558,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::except
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17738,17 +15571,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::result
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -17766,10 +15599,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17778,15 +15611,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set &);
     const CORBA::InterfaceDefSeq & supported_interfaces_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::InterfaceDefSeq & supported_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       supported_interfaces_ (supported_interfaces)
@@ -17800,15 +15633,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::argume
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->supported_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -17820,11 +15653,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::except
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17833,7 +15666,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::result
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -17852,29 +15685,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::ComponentDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get &);
-    
+
     ::CORBA::ComponentIR::ComponentDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -17887,7 +15720,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -17899,11 +15732,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::exception
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -17912,17 +15745,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::result (A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::result (::CORBA::ComponentIR::ComponentDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -17940,10 +15773,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17952,15 +15785,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set &);
     CORBA::ComponentIR::ComponentDef_ptr managed_component_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       managed_component_ (managed_component)
@@ -17974,15 +15807,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->managed_component_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -17994,11 +15827,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::exception
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18007,7 +15840,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::result (A
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -18026,29 +15859,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get &);
-    
+
     ::CORBA::ValueDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -18061,7 +15894,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::arguments (ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -18073,11 +15906,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::exceptions (ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18086,17 +15919,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::result (ACE_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::result (::CORBA::ValueDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -18114,10 +15947,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -18126,15 +15959,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set &);
     CORBA::ValueDef_ptr primary_key_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       primary_key_ (primary_key)
@@ -18148,15 +15981,15 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::arguments (ACE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->primary_key_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -18168,11 +16001,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::exceptions (ACE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18181,7 +16014,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::result (ACE_ENV
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -18205,15 +16038,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::FactoryDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory &);
@@ -18222,13 +16055,13 @@ public:
     const char * version_;
     const CORBA::ParDescriptionSeq & params_;
     const CORBA::ExceptionDefSeq & exceptions_;
-    
+
     ::CORBA::ComponentIR::FactoryDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -18237,7 +16070,7 @@ public:
       const char * version,
       const CORBA::ParDescriptionSeq & params,
       const CORBA::ExceptionDefSeq & exceptions
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -18255,31 +16088,31 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::arguments (ACE_E
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->params_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -18291,11 +16124,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::exceptions (ACE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18304,17 +16137,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::result (ACE_ENV_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::result (::CORBA::ComponentIR::FactoryDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -18336,15 +16169,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ComponentIR::FinderDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder &);
@@ -18353,13 +16186,13 @@ public:
     const char * version_;
     const CORBA::ParDescriptionSeq & params_;
     const CORBA::ExceptionDefSeq & exceptions_;
-    
+
     ::CORBA::ComponentIR::FinderDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -18368,7 +16201,7 @@ public:
       const char * version,
       const CORBA::ParDescriptionSeq & params,
       const CORBA::ExceptionDefSeq & exceptions
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -18386,31 +16219,31 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->params_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -18422,11 +16255,11 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -18435,17 +16268,17 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::result (::CORBA::ComponentIR::FinderDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -18455,7 +16288,7 @@ TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::result (::CORBA::
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::ComponentIR::_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
@@ -18479,12 +16312,12 @@ CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Im
 {
   CORBA::ComponentIR::HomeDef_var _tao_retval (CORBA::ComponentIR::HomeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_home",
@@ -18492,22 +16325,22 @@ CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Im
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get _tao_ri (
           &_tao_call,
@@ -18515,14 +16348,14 @@ CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Im
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -18530,78 +16363,85 @@ CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Im
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::HomeDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::HomeDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -18611,59 +16451,57 @@ CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Im
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -18679,12 +16517,12 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_base_home",
@@ -18692,22 +16530,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set _tao_ri (
           &_tao_call,
@@ -18716,14 +16554,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -18731,70 +16569,76 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << base_home)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << base_home)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -18804,56 +16648,54 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -18870,18 +16712,18 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
 {
   CORBA::InterfaceDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::InterfaceDefSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_supported_interfaces",
@@ -18889,22 +16731,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get _tao_ri (
           &_tao_call,
@@ -18912,14 +16754,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -18927,78 +16769,85 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceDefSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceDefSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -19008,59 +16857,57 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -19076,12 +16923,12 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_supported_interfaces",
@@ -19089,22 +16936,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set _tao_ri (
           &_tao_call,
@@ -19113,14 +16960,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19128,70 +16975,76 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << supported_interfaces)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << supported_interfaces)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -19201,56 +17054,54 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -19267,12 +17118,12 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
 {
   CORBA::ComponentIR::ComponentDef_var _tao_retval (CORBA::ComponentIR::ComponentDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_managed_component",
@@ -19280,22 +17131,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get _tao_ri (
           &_tao_call,
@@ -19303,14 +17154,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19318,78 +17169,85 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::ComponentDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::ComponentDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -19399,59 +17257,57 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -19467,12 +17323,12 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_managed_component",
@@ -19480,22 +17336,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set _tao_ri (
           &_tao_call,
@@ -19504,14 +17360,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19519,70 +17375,76 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << managed_component)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << managed_component)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -19592,56 +17454,54 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -19658,12 +17518,12 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
 {
   CORBA::ValueDef_var _tao_retval (CORBA::ValueDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_primary_key",
@@ -19671,22 +17531,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get _tao_ri (
           &_tao_call,
@@ -19694,14 +17554,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19709,78 +17569,85 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ValueDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ValueDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -19790,59 +17657,57 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -19858,12 +17723,12 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_primary_key",
@@ -19871,22 +17736,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set _tao_ri (
           &_tao_call,
@@ -19895,14 +17760,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -19910,70 +17775,76 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << primary_key)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << primary_key)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -19983,56 +17854,54 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -20054,12 +17923,12 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
 {
   CORBA::ComponentIR::FactoryDef_var _tao_retval (CORBA::ComponentIR::FactoryDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_factory",
@@ -20067,22 +17936,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_factory _tao_ri (
           &_tao_call,
@@ -20095,14 +17964,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -20110,95 +17979,99 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << params) &&
-              (_tao_out << exceptions)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << params) &&
+                  (_tao_out << exceptions)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::FactoryDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::FactoryDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -20208,59 +18081,57 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -20281,12 +18152,12 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
 {
   CORBA::ComponentIR::FinderDef_var _tao_retval (CORBA::ComponentIR::FinderDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_finder",
@@ -20294,22 +18165,22 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ComponentIR_HomeDef_create_finder _tao_ri (
           &_tao_call,
@@ -20322,14 +18193,14 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -20337,95 +18208,99 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << params) &&
-              (_tao_out << exceptions)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << params) &&
+                  (_tao_out << exceptions)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ComponentIR::FinderDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ComponentIR::FinderDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -20435,63 +18310,61 @@ void CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -20542,8 +18415,8 @@ CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ComponentIR::HomeDef::HomeDef (int collocated)
 {
@@ -20559,14 +18432,14 @@ CORBA::ComponentIR::HomeDef::CORBA_ComponentIR_HomeDef_setup_collocation (int co
   else
     this->the_TAO_HomeDef_Proxy_Broker_ =
       ::CORBA::ComponentIR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_ExtInterfaceDef_setup_collocation (collocated);
 }
 
 CORBA::ComponentIR::HomeDef::~HomeDef (void)
 {}
 
-void 
+void
 CORBA::ComponentIR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   HomeDef *tmp = ACE_static_cast (HomeDef *, _tao_void_pointer);
@@ -20583,7 +18456,7 @@ CORBA::ComponentIR::HomeDef::_narrow (
     {
       return HomeDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -20592,17 +18465,17 @@ CORBA::ComponentIR::HomeDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (HomeDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return HomeDef::_nil ();
         }
     }
-  
+
   return HomeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ComponentIR::HomeDef_ptr 
+CORBA::ComponentIR::HomeDef_ptr
 CORBA::ComponentIR::HomeDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -20612,18 +18485,18 @@ CORBA::ComponentIR::HomeDef::_unchecked_narrow (
     {
       return HomeDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       HomeDef_ptr default_proxy = HomeDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -20641,7 +18514,7 @@ CORBA::ComponentIR::HomeDef::_unchecked_narrow (
               HomeDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -20654,10 +18527,10 @@ CORBA::ComponentIR::HomeDef::_unchecked_narrow (
               HomeDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           HomeDef_ptr,
@@ -20677,7 +18550,7 @@ CORBA::ComponentIR::HomeDef::_duplicate (HomeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -20740,7 +18613,7 @@ CORBA::ComponentIR::HomeDef::_is_a (
 void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA::ComponentIR, HomeDef)::_tao_class_id)
@@ -20857,12 +18730,12 @@ void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -20871,6 +18744,12 @@ const char* CORBA::ComponentIR::HomeDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ComponentIR::HomeDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -20881,10 +18760,10 @@ const char* CORBA::ComponentIR::HomeDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.base_home (
       this
       ACE_ENV_ARG_PARAMETER
@@ -20902,10 +18781,10 @@ void CORBA::ComponentIR::HomeDef::base_home (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.base_home (
       this,
       base_home
@@ -20923,10 +18802,10 @@ void CORBA::ComponentIR::HomeDef::base_home (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.supported_interfaces (
       this
       ACE_ENV_ARG_PARAMETER
@@ -20944,10 +18823,10 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.supported_interfaces (
       this,
       supported_interfaces
@@ -20965,10 +18844,10 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.managed_component (
       this
       ACE_ENV_ARG_PARAMETER
@@ -20986,10 +18865,10 @@ void CORBA::ComponentIR::HomeDef::managed_component (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.managed_component (
       this,
       managed_component
@@ -21007,10 +18886,10 @@ void CORBA::ComponentIR::HomeDef::managed_component (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.primary_key (
       this
       ACE_ENV_ARG_PARAMETER
@@ -21028,10 +18907,10 @@ void CORBA::ComponentIR::HomeDef::primary_key (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.primary_key (
       this,
       primary_key
@@ -21054,10 +18933,10 @@ void CORBA::ComponentIR::HomeDef::primary_key (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_factory (
       this,
       id,
@@ -21084,10 +18963,10 @@ void CORBA::ComponentIR::HomeDef::primary_key (
     CORBA::SystemException
   ))
 {
-  _TAO_HomeDef_Proxy_Impl &proxy = 
+  _TAO_HomeDef_Proxy_Impl &proxy =
     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_finder (
       this,
       id,
@@ -21106,19 +18985,19 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f486f), 
-  ACE_NTOHL (0x6d654465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f486f),
+  ACE_NTOHL (0x6d654465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0
     8,
-  ACE_NTOHL (0x486f6d65), 
+  ACE_NTOHL (0x486f6d65),
   ACE_NTOHL (0x44656600),  // name = HomeDef
   };
 
@@ -21148,46 +19027,46 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x522f486f), 
-  ACE_NTOHL (0x6d654465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7449),
+  ACE_NTOHL (0x522f486f),
+  ACE_NTOHL (0x6d654465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0
     16,
-  ACE_NTOHL (0x486f6d65), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x486f6d65),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = HomeDescription
   12, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -21196,93 +19075,93 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   10,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f686f6d), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f686f6d),
   ACE_NTOHL (0x65000000),  // name = base_home
     0xffffffff, // indirection
   0xffffff2c, // negative offset (-212)
   18,
-  ACE_NTOHL (0x6d616e61), 
-  ACE_NTOHL (0x6765645f), 
-  ACE_NTOHL (0x636f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x6d616e61),
+  ACE_NTOHL (0x6765645f),
+  ACE_NTOHL (0x636f6d70),
+  ACE_NTOHL (0x6f6e656e),
   ACE_NTOHL (0x74000000),  // name = managed_component
     0xffffffff, // indirection
   0xffffff0c, // negative offset (-244)
   12,
-  ACE_NTOHL (0x7072696d), 
-  ACE_NTOHL (0x6172795f), 
+  ACE_NTOHL (0x7072696d),
+  ACE_NTOHL (0x6172795f),
   ACE_NTOHL (0x6b657900),  // name = primary_key
     CORBA::tk_struct, // typecode kind
   408, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
-    ACE_NTOHL (0x6c756544), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e3a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5661),
+    ACE_NTOHL (0x6c756544),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e3a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDescription:1.0
         17,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x65446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x56616c75),
+    ACE_NTOHL (0x65446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = ValueDescription
     10, // member count
         5,
-    ACE_NTOHL (0x6e616d65), 
+    ACE_NTOHL (0x6e616d65),
     ACE_NTOHL (0x0),  // name = name
         0xffffffff, // indirection
     0xfffffe40, // negative offset (-448)
@@ -21291,53 +19170,53 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
         0xffffffff, // indirection
     0xfffffe84, // negative offset (-380)
     12,
-    ACE_NTOHL (0x69735f61), 
-    ACE_NTOHL (0x62737472), 
+    ACE_NTOHL (0x69735f61),
+    ACE_NTOHL (0x62737472),
     ACE_NTOHL (0x61637400),  // name = is_abstract
         CORBA::tk_boolean,
 
     10,
-    ACE_NTOHL (0x69735f63), 
-    ACE_NTOHL (0x7573746f), 
+    ACE_NTOHL (0x69735f63),
+    ACE_NTOHL (0x7573746f),
     ACE_NTOHL (0x6d000000),  // name = is_custom
         CORBA::tk_boolean,
 
     11,
-    ACE_NTOHL (0x64656669), 
-    ACE_NTOHL (0x6e65645f), 
+    ACE_NTOHL (0x64656669),
+    ACE_NTOHL (0x6e65645f),
     ACE_NTOHL (0x696e0000),  // name = defined_in
         0xffffffff, // indirection
     0xfffffe44, // negative offset (-444)
     8,
-    ACE_NTOHL (0x76657273), 
+    ACE_NTOHL (0x76657273),
     ACE_NTOHL (0x696f6e00),  // name = version
         0xffffffff, // indirection
     0xfffffea4, // negative offset (-348)
     21,
-    ACE_NTOHL (0x73757070), 
-    ACE_NTOHL (0x6f727465), 
-    ACE_NTOHL (0x645f696e), 
-    ACE_NTOHL (0x74657266), 
-    ACE_NTOHL (0x61636573), 
+    ACE_NTOHL (0x73757070),
+    ACE_NTOHL (0x6f727465),
+    ACE_NTOHL (0x645f696e),
+    ACE_NTOHL (0x74657266),
+    ACE_NTOHL (0x61636573),
     ACE_NTOHL (0x0),  // name = supported_interfaces
         CORBA::tk_alias, // typecode kind for typedefs
     92, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       38,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x49645365), 
-      ACE_NTOHL (0x713a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x49645365),
+      ACE_NTOHL (0x713a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
             16,
-      ACE_NTOHL (0x5265706f), 
-      ACE_NTOHL (0x7369746f), 
-      ACE_NTOHL (0x72794964), 
+      ACE_NTOHL (0x5265706f),
+      ACE_NTOHL (0x7369746f),
+      ACE_NTOHL (0x72794964),
       ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
             CORBA::tk_sequence, // typecode kind
       16, // encapsulation length
@@ -21348,51 +19227,51 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
 
 
     21,
-    ACE_NTOHL (0x61627374), 
-    ACE_NTOHL (0x72616374), 
-    ACE_NTOHL (0x5f626173), 
-    ACE_NTOHL (0x655f7661), 
-    ACE_NTOHL (0x6c756573), 
+    ACE_NTOHL (0x61627374),
+    ACE_NTOHL (0x72616374),
+    ACE_NTOHL (0x5f626173),
+    ACE_NTOHL (0x655f7661),
+    ACE_NTOHL (0x6c756573),
     ACE_NTOHL (0x0),  // name = abstract_base_values
         0xffffffff, // indirection
     0xffffff7c, // negative offset (-132)
     15,
-    ACE_NTOHL (0x69735f74), 
-    ACE_NTOHL (0x72756e63), 
-    ACE_NTOHL (0x61746162), 
+    ACE_NTOHL (0x69735f74),
+    ACE_NTOHL (0x72756e63),
+    ACE_NTOHL (0x61746162),
     ACE_NTOHL (0x6c650000),  // name = is_truncatable
         CORBA::tk_boolean,
 
     11,
-    ACE_NTOHL (0x62617365), 
-    ACE_NTOHL (0x5f76616c), 
+    ACE_NTOHL (0x62617365),
+    ACE_NTOHL (0x5f76616c),
     ACE_NTOHL (0x75650000),  // name = base_value
         0xffffffff, // indirection
     0xfffffd5c, // negative offset (-676)
 
   10,
-  ACE_NTOHL (0x66616374), 
-  ACE_NTOHL (0x6f726965), 
+  ACE_NTOHL (0x66616374),
+  ACE_NTOHL (0x6f726965),
   ACE_NTOHL (0x73000000),  // name = factories
     CORBA::tk_alias, // typecode kind for typedefs
   1340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x4f704465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1260, // encapsulation length
@@ -21401,27 +19280,27 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
       1244, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffc2c, // negative offset (-980)
@@ -21430,73 +19309,73 @@ static const CORBA::Long _oc_CORBA_ComponentIR_HomeDescription[] =
                 0xffffffff, // indirection
         0xfffffc70, // negative offset (-912)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffc58, // negative offset (-936)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffcb8, // negative offset (-840)
         7,
-        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x72657375),
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
-          ACE_NTOHL (0x65726174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f70),
+          ACE_NTOHL (0x65726174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x4f706572),
+          ACE_NTOHL (0x6174696f),
+          ACE_NTOHL (0x6e4d6f64),
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e), 
-          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4f505f4e),
+          ACE_NTOHL (0x4f524d41),
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f), 
-          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x4f505f4f),
+          ACE_NTOHL (0x4e455741),
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-          
+
         9,
-        ACE_NTOHL (0x636f6e74), 
-        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x636f6e74),
+        ACE_NTOHL (0x65787473),
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         168, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
-          ACE_NTOHL (0x6e746578), 
-          ACE_NTOHL (0x74496453), 
-          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+          ACE_NTOHL (0x74496453),
+          ACE_NTOHL (0x65713a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x436f6e74),
+          ACE_NTOHL (0x65787449),
+          ACE_NTOHL (0x64536571),
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           96, // encapsulation length
@@ -21505,21 +19384,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             80, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f436f),
+              ACE_NTOHL (0x6e746578),
+              ACE_NTOHL (0x74496465),
+              ACE_NTOHL (0x6e746966),
+              ACE_NTOHL (0x6965723a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x436f6e74),
+              ACE_NTOHL (0x65787449),
+              ACE_NTOHL (0x64656e74),
+              ACE_NTOHL (0x69666965),
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             0xffffffff, // indirection
               0xfffffaac, // negative offset (-1364)
@@ -21528,28 +19407,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261), 
-        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x70617261),
+        ACE_NTOHL (0x6d657465),
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         428, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x50617244),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           348, // encapsulation length
@@ -21558,117 +19437,117 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             332, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x74657244), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x74657244),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x72446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff9cc, // negative offset (-1588)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
-                
+
               5,
-              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x6d6f6465),
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
-                ACE_NTOHL (0x72616d65), 
-                ACE_NTOHL (0x7465724d), 
-                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5061),
+                ACE_NTOHL (0x72616d65),
+                ACE_NTOHL (0x7465724d),
+                ACE_NTOHL (0x6f64653a),
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x50617261),
+                ACE_NTOHL (0x6d657465),
+                ACE_NTOHL (0x724d6f64),
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f4f55),
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-                
+
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
@@ -21677,27 +19556,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             180, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff808, // negative offset (-2040)
@@ -21706,18 +19585,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                             0xffffffff, // indirection
               0xfffff84c, // negative offset (-1972)
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             0xffffffff, // indirection
               0xfffff834, // negative offset (-1996)
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
                             0xffffffff, // indirection
               0xfffff894, // negative offset (-1900)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -21730,41 +19609,41 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   8,
-  ACE_NTOHL (0x66696e64), 
+  ACE_NTOHL (0x66696e64),
   ACE_NTOHL (0x65727300),  // name = finders
     0xffffffff, // indirection
   0xfffffaac, // negative offset (-1364)
   11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e730000),  // name = operations
     0xffffffff, // indirection
   0xfffffa94, // negative offset (-1388)
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   468, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4578), 
-    ACE_NTOHL (0x74417474), 
-    ACE_NTOHL (0x72446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4578),
+    ACE_NTOHL (0x74417474),
+    ACE_NTOHL (0x72446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
         22,
-    ACE_NTOHL (0x45787441), 
-    ACE_NTOHL (0x74747244), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x45787441),
+    ACE_NTOHL (0x74747244),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e5365),
     ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     380, // encapsulation length
@@ -21773,28 +19652,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       364, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         46,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x74417474), 
-        ACE_NTOHL (0x72696275), 
-        ACE_NTOHL (0x74654465), 
-        ACE_NTOHL (0x73637269), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x74417474),
+        ACE_NTOHL (0x72696275),
+        ACE_NTOHL (0x74654465),
+        ACE_NTOHL (0x73637269),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e3a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
                 24,
-        ACE_NTOHL (0x45787441), 
-        ACE_NTOHL (0x74747269), 
-        ACE_NTOHL (0x62757465), 
-        ACE_NTOHL (0x44657363), 
-        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x45787441),
+        ACE_NTOHL (0x74747269),
+        ACE_NTOHL (0x62757465),
+        ACE_NTOHL (0x44657363),
+        ACE_NTOHL (0x72697074),
         ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
         8, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff6a0, // negative offset (-2400)
@@ -21803,64 +19682,64 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffff6e4, // negative offset (-2332)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffff6cc, // negative offset (-2356)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffff72c, // negative offset (-2260)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-          
+
         15,
-        ACE_NTOHL (0x6765745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6765745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
                 0xffffffff, // indirection
         0xfffffcec, // negative offset (-788)
         15,
-        ACE_NTOHL (0x7075745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x7075745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
                 0xffffffff, // indirection
         0xfffffcd0, // negative offset (-816)
@@ -21869,7 +19748,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -21894,7 +19773,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ComponentIR::HomeDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -21904,6 +19783,37 @@ void CORBA::ComponentIR::HomeDescription::_tao_any_destructor (void *_tao_void_p
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      HomeDescription
+    >;
+
+template class
+  TAO_Out_T<
+      HomeDescription,
+      HomeDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      HomeDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      HomeDescription, \
+      HomeDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
 // Copying insertion.
@@ -22173,7 +20083,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -22292,7 +20202,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -22411,7 +20321,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -22693,7 +20603,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -22751,7 +20661,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -22809,7 +20726,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -22867,7 +20791,14 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -23094,7 +21025,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -23160,7 +21091,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23179,12 +21110,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::EventDef::_unchecked_narrow (
@@ -23203,7 +21134,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23222,12 +21153,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::Container::_unchecked_narrow (
@@ -23246,7 +21177,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23265,12 +21196,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::ModuleDef::_unchecked_narrow (
@@ -23289,7 +21220,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23308,12 +21239,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::Repository::_unchecked_narrow (
@@ -23332,7 +21263,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23351,12 +21282,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::ProvidesDef::_unchecked_narrow (
@@ -23375,7 +21306,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23394,12 +21325,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::UsesDef::_unchecked_narrow (
@@ -23418,7 +21349,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23437,12 +21368,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::EventPortDef::_unchecked_narrow (
@@ -23461,7 +21392,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23480,12 +21411,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::EmitsDef::_unchecked_narrow (
@@ -23504,7 +21435,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23523,12 +21454,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::PublishesDef::_unchecked_narrow (
@@ -23547,7 +21478,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23566,12 +21497,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::ConsumesDef::_unchecked_narrow (
@@ -23590,7 +21521,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23609,12 +21540,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::ComponentDef::_unchecked_narrow (
@@ -23633,7 +21564,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23641,20 +21572,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -23664,7 +21595,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -23674,32 +21605,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23707,20 +21638,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -23730,7 +21661,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -23740,32 +21671,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23773,20 +21704,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -23796,7 +21727,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -23806,32 +21737,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23850,12 +21781,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::FactoryDef::_unchecked_narrow (
@@ -23874,7 +21805,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23893,12 +21824,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::FinderDef::_unchecked_narrow (
@@ -23917,7 +21848,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -23936,12 +21867,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ComponentIR::HomeDef::_unchecked_narrow (
@@ -23958,5 +21889,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
-
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index f33922b2e5c..6429395ed68 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -27,17 +27,12 @@
 
 #include "ace/pre.h"
 
-#include "tao/corba.h"
+#include "IFR_ExtendedC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-#include "ifr_client_export.h"
-
-#include "IFR_ExtendedC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -74,258 +69,145 @@ TAO_NAMESPACE  CORBA
   {
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-    
-    class ComponentDef;
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF__ODDS_N_ENDS_CH_
     
+    class ComponentDef;
     typedef ComponentDef *ComponentDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF___VAR_CH_
+    struct tao_ComponentDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          ComponentDef,
+          tao_ComponentDef_life
+        >
+      ComponentDef_var;
+    
+    typedef
+      TAO_Objref_Out_T<
+          ComponentDef,
+          tao_ComponentDef_life
+        >
+      ComponentDef_out;
     
-    class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
+    struct TAO_IFR_Client_Export tao_ComponentDef_life
     {
-    public:
-      ComponentDef_var (void); // default constructor
-      ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {} 
-      ComponentDef_var (const ComponentDef_var &); // copy constructor
-      ~ComponentDef_var (void); // destructor
-      
-      ComponentDef_var &operator= (ComponentDef_ptr);
-      ComponentDef_var &operator= (const ComponentDef_var &);
-      ComponentDef_ptr operator-> (void) const;
-      
-      operator const ComponentDef_ptr &() const;
-      operator ComponentDef_ptr &();
-      // in, inout, out, _retn 
-      ComponentDef_ptr in (void) const;
-      ComponentDef_ptr &inout (void);
-      ComponentDef_ptr &out (void);
-      ComponentDef_ptr _retn (void);
-      ComponentDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static ComponentDef_ptr tao_duplicate (ComponentDef_ptr);
       static void tao_release (ComponentDef_ptr);
       static ComponentDef_ptr tao_nil (void);
-      static ComponentDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          ComponentDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      ComponentDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      ComponentDef_var (const TAO_Base_var &rhs);
-      ComponentDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF___OUT_CH_
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-    
-    class TAO_IFR_Client_Export ComponentDef_out
+    struct TAO_IFR_Client_Export tao_ComponentDef_cast
     {
-    public:
-      ComponentDef_out (ComponentDef_ptr &);
-      ComponentDef_out (ComponentDef_var &);
-      ComponentDef_out (const ComponentDef_out &);
-      ComponentDef_out &operator= (const ComponentDef_out &);
-      ComponentDef_out &operator= (const ComponentDef_var &);
-      ComponentDef_out &operator= (ComponentDef_ptr);
-      operator ComponentDef_ptr &();
-      ComponentDef_ptr &ptr (void);
-      ComponentDef_ptr operator-> (void);
-    
-    private:
-      ComponentDef_ptr &ptr_;
+      static ComponentDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-    
-    class HomeDef;
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_HOMEDEF__ODDS_N_ENDS_CH_
     
+    class HomeDef;
     typedef HomeDef *HomeDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF___VAR_CH_
+    struct tao_HomeDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          HomeDef,
+          tao_HomeDef_life
+        >
+      HomeDef_var;
     
-    class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
+    typedef
+      TAO_Objref_Out_T<
+          HomeDef,
+          tao_HomeDef_life
+        >
+      HomeDef_out;
+    
+    struct TAO_IFR_Client_Export tao_HomeDef_life
     {
-    public:
-      HomeDef_var (void); // default constructor
-      HomeDef_var (HomeDef_ptr p) : ptr_ (p) {} 
-      HomeDef_var (const HomeDef_var &); // copy constructor
-      ~HomeDef_var (void); // destructor
-      
-      HomeDef_var &operator= (HomeDef_ptr);
-      HomeDef_var &operator= (const HomeDef_var &);
-      HomeDef_ptr operator-> (void) const;
-      
-      operator const HomeDef_ptr &() const;
-      operator HomeDef_ptr &();
-      // in, inout, out, _retn 
-      HomeDef_ptr in (void) const;
-      HomeDef_ptr &inout (void);
-      HomeDef_ptr &out (void);
-      HomeDef_ptr _retn (void);
-      HomeDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static HomeDef_ptr tao_duplicate (HomeDef_ptr);
       static void tao_release (HomeDef_ptr);
       static HomeDef_ptr tao_nil (void);
-      static HomeDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          HomeDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      HomeDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      HomeDef_var (const TAO_Base_var &rhs);
-      HomeDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export HomeDef_out
+    struct TAO_IFR_Client_Export tao_HomeDef_cast
     {
-    public:
-      HomeDef_out (HomeDef_ptr &);
-      HomeDef_out (HomeDef_var &);
-      HomeDef_out (const HomeDef_out &);
-      HomeDef_out &operator= (const HomeDef_out &);
-      HomeDef_out &operator= (const HomeDef_var &);
-      HomeDef_out &operator= (HomeDef_ptr);
-      operator HomeDef_ptr &();
-      HomeDef_ptr &ptr (void);
-      HomeDef_ptr operator-> (void);
-    
-    private:
-      HomeDef_ptr &ptr_;
+      static HomeDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_EVENTDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_EVENTDEF__ODDS_N_ENDS_CH_
     
     class EventDef;
     typedef EventDef *EventDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_EVENTDEF___VAR_CH_
+    struct tao_EventDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          EventDef,
+          tao_EventDef_life
+        >
+      EventDef_var;
     
-    class TAO_IFR_Client_Export EventDef_var : public TAO_Base_var
+    typedef
+      TAO_Objref_Out_T<
+          EventDef,
+          tao_EventDef_life
+        >
+      EventDef_out;
+    
+    struct TAO_IFR_Client_Export tao_EventDef_life
     {
-    public:
-      EventDef_var (void); // default constructor
-      EventDef_var (EventDef_ptr p) : ptr_ (p) {} 
-      EventDef_var (const EventDef_var &); // copy constructor
-      ~EventDef_var (void); // destructor
-      
-      EventDef_var &operator= (EventDef_ptr);
-      EventDef_var &operator= (const EventDef_var &);
-      EventDef_ptr operator-> (void) const;
-      
-      operator const EventDef_ptr &() const;
-      operator EventDef_ptr &();
-      // in, inout, out, _retn 
-      EventDef_ptr in (void) const;
-      EventDef_ptr &inout (void);
-      EventDef_ptr &out (void);
-      EventDef_ptr _retn (void);
-      EventDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static EventDef_ptr tao_duplicate (EventDef_ptr);
       static void tao_release (EventDef_ptr);
       static EventDef_ptr tao_nil (void);
-      static EventDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          EventDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      EventDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      EventDef_var (const TAO_Base_var &rhs);
-      EventDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_EVENTDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export EventDef_out
+    struct TAO_IFR_Client_Export tao_EventDef_cast
     {
-    public:
-      EventDef_out (EventDef_ptr &);
-      EventDef_out (EventDef_var &);
-      EventDef_out (const EventDef_out &);
-      EventDef_out &operator= (const EventDef_out &);
-      EventDef_out &operator= (const EventDef_var &);
-      EventDef_out &operator= (EventDef_ptr);
-      operator EventDef_ptr &();
-      EventDef_ptr &ptr (void);
-      EventDef_ptr operator-> (void);
-    
-    private:
-      EventDef_ptr &ptr_;
+      static EventDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF_CH_)
 #define _CORBA_COMPONENTIR_EVENTDEF_CH_
@@ -364,7 +246,7 @@ TAO_NAMESPACE  CORBA
       static void _tao_any_destructor (void *);
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -523,90 +405,53 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_CONTAINER___PTR_CH_)
-#define _CORBA_COMPONENTIR_CONTAINER___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_CONTAINER__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_CONTAINER__ODDS_N_ENDS_CH_
     
     class Container;
     typedef Container *Container_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONTAINER___VAR_CH_)
-#define _CORBA_COMPONENTIR_CONTAINER___VAR_CH_
+    struct tao_Container_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          Container,
+          tao_Container_life
+        >
+      Container_var;
     
-    class TAO_IFR_Client_Export Container_var : public TAO_Base_var
+    typedef
+      TAO_Objref_Out_T<
+          Container,
+          tao_Container_life
+        >
+      Container_out;
+    
+    struct TAO_IFR_Client_Export tao_Container_life
     {
-    public:
-      Container_var (void); // default constructor
-      Container_var (Container_ptr p) : ptr_ (p) {} 
-      Container_var (const Container_var &); // copy constructor
-      ~Container_var (void); // destructor
-      
-      Container_var &operator= (Container_ptr);
-      Container_var &operator= (const Container_var &);
-      Container_ptr operator-> (void) const;
-      
-      operator const Container_ptr &() const;
-      operator Container_ptr &();
-      // in, inout, out, _retn 
-      Container_ptr in (void) const;
-      Container_ptr &inout (void);
-      Container_ptr &out (void);
-      Container_ptr _retn (void);
-      Container_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static Container_ptr tao_duplicate (Container_ptr);
       static void tao_release (Container_ptr);
       static Container_ptr tao_nil (void);
-      static Container_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          Container_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      Container_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      Container_var (const TAO_Base_var &rhs);
-      Container_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONTAINER___OUT_CH_)
-#define _CORBA_COMPONENTIR_CONTAINER___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export Container_out
+    struct TAO_IFR_Client_Export tao_Container_cast
     {
-    public:
-      Container_out (Container_ptr &);
-      Container_out (Container_var &);
-      Container_out (const Container_out &);
-      Container_out &operator= (const Container_out &);
-      Container_out &operator= (const Container_var &);
-      Container_out &operator= (Container_ptr);
-      operator Container_ptr &();
-      Container_ptr &ptr (void);
-      Container_ptr operator-> (void);
-    
-    private:
-      Container_ptr &ptr_;
+      static Container_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_CONTAINER_CH_)
 #define _CORBA_COMPONENTIR_CONTAINER_CH_
@@ -697,7 +542,7 @@ TAO_NAMESPACE  CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -965,90 +810,53 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Container;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_MODULEDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_MODULEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_MODULEDEF__ODDS_N_ENDS_CH_
     
     class ModuleDef;
     typedef ModuleDef *ModuleDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_MODULEDEF___VAR_CH_
+    struct tao_ModuleDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          ModuleDef,
+          tao_ModuleDef_life
+        >
+      ModuleDef_var;
+    
+    typedef
+      TAO_Objref_Out_T<
+          ModuleDef,
+          tao_ModuleDef_life
+        >
+      ModuleDef_out;
     
-    class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
+    struct TAO_IFR_Client_Export tao_ModuleDef_life
     {
-    public:
-      ModuleDef_var (void); // default constructor
-      ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {} 
-      ModuleDef_var (const ModuleDef_var &); // copy constructor
-      ~ModuleDef_var (void); // destructor
-      
-      ModuleDef_var &operator= (ModuleDef_ptr);
-      ModuleDef_var &operator= (const ModuleDef_var &);
-      ModuleDef_ptr operator-> (void) const;
-      
-      operator const ModuleDef_ptr &() const;
-      operator ModuleDef_ptr &();
-      // in, inout, out, _retn 
-      ModuleDef_ptr in (void) const;
-      ModuleDef_ptr &inout (void);
-      ModuleDef_ptr &out (void);
-      ModuleDef_ptr _retn (void);
-      ModuleDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static ModuleDef_ptr tao_duplicate (ModuleDef_ptr);
       static void tao_release (ModuleDef_ptr);
       static ModuleDef_ptr tao_nil (void);
-      static ModuleDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          ModuleDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      ModuleDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      ModuleDef_var (const TAO_Base_var &rhs);
-      ModuleDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_MODULEDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export ModuleDef_out
+    struct TAO_IFR_Client_Export tao_ModuleDef_cast
     {
-    public:
-      ModuleDef_out (ModuleDef_ptr &);
-      ModuleDef_out (ModuleDef_var &);
-      ModuleDef_out (const ModuleDef_out &);
-      ModuleDef_out &operator= (const ModuleDef_out &);
-      ModuleDef_out &operator= (const ModuleDef_var &);
-      ModuleDef_out &operator= (ModuleDef_ptr);
-      operator ModuleDef_ptr &();
-      ModuleDef_ptr &ptr (void);
-      ModuleDef_ptr operator-> (void);
-    
-    private:
-      ModuleDef_ptr &ptr_;
+      static ModuleDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_MODULEDEF_CH_)
 #define _CORBA_COMPONENTIR_MODULEDEF_CH_
@@ -1088,7 +896,7 @@ TAO_NAMESPACE  CORBA
       static void _tao_any_destructor (void *);
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -1249,90 +1057,53 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ModuleDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY___PTR_CH_)
-#define _CORBA_COMPONENTIR_REPOSITORY___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_REPOSITORY__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_REPOSITORY__ODDS_N_ENDS_CH_
     
     class Repository;
     typedef Repository *Repository_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY___VAR_CH_)
-#define _CORBA_COMPONENTIR_REPOSITORY___VAR_CH_
+    struct tao_Repository_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          Repository,
+          tao_Repository_life
+        >
+      Repository_var;
+    
+    typedef
+      TAO_Objref_Out_T<
+          Repository,
+          tao_Repository_life
+        >
+      Repository_out;
     
-    class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
+    struct TAO_IFR_Client_Export tao_Repository_life
     {
-    public:
-      Repository_var (void); // default constructor
-      Repository_var (Repository_ptr p) : ptr_ (p) {} 
-      Repository_var (const Repository_var &); // copy constructor
-      ~Repository_var (void); // destructor
-      
-      Repository_var &operator= (Repository_ptr);
-      Repository_var &operator= (const Repository_var &);
-      Repository_ptr operator-> (void) const;
-      
-      operator const Repository_ptr &() const;
-      operator Repository_ptr &();
-      // in, inout, out, _retn 
-      Repository_ptr in (void) const;
-      Repository_ptr &inout (void);
-      Repository_ptr &out (void);
-      Repository_ptr _retn (void);
-      Repository_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static Repository_ptr tao_duplicate (Repository_ptr);
       static void tao_release (Repository_ptr);
       static Repository_ptr tao_nil (void);
-      static Repository_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          Repository_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      Repository_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      Repository_var (const TAO_Base_var &rhs);
-      Repository_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY___OUT_CH_)
-#define _CORBA_COMPONENTIR_REPOSITORY___OUT_CH_
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-    
-    class TAO_IFR_Client_Export Repository_out
+    struct TAO_IFR_Client_Export tao_Repository_cast
     {
-    public:
-      Repository_out (Repository_ptr &);
-      Repository_out (Repository_var &);
-      Repository_out (const Repository_out &);
-      Repository_out &operator= (const Repository_out &);
-      Repository_out &operator= (const Repository_var &);
-      Repository_out &operator= (Repository_ptr);
-      operator Repository_ptr &();
-      Repository_ptr &ptr (void);
-      Repository_ptr operator-> (void);
-    
-    private:
-      Repository_ptr &ptr_;
+      static Repository_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_REPOSITORY_CH_)
 #define _CORBA_COMPONENTIR_REPOSITORY_CH_
@@ -1372,7 +1143,7 @@ TAO_NAMESPACE  CORBA
       static void _tao_any_destructor (void *);
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -1533,90 +1304,53 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Repository;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF__ODDS_N_ENDS_CH_
     
     class ProvidesDef;
     typedef ProvidesDef *ProvidesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF___VAR_CH_
+    struct tao_ProvidesDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          ProvidesDef,
+          tao_ProvidesDef_life
+        >
+      ProvidesDef_var;
+    
+    typedef
+      TAO_Objref_Out_T<
+          ProvidesDef,
+          tao_ProvidesDef_life
+        >
+      ProvidesDef_out;
     
-    class TAO_IFR_Client_Export ProvidesDef_var : public TAO_Base_var
+    struct TAO_IFR_Client_Export tao_ProvidesDef_life
     {
-    public:
-      ProvidesDef_var (void); // default constructor
-      ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {} 
-      ProvidesDef_var (const ProvidesDef_var &); // copy constructor
-      ~ProvidesDef_var (void); // destructor
-      
-      ProvidesDef_var &operator= (ProvidesDef_ptr);
-      ProvidesDef_var &operator= (const ProvidesDef_var &);
-      ProvidesDef_ptr operator-> (void) const;
-      
-      operator const ProvidesDef_ptr &() const;
-      operator ProvidesDef_ptr &();
-      // in, inout, out, _retn 
-      ProvidesDef_ptr in (void) const;
-      ProvidesDef_ptr &inout (void);
-      ProvidesDef_ptr &out (void);
-      ProvidesDef_ptr _retn (void);
-      ProvidesDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static ProvidesDef_ptr tao_duplicate (ProvidesDef_ptr);
       static void tao_release (ProvidesDef_ptr);
       static ProvidesDef_ptr tao_nil (void);
-      static ProvidesDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          ProvidesDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      ProvidesDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      ProvidesDef_var (const TAO_Base_var &rhs);
-      ProvidesDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF___OUT_CH_
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-    
-    class TAO_IFR_Client_Export ProvidesDef_out
+    struct TAO_IFR_Client_Export tao_ProvidesDef_cast
     {
-    public:
-      ProvidesDef_out (ProvidesDef_ptr &);
-      ProvidesDef_out (ProvidesDef_var &);
-      ProvidesDef_out (const ProvidesDef_out &);
-      ProvidesDef_out &operator= (const ProvidesDef_out &);
-      ProvidesDef_out &operator= (const ProvidesDef_var &);
-      ProvidesDef_out &operator= (ProvidesDef_ptr);
-      operator ProvidesDef_ptr &();
-      ProvidesDef_ptr &ptr (void);
-      ProvidesDef_ptr operator-> (void);
-    
-    private:
-      ProvidesDef_ptr &ptr_;
+      static ProvidesDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF_CH_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF_CH_
@@ -1676,7 +1410,7 @@ TAO_NAMESPACE  CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -1881,9 +1615,25 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+    
+    struct ProvidesDescription;
+    
+    typedef
+      TAO_Var_Var_T<
+          ProvidesDescription
+        >
+      ProvidesDescription_var;
     
-    class ProvidesDescription_var;
+    typedef
+      TAO_Out_T<
+          ProvidesDescription,
+          ProvidesDescription_var
+        >
+      ProvidesDescription_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
     
     struct TAO_IFR_Client_Export ProvidesDescription
     {
@@ -1898,150 +1648,58 @@ TAO_NAMESPACE  CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export ProvidesDescription_var
-    {
-    public:
-      ProvidesDescription_var (void);
-      ProvidesDescription_var (ProvidesDescription *);
-      ProvidesDescription_var (const ProvidesDescription_var &);
-      ~ProvidesDescription_var (void);
-      
-      ProvidesDescription_var &operator= (ProvidesDescription *);
-      ProvidesDescription_var &operator= (const ProvidesDescription_var &);
-      ProvidesDescription *operator-> (void);
-      const ProvidesDescription *operator-> (void) const;
-      
-      operator const ProvidesDescription &() const;
-      operator ProvidesDescription &();
-      operator ProvidesDescription &() const;
-      
-      // Variable-size types only.
-      operator ProvidesDescription *&();
-      
-      // in, inout, out, _retn 
-      const ProvidesDescription &in (void) const;
-      ProvidesDescription &inout (void);
-      ProvidesDescription *&out (void);
-      ProvidesDescription *_retn (void);
-      ProvidesDescription *ptr (void) const;
-    
-    private:
-      ProvidesDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export ProvidesDescription_out
-    {
-    public:
-      ProvidesDescription_out (ProvidesDescription *&);
-      ProvidesDescription_out (ProvidesDescription_var &);
-      ProvidesDescription_out (const ProvidesDescription_out &);
-      ProvidesDescription_out &operator= (const ProvidesDescription_out &);
-      ProvidesDescription_out &operator= (ProvidesDescription *);
-      operator ProvidesDescription *&();
-      ProvidesDescription *&ptr (void);
-      ProvidesDescription *operator-> (void);
-      
-    private:
-      ProvidesDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const ProvidesDescription_var &);
-    };
-    
-    // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDescription;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_USESDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_USESDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_USESDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_USESDEF__ODDS_N_ENDS_CH_
     
     class UsesDef;
     typedef UsesDef *UsesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_USESDEF___VAR_CH_
+    struct tao_UsesDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          UsesDef,
+          tao_UsesDef_life
+        >
+      UsesDef_var;
     
-    class TAO_IFR_Client_Export UsesDef_var : public TAO_Base_var
+    typedef
+      TAO_Objref_Out_T<
+          UsesDef,
+          tao_UsesDef_life
+        >
+      UsesDef_out;
+    
+    struct TAO_IFR_Client_Export tao_UsesDef_life
     {
-    public:
-      UsesDef_var (void); // default constructor
-      UsesDef_var (UsesDef_ptr p) : ptr_ (p) {} 
-      UsesDef_var (const UsesDef_var &); // copy constructor
-      ~UsesDef_var (void); // destructor
-      
-      UsesDef_var &operator= (UsesDef_ptr);
-      UsesDef_var &operator= (const UsesDef_var &);
-      UsesDef_ptr operator-> (void) const;
-      
-      operator const UsesDef_ptr &() const;
-      operator UsesDef_ptr &();
-      // in, inout, out, _retn 
-      UsesDef_ptr in (void) const;
-      UsesDef_ptr &inout (void);
-      UsesDef_ptr &out (void);
-      UsesDef_ptr _retn (void);
-      UsesDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static UsesDef_ptr tao_duplicate (UsesDef_ptr);
       static void tao_release (UsesDef_ptr);
       static UsesDef_ptr tao_nil (void);
-      static UsesDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          UsesDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      UsesDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      UsesDef_var (const TAO_Base_var &rhs);
-      UsesDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_USESDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export UsesDef_out
+    struct TAO_IFR_Client_Export tao_UsesDef_cast
     {
-    public:
-      UsesDef_out (UsesDef_ptr &);
-      UsesDef_out (UsesDef_var &);
-      UsesDef_out (const UsesDef_out &);
-      UsesDef_out &operator= (const UsesDef_out &);
-      UsesDef_out &operator= (const UsesDef_var &);
-      UsesDef_out &operator= (UsesDef_ptr);
-      operator UsesDef_ptr &();
-      UsesDef_ptr &ptr (void);
-      UsesDef_ptr operator-> (void);
-    
-    private:
-      UsesDef_ptr &ptr_;
+      static UsesDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF_CH_)
 #define _CORBA_COMPONENTIR_USESDEF_CH_
@@ -2122,7 +1780,7 @@ TAO_NAMESPACE  CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -2373,9 +2031,25 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+    
+    struct UsesDescription;
     
-    class UsesDescription_var;
+    typedef
+      TAO_Var_Var_T<
+          UsesDescription
+        >
+      UsesDescription_var;
+    
+    typedef
+      TAO_Out_T<
+          UsesDescription,
+          UsesDescription_var
+        >
+      UsesDescription_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
     
     struct TAO_IFR_Client_Export UsesDescription
     {
@@ -2391,150 +2065,58 @@ TAO_NAMESPACE  CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export UsesDescription_var
-    {
-    public:
-      UsesDescription_var (void);
-      UsesDescription_var (UsesDescription *);
-      UsesDescription_var (const UsesDescription_var &);
-      ~UsesDescription_var (void);
-      
-      UsesDescription_var &operator= (UsesDescription *);
-      UsesDescription_var &operator= (const UsesDescription_var &);
-      UsesDescription *operator-> (void);
-      const UsesDescription *operator-> (void) const;
-      
-      operator const UsesDescription &() const;
-      operator UsesDescription &();
-      operator UsesDescription &() const;
-      
-      // Variable-size types only.
-      operator UsesDescription *&();
-      
-      // in, inout, out, _retn 
-      const UsesDescription &in (void) const;
-      UsesDescription &inout (void);
-      UsesDescription *&out (void);
-      UsesDescription *_retn (void);
-      UsesDescription *ptr (void) const;
-    
-    private:
-      UsesDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export UsesDescription_out
-    {
-    public:
-      UsesDescription_out (UsesDescription *&);
-      UsesDescription_out (UsesDescription_var &);
-      UsesDescription_out (const UsesDescription_out &);
-      UsesDescription_out &operator= (const UsesDescription_out &);
-      UsesDescription_out &operator= (UsesDescription *);
-      operator UsesDescription *&();
-      UsesDescription *&ptr (void);
-      UsesDescription *operator-> (void);
-      
-    private:
-      UsesDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const UsesDescription_var &);
-    };
-    
-    // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDescription;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_EVENTPORTDEF__ODDS_N_ENDS_CH_
     
     class EventPortDef;
     typedef EventPortDef *EventPortDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF___VAR_CH_
+    struct tao_EventPortDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          EventPortDef,
+          tao_EventPortDef_life
+        >
+      EventPortDef_var;
+    
+    typedef
+      TAO_Objref_Out_T<
+          EventPortDef,
+          tao_EventPortDef_life
+        >
+      EventPortDef_out;
     
-    class TAO_IFR_Client_Export EventPortDef_var : public TAO_Base_var
+    struct TAO_IFR_Client_Export tao_EventPortDef_life
     {
-    public:
-      EventPortDef_var (void); // default constructor
-      EventPortDef_var (EventPortDef_ptr p) : ptr_ (p) {} 
-      EventPortDef_var (const EventPortDef_var &); // copy constructor
-      ~EventPortDef_var (void); // destructor
-      
-      EventPortDef_var &operator= (EventPortDef_ptr);
-      EventPortDef_var &operator= (const EventPortDef_var &);
-      EventPortDef_ptr operator-> (void) const;
-      
-      operator const EventPortDef_ptr &() const;
-      operator EventPortDef_ptr &();
-      // in, inout, out, _retn 
-      EventPortDef_ptr in (void) const;
-      EventPortDef_ptr &inout (void);
-      EventPortDef_ptr &out (void);
-      EventPortDef_ptr _retn (void);
-      EventPortDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static EventPortDef_ptr tao_duplicate (EventPortDef_ptr);
       static void tao_release (EventPortDef_ptr);
       static EventPortDef_ptr tao_nil (void);
-      static EventPortDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          EventPortDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      EventPortDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      EventPortDef_var (const TAO_Base_var &rhs);
-      EventPortDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF___OUT_CH_
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-    
-    class TAO_IFR_Client_Export EventPortDef_out
+    struct TAO_IFR_Client_Export tao_EventPortDef_cast
     {
-    public:
-      EventPortDef_out (EventPortDef_ptr &);
-      EventPortDef_out (EventPortDef_var &);
-      EventPortDef_out (const EventPortDef_out &);
-      EventPortDef_out &operator= (const EventPortDef_out &);
-      EventPortDef_out &operator= (const EventPortDef_var &);
-      EventPortDef_out &operator= (EventPortDef_ptr);
-      operator EventPortDef_ptr &();
-      EventPortDef_ptr &ptr (void);
-      EventPortDef_ptr operator-> (void);
-    
-    private:
-      EventPortDef_ptr &ptr_;
+      static EventPortDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF_CH_)
 #define _CORBA_COMPONENTIR_EVENTPORTDEF_CH_
@@ -2605,7 +2187,7 @@ TAO_NAMESPACE  CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -2834,9 +2416,25 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventPortDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
     
-    class EventPortDescription_var;
+    struct EventPortDescription;
+    
+    typedef
+      TAO_Var_Var_T<
+          EventPortDescription
+        >
+      EventPortDescription_var;
+    
+    typedef
+      TAO_Out_T<
+          EventPortDescription,
+          EventPortDescription_var
+        >
+      EventPortDescription_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
     
     struct TAO_IFR_Client_Export EventPortDescription
     {
@@ -2851,150 +2449,58 @@ TAO_NAMESPACE  CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export EventPortDescription_var
-    {
-    public:
-      EventPortDescription_var (void);
-      EventPortDescription_var (EventPortDescription *);
-      EventPortDescription_var (const EventPortDescription_var &);
-      ~EventPortDescription_var (void);
-      
-      EventPortDescription_var &operator= (EventPortDescription *);
-      EventPortDescription_var &operator= (const EventPortDescription_var &);
-      EventPortDescription *operator-> (void);
-      const EventPortDescription *operator-> (void) const;
-      
-      operator const EventPortDescription &() const;
-      operator EventPortDescription &();
-      operator EventPortDescription &() const;
-      
-      // Variable-size types only.
-      operator EventPortDescription *&();
-      
-      // in, inout, out, _retn 
-      const EventPortDescription &in (void) const;
-      EventPortDescription &inout (void);
-      EventPortDescription *&out (void);
-      EventPortDescription *_retn (void);
-      EventPortDescription *ptr (void) const;
-    
-    private:
-      EventPortDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export EventPortDescription_out
-    {
-    public:
-      EventPortDescription_out (EventPortDescription *&);
-      EventPortDescription_out (EventPortDescription_var &);
-      EventPortDescription_out (const EventPortDescription_out &);
-      EventPortDescription_out &operator= (const EventPortDescription_out &);
-      EventPortDescription_out &operator= (EventPortDescription *);
-      operator EventPortDescription *&();
-      EventPortDescription *&ptr (void);
-      EventPortDescription *operator-> (void);
-      
-    private:
-      EventPortDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const EventPortDescription_var &);
-    };
-    
-    // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventPortDescription;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_EMITSDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_EMITSDEF__ODDS_N_ENDS_CH_
     
     class EmitsDef;
     typedef EmitsDef *EmitsDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_EMITSDEF___VAR_CH_
+    struct tao_EmitsDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          EmitsDef,
+          tao_EmitsDef_life
+        >
+      EmitsDef_var;
     
-    class TAO_IFR_Client_Export EmitsDef_var : public TAO_Base_var
+    typedef
+      TAO_Objref_Out_T<
+          EmitsDef,
+          tao_EmitsDef_life
+        >
+      EmitsDef_out;
+    
+    struct TAO_IFR_Client_Export tao_EmitsDef_life
     {
-    public:
-      EmitsDef_var (void); // default constructor
-      EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {} 
-      EmitsDef_var (const EmitsDef_var &); // copy constructor
-      ~EmitsDef_var (void); // destructor
-      
-      EmitsDef_var &operator= (EmitsDef_ptr);
-      EmitsDef_var &operator= (const EmitsDef_var &);
-      EmitsDef_ptr operator-> (void) const;
-      
-      operator const EmitsDef_ptr &() const;
-      operator EmitsDef_ptr &();
-      // in, inout, out, _retn 
-      EmitsDef_ptr in (void) const;
-      EmitsDef_ptr &inout (void);
-      EmitsDef_ptr &out (void);
-      EmitsDef_ptr _retn (void);
-      EmitsDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static EmitsDef_ptr tao_duplicate (EmitsDef_ptr);
       static void tao_release (EmitsDef_ptr);
       static EmitsDef_ptr tao_nil (void);
-      static EmitsDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          EmitsDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      EmitsDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      EmitsDef_var (const TAO_Base_var &rhs);
-      EmitsDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_EMITSDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export EmitsDef_out
+    struct TAO_IFR_Client_Export tao_EmitsDef_cast
     {
-    public:
-      EmitsDef_out (EmitsDef_ptr &);
-      EmitsDef_out (EmitsDef_var &);
-      EmitsDef_out (const EmitsDef_out &);
-      EmitsDef_out &operator= (const EmitsDef_out &);
-      EmitsDef_out &operator= (const EmitsDef_var &);
-      EmitsDef_out &operator= (EmitsDef_ptr);
-      operator EmitsDef_ptr &();
-      EmitsDef_ptr &ptr (void);
-      EmitsDef_ptr operator-> (void);
-    
-    private:
-      EmitsDef_ptr &ptr_;
+      static EmitsDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF_CH_)
 #define _CORBA_COMPONENTIR_EMITSDEF_CH_
@@ -3033,7 +2539,7 @@ TAO_NAMESPACE  CORBA
       static void _tao_any_destructor (void *);
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -3192,90 +2698,53 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmitsDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF__ODDS_N_ENDS_CH_
     
     class PublishesDef;
     typedef PublishesDef *PublishesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF___VAR_CH_
+    struct tao_PublishesDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          PublishesDef,
+          tao_PublishesDef_life
+        >
+      PublishesDef_var;
+    
+    typedef
+      TAO_Objref_Out_T<
+          PublishesDef,
+          tao_PublishesDef_life
+        >
+      PublishesDef_out;
     
-    class TAO_IFR_Client_Export PublishesDef_var : public TAO_Base_var
+    struct TAO_IFR_Client_Export tao_PublishesDef_life
     {
-    public:
-      PublishesDef_var (void); // default constructor
-      PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {} 
-      PublishesDef_var (const PublishesDef_var &); // copy constructor
-      ~PublishesDef_var (void); // destructor
-      
-      PublishesDef_var &operator= (PublishesDef_ptr);
-      PublishesDef_var &operator= (const PublishesDef_var &);
-      PublishesDef_ptr operator-> (void) const;
-      
-      operator const PublishesDef_ptr &() const;
-      operator PublishesDef_ptr &();
-      // in, inout, out, _retn 
-      PublishesDef_ptr in (void) const;
-      PublishesDef_ptr &inout (void);
-      PublishesDef_ptr &out (void);
-      PublishesDef_ptr _retn (void);
-      PublishesDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static PublishesDef_ptr tao_duplicate (PublishesDef_ptr);
       static void tao_release (PublishesDef_ptr);
       static PublishesDef_ptr tao_nil (void);
-      static PublishesDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          PublishesDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      PublishesDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      PublishesDef_var (const TAO_Base_var &rhs);
-      PublishesDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export PublishesDef_out
+    struct TAO_IFR_Client_Export tao_PublishesDef_cast
     {
-    public:
-      PublishesDef_out (PublishesDef_ptr &);
-      PublishesDef_out (PublishesDef_var &);
-      PublishesDef_out (const PublishesDef_out &);
-      PublishesDef_out &operator= (const PublishesDef_out &);
-      PublishesDef_out &operator= (const PublishesDef_var &);
-      PublishesDef_out &operator= (PublishesDef_ptr);
-      operator PublishesDef_ptr &();
-      PublishesDef_ptr &ptr (void);
-      PublishesDef_ptr operator-> (void);
-    
-    private:
-      PublishesDef_ptr &ptr_;
+      static PublishesDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF_CH_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF_CH_
@@ -3314,7 +2783,7 @@ TAO_NAMESPACE  CORBA
       static void _tao_any_destructor (void *);
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -3473,90 +2942,53 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PublishesDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF__ODDS_N_ENDS_CH_
     
     class ConsumesDef;
     typedef ConsumesDef *ConsumesDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF___VAR_CH_
+    struct tao_ConsumesDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          ConsumesDef,
+          tao_ConsumesDef_life
+        >
+      ConsumesDef_var;
+    
+    typedef
+      TAO_Objref_Out_T<
+          ConsumesDef,
+          tao_ConsumesDef_life
+        >
+      ConsumesDef_out;
     
-    class TAO_IFR_Client_Export ConsumesDef_var : public TAO_Base_var
+    struct TAO_IFR_Client_Export tao_ConsumesDef_life
     {
-    public:
-      ConsumesDef_var (void); // default constructor
-      ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {} 
-      ConsumesDef_var (const ConsumesDef_var &); // copy constructor
-      ~ConsumesDef_var (void); // destructor
-      
-      ConsumesDef_var &operator= (ConsumesDef_ptr);
-      ConsumesDef_var &operator= (const ConsumesDef_var &);
-      ConsumesDef_ptr operator-> (void) const;
-      
-      operator const ConsumesDef_ptr &() const;
-      operator ConsumesDef_ptr &();
-      // in, inout, out, _retn 
-      ConsumesDef_ptr in (void) const;
-      ConsumesDef_ptr &inout (void);
-      ConsumesDef_ptr &out (void);
-      ConsumesDef_ptr _retn (void);
-      ConsumesDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static ConsumesDef_ptr tao_duplicate (ConsumesDef_ptr);
       static void tao_release (ConsumesDef_ptr);
       static ConsumesDef_ptr tao_nil (void);
-      static ConsumesDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          ConsumesDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      ConsumesDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      ConsumesDef_var (const TAO_Base_var &rhs);
-      ConsumesDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF___OUT_CH_
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-    
-    class TAO_IFR_Client_Export ConsumesDef_out
+    struct TAO_IFR_Client_Export tao_ConsumesDef_cast
     {
-    public:
-      ConsumesDef_out (ConsumesDef_ptr &);
-      ConsumesDef_out (ConsumesDef_var &);
-      ConsumesDef_out (const ConsumesDef_out &);
-      ConsumesDef_out &operator= (const ConsumesDef_out &);
-      ConsumesDef_out &operator= (const ConsumesDef_var &);
-      ConsumesDef_out &operator= (ConsumesDef_ptr);
-      operator ConsumesDef_ptr &();
-      ConsumesDef_ptr &ptr (void);
-      ConsumesDef_ptr operator-> (void);
-    
-    private:
-      ConsumesDef_ptr &ptr_;
+      static ConsumesDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF_CH_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF_CH_
@@ -3595,7 +3027,7 @@ TAO_NAMESPACE  CORBA
       static void _tao_any_destructor (void *);
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -3754,90 +3186,7 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConsumesDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF___PTR_CH_
-    
-    class ComponentDef;
-    typedef ComponentDef *ComponentDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF___VAR_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-    
-    class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
-    {
-    public:
-      ComponentDef_var (void); // default constructor
-      ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {} 
-      ComponentDef_var (const ComponentDef_var &); // copy constructor
-      ~ComponentDef_var (void); // destructor
-      
-      ComponentDef_var &operator= (ComponentDef_ptr);
-      ComponentDef_var &operator= (const ComponentDef_var &);
-      ComponentDef_ptr operator-> (void) const;
-      
-      operator const ComponentDef_ptr &() const;
-      operator ComponentDef_ptr &();
-      // in, inout, out, _retn 
-      ComponentDef_ptr in (void) const;
-      ComponentDef_ptr &inout (void);
-      ComponentDef_ptr &out (void);
-      ComponentDef_ptr _retn (void);
-      ComponentDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
-      static ComponentDef_ptr tao_duplicate (ComponentDef_ptr);
-      static void tao_release (ComponentDef_ptr);
-      static ComponentDef_ptr tao_nil (void);
-      static ComponentDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
-        );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      ComponentDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      ComponentDef_var (const TAO_Base_var &rhs);
-      ComponentDef_var &operator= (const TAO_Base_var &rhs);
-    };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-    
-    class TAO_IFR_Client_Export ComponentDef_out
-    {
-    public:
-      ComponentDef_out (ComponentDef_ptr &);
-      ComponentDef_out (ComponentDef_var &);
-      ComponentDef_out (const ComponentDef_out &);
-      ComponentDef_out &operator= (const ComponentDef_out &);
-      ComponentDef_out &operator= (const ComponentDef_var &);
-      ComponentDef_out &operator= (ComponentDef_ptr);
-      operator ComponentDef_ptr &();
-      ComponentDef_ptr &ptr (void);
-      ComponentDef_ptr operator-> (void);
-    
-    private:
-      ComponentDef_ptr &ptr_;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF_CH_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF_CH_
@@ -3989,7 +3338,7 @@ TAO_NAMESPACE  CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -4391,535 +3740,170 @@ TAO_NAMESPACE  CORBA
     
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentDef;
     
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_
-    
-    class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (void);
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          ProvidesDescription *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (
-          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &rhs
-        );
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &operator= (
-          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (void);
-      
-      // = Accessors.
-      ProvidesDescription &operator[] (CORBA::ULong i);
-      const ProvidesDescription &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static ProvidesDescription *allocbuf (CORBA::ULong size);
-      static void freebuf (ProvidesDescription *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
-      const ProvidesDescription *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          ProvidesDescription *data,
-          CORBA::Boolean release
-        );
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
     
     class ProvidesDescriptionSeq;
-    class ProvidesDescriptionSeq_var;
-    
-    // *************************************************************
-    // CORBA::ComponentIR::ProvidesDescriptionSeq
-    // *************************************************************
     
-    class TAO_IFR_Client_Export ProvidesDescriptionSeq : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<ProvidesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    typedef
+      TAO_VarSeq_Var_T<
+          ProvidesDescriptionSeq,
+          ProvidesDescription
+        >
+      ProvidesDescriptionSeq_var;
+    
+    typedef
+      TAO_Seq_Out_T<
+          ProvidesDescriptionSeq,
+          ProvidesDescriptionSeq_var,
+          ProvidesDescription
+        >
+      ProvidesDescriptionSeq_out;
+    
+    class TAO_IFR_Client_Export ProvidesDescriptionSeq
+      : public
+          TAO_Unbounded_Sequence<
+              ProvidesDescription
+            >
     {
     public:
       ProvidesDescriptionSeq (void);
       ProvidesDescriptionSeq (CORBA::ULong max);
       ProvidesDescriptionSeq (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          ProvidesDescription *buffer, 
+          CORBA::ULong max,
+          CORBA::ULong length,
+          ProvidesDescription* buffer, 
           CORBA::Boolean release = 0
         );
       ProvidesDescriptionSeq (const ProvidesDescriptionSeq &);
       ~ProvidesDescriptionSeq (void);
       
-      static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void *);
       
       typedef ProvidesDescriptionSeq_var _var_type;
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ___VAR_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-    
-    // *************************************************************
-    // class CORBA::ComponentIR::ProvidesDescriptionSeq_var
-    // *************************************************************
-    
-    class TAO_IFR_Client_Export ProvidesDescriptionSeq_var
-    {
-    public:
-      ProvidesDescriptionSeq_var (void);
-      ProvidesDescriptionSeq_var (ProvidesDescriptionSeq *);
-      ProvidesDescriptionSeq_var (const ProvidesDescriptionSeq_var &);
-      ~ProvidesDescriptionSeq_var (void);
-      
-      ProvidesDescriptionSeq_var &operator= (ProvidesDescriptionSeq *);
-      ProvidesDescriptionSeq_var &operator= (const ProvidesDescriptionSeq_var &);
-      ProvidesDescriptionSeq *operator-> (void);
-      const ProvidesDescriptionSeq *operator-> (void) const;
-      
-      operator const ProvidesDescriptionSeq &() const;
-      operator ProvidesDescriptionSeq &();
-      operator ProvidesDescriptionSeq &() const;
-      
-      // Variable-size base types only.
-      operator ProvidesDescriptionSeq *&();
-      
-      ProvidesDescription & operator[] (CORBA::ULong index);
-      const ProvidesDescription & operator[] (CORBA::ULong index) const;
-      
-      // in, inout, out, _retn 
-      const ProvidesDescriptionSeq &in (void) const;
-      ProvidesDescriptionSeq &inout (void);
-      ProvidesDescriptionSeq *&out (void);
-      ProvidesDescriptionSeq *_retn (void);
-      ProvidesDescriptionSeq *ptr (void) const;
-    
-    private:
-      ProvidesDescriptionSeq *ptr_;
-    };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-    
-    class TAO_IFR_Client_Export ProvidesDescriptionSeq_out
-    {
-    public:
-      ProvidesDescriptionSeq_out (ProvidesDescriptionSeq *&);
-      ProvidesDescriptionSeq_out (ProvidesDescriptionSeq_var &);
-      ProvidesDescriptionSeq_out (const ProvidesDescriptionSeq_out &);
-      ProvidesDescriptionSeq_out &operator= (const ProvidesDescriptionSeq_out &);
-      ProvidesDescriptionSeq_out &operator= (ProvidesDescriptionSeq *);
-      operator ProvidesDescriptionSeq *&();
-      ProvidesDescriptionSeq *&ptr (void);
-      ProvidesDescriptionSeq *operator-> (void);
-      ProvidesDescription & operator[] (CORBA::ULong index);
-    
-    private:
-      ProvidesDescriptionSeq *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const ProvidesDescriptionSeq_var &);
-    };
-
-#endif /* end #if !defined */
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProvidesDescriptionSeq;
     
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_
-    
-    class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (void);
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          UsesDescription *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (
-          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &rhs
-        );
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &operator= (
-          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (void);
-      
-      // = Accessors.
-      UsesDescription &operator[] (CORBA::ULong i);
-      const UsesDescription &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static UsesDescription *allocbuf (CORBA::ULong size);
-      static void freebuf (UsesDescription *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
-      const UsesDescription *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          UsesDescription *data,
-          CORBA::Boolean release
-        );
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_)
-#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
     
     class UsesDescriptionSeq;
-    class UsesDescriptionSeq_var;
-    
-    // *************************************************************
-    // CORBA::ComponentIR::UsesDescriptionSeq
-    // *************************************************************
     
-    class TAO_IFR_Client_Export UsesDescriptionSeq : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<UsesDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    typedef
+      TAO_VarSeq_Var_T<
+          UsesDescriptionSeq,
+          UsesDescription
+        >
+      UsesDescriptionSeq_var;
+    
+    typedef
+      TAO_Seq_Out_T<
+          UsesDescriptionSeq,
+          UsesDescriptionSeq_var,
+          UsesDescription
+        >
+      UsesDescriptionSeq_out;
+    
+    class TAO_IFR_Client_Export UsesDescriptionSeq
+      : public
+          TAO_Unbounded_Sequence<
+              UsesDescription
+            >
     {
     public:
       UsesDescriptionSeq (void);
       UsesDescriptionSeq (CORBA::ULong max);
       UsesDescriptionSeq (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          UsesDescription *buffer, 
+          CORBA::ULong max,
+          CORBA::ULong length,
+          UsesDescription* buffer, 
           CORBA::Boolean release = 0
         );
       UsesDescriptionSeq (const UsesDescriptionSeq &);
       ~UsesDescriptionSeq (void);
       
-      static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void *);
       
       typedef UsesDescriptionSeq_var _var_type;
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ___VAR_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-    
-    // *************************************************************
-    // class CORBA::ComponentIR::UsesDescriptionSeq_var
-    // *************************************************************
-    
-    class TAO_IFR_Client_Export UsesDescriptionSeq_var
-    {
-    public:
-      UsesDescriptionSeq_var (void);
-      UsesDescriptionSeq_var (UsesDescriptionSeq *);
-      UsesDescriptionSeq_var (const UsesDescriptionSeq_var &);
-      ~UsesDescriptionSeq_var (void);
-      
-      UsesDescriptionSeq_var &operator= (UsesDescriptionSeq *);
-      UsesDescriptionSeq_var &operator= (const UsesDescriptionSeq_var &);
-      UsesDescriptionSeq *operator-> (void);
-      const UsesDescriptionSeq *operator-> (void) const;
-      
-      operator const UsesDescriptionSeq &() const;
-      operator UsesDescriptionSeq &();
-      operator UsesDescriptionSeq &() const;
-      
-      // Variable-size base types only.
-      operator UsesDescriptionSeq *&();
-      
-      UsesDescription & operator[] (CORBA::ULong index);
-      const UsesDescription & operator[] (CORBA::ULong index) const;
-      
-      // in, inout, out, _retn 
-      const UsesDescriptionSeq &in (void) const;
-      UsesDescriptionSeq &inout (void);
-      UsesDescriptionSeq *&out (void);
-      UsesDescriptionSeq *_retn (void);
-      UsesDescriptionSeq *ptr (void) const;
-    
-    private:
-      UsesDescriptionSeq *ptr_;
-    };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-    
-    class TAO_IFR_Client_Export UsesDescriptionSeq_out
-    {
-    public:
-      UsesDescriptionSeq_out (UsesDescriptionSeq *&);
-      UsesDescriptionSeq_out (UsesDescriptionSeq_var &);
-      UsesDescriptionSeq_out (const UsesDescriptionSeq_out &);
-      UsesDescriptionSeq_out &operator= (const UsesDescriptionSeq_out &);
-      UsesDescriptionSeq_out &operator= (UsesDescriptionSeq *);
-      operator UsesDescriptionSeq *&();
-      UsesDescriptionSeq *&ptr (void);
-      UsesDescriptionSeq *operator-> (void);
-      UsesDescription & operator[] (CORBA::ULong index);
-    
-    private:
-      UsesDescriptionSeq *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const UsesDescriptionSeq_var &);
-    };
-
-#endif /* end #if !defined */
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UsesDescriptionSeq;
     
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_
-    
-    class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (void);
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          EventPortDescription *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (
-          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &rhs
-        );
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &operator= (
-          const _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (void);
-      
-      // = Accessors.
-      EventPortDescription &operator[] (CORBA::ULong i);
-      const EventPortDescription &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static EventPortDescription *allocbuf (CORBA::ULong size);
-      static void freebuf (EventPortDescription *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      EventPortDescription *get_buffer (CORBA::Boolean orphan = 0);
-      const EventPortDescription *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          EventPortDescription *data,
-          CORBA::Boolean release
-        );
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
     
     class EventPortDescriptionSeq;
-    class EventPortDescriptionSeq_var;
-    
-    // *************************************************************
-    // CORBA::ComponentIR::EventPortDescriptionSeq
-    // *************************************************************
     
-    class TAO_IFR_Client_Export EventPortDescriptionSeq : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<EventPortDescription>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    typedef
+      TAO_VarSeq_Var_T<
+          EventPortDescriptionSeq,
+          EventPortDescription
+        >
+      EventPortDescriptionSeq_var;
+    
+    typedef
+      TAO_Seq_Out_T<
+          EventPortDescriptionSeq,
+          EventPortDescriptionSeq_var,
+          EventPortDescription
+        >
+      EventPortDescriptionSeq_out;
+    
+    class TAO_IFR_Client_Export EventPortDescriptionSeq
+      : public
+          TAO_Unbounded_Sequence<
+              EventPortDescription
+            >
     {
     public:
       EventPortDescriptionSeq (void);
       EventPortDescriptionSeq (CORBA::ULong max);
       EventPortDescriptionSeq (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          EventPortDescription *buffer, 
+          CORBA::ULong max,
+          CORBA::ULong length,
+          EventPortDescription* buffer, 
           CORBA::Boolean release = 0
         );
       EventPortDescriptionSeq (const EventPortDescriptionSeq &);
       ~EventPortDescriptionSeq (void);
       
-      static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void *);
       
       typedef EventPortDescriptionSeq_var _var_type;
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ___VAR_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ___VAR_CH_
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-    
-    // *************************************************************
-    // class CORBA::ComponentIR::EventPortDescriptionSeq_var
-    // *************************************************************
-    
-    class TAO_IFR_Client_Export EventPortDescriptionSeq_var
-    {
-    public:
-      EventPortDescriptionSeq_var (void);
-      EventPortDescriptionSeq_var (EventPortDescriptionSeq *);
-      EventPortDescriptionSeq_var (const EventPortDescriptionSeq_var &);
-      ~EventPortDescriptionSeq_var (void);
-      
-      EventPortDescriptionSeq_var &operator= (EventPortDescriptionSeq *);
-      EventPortDescriptionSeq_var &operator= (const EventPortDescriptionSeq_var &);
-      EventPortDescriptionSeq *operator-> (void);
-      const EventPortDescriptionSeq *operator-> (void) const;
-      
-      operator const EventPortDescriptionSeq &() const;
-      operator EventPortDescriptionSeq &();
-      operator EventPortDescriptionSeq &() const;
-      
-      // Variable-size base types only.
-      operator EventPortDescriptionSeq *&();
-      
-      EventPortDescription & operator[] (CORBA::ULong index);
-      const EventPortDescription & operator[] (CORBA::ULong index) const;
-      
-      // in, inout, out, _retn 
-      const EventPortDescriptionSeq &in (void) const;
-      EventPortDescriptionSeq &inout (void);
-      EventPortDescriptionSeq *&out (void);
-      EventPortDescriptionSeq *_retn (void);
-      EventPortDescriptionSeq *ptr (void) const;
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
-    private:
-      EventPortDescriptionSeq *ptr_;
-    };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ___OUT_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ___OUT_CH_
+    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventPortDescriptionSeq;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
     
-    class TAO_IFR_Client_Export EventPortDescriptionSeq_out
-    {
-    public:
-      EventPortDescriptionSeq_out (EventPortDescriptionSeq *&);
-      EventPortDescriptionSeq_out (EventPortDescriptionSeq_var &);
-      EventPortDescriptionSeq_out (const EventPortDescriptionSeq_out &);
-      EventPortDescriptionSeq_out &operator= (const EventPortDescriptionSeq_out &);
-      EventPortDescriptionSeq_out &operator= (EventPortDescriptionSeq *);
-      operator EventPortDescriptionSeq *&();
-      EventPortDescriptionSeq *&ptr (void);
-      EventPortDescriptionSeq *operator-> (void);
-      EventPortDescription & operator[] (CORBA::ULong index);
-    
-    private:
-      EventPortDescriptionSeq *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const EventPortDescriptionSeq_var &);
-    };
-
-#endif /* end #if !defined */
+    struct ComponentDescription;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+    typedef
+      TAO_Var_Var_T<
+          ComponentDescription
+        >
+      ComponentDescription_var;
     
-    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EventPortDescriptionSeq;
+    typedef
+      TAO_Out_T<
+          ComponentDescription,
+          ComponentDescription_var
+        >
+      ComponentDescription_out;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-    
-    class ComponentDescription_var;
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
     
     struct TAO_IFR_Client_Export ComponentDescription
     {
@@ -4942,150 +3926,58 @@ TAO_NAMESPACE  CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export ComponentDescription_var
-    {
-    public:
-      ComponentDescription_var (void);
-      ComponentDescription_var (ComponentDescription *);
-      ComponentDescription_var (const ComponentDescription_var &);
-      ~ComponentDescription_var (void);
-      
-      ComponentDescription_var &operator= (ComponentDescription *);
-      ComponentDescription_var &operator= (const ComponentDescription_var &);
-      ComponentDescription *operator-> (void);
-      const ComponentDescription *operator-> (void) const;
-      
-      operator const ComponentDescription &() const;
-      operator ComponentDescription &();
-      operator ComponentDescription &() const;
-      
-      // Variable-size types only.
-      operator ComponentDescription *&();
-      
-      // in, inout, out, _retn 
-      const ComponentDescription &in (void) const;
-      ComponentDescription &inout (void);
-      ComponentDescription *&out (void);
-      ComponentDescription *_retn (void);
-      ComponentDescription *ptr (void) const;
-    
-    private:
-      ComponentDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export ComponentDescription_out
-    {
-    public:
-      ComponentDescription_out (ComponentDescription *&);
-      ComponentDescription_out (ComponentDescription_var &);
-      ComponentDescription_out (const ComponentDescription_out &);
-      ComponentDescription_out &operator= (const ComponentDescription_out &);
-      ComponentDescription_out &operator= (ComponentDescription *);
-      operator ComponentDescription *&();
-      ComponentDescription *&ptr (void);
-      ComponentDescription *operator-> (void);
-      
-    private:
-      ComponentDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const ComponentDescription_var &);
-    };
-    
-    // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentDescription;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_FACTORYDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_FACTORYDEF__ODDS_N_ENDS_CH_
     
     class FactoryDef;
     typedef FactoryDef *FactoryDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_FACTORYDEF___VAR_CH_
+    struct tao_FactoryDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          FactoryDef,
+          tao_FactoryDef_life
+        >
+      FactoryDef_var;
     
-    class TAO_IFR_Client_Export FactoryDef_var : public TAO_Base_var
+    typedef
+      TAO_Objref_Out_T<
+          FactoryDef,
+          tao_FactoryDef_life
+        >
+      FactoryDef_out;
+    
+    struct TAO_IFR_Client_Export tao_FactoryDef_life
     {
-    public:
-      FactoryDef_var (void); // default constructor
-      FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {} 
-      FactoryDef_var (const FactoryDef_var &); // copy constructor
-      ~FactoryDef_var (void); // destructor
-      
-      FactoryDef_var &operator= (FactoryDef_ptr);
-      FactoryDef_var &operator= (const FactoryDef_var &);
-      FactoryDef_ptr operator-> (void) const;
-      
-      operator const FactoryDef_ptr &() const;
-      operator FactoryDef_ptr &();
-      // in, inout, out, _retn 
-      FactoryDef_ptr in (void) const;
-      FactoryDef_ptr &inout (void);
-      FactoryDef_ptr &out (void);
-      FactoryDef_ptr _retn (void);
-      FactoryDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static FactoryDef_ptr tao_duplicate (FactoryDef_ptr);
       static void tao_release (FactoryDef_ptr);
       static FactoryDef_ptr tao_nil (void);
-      static FactoryDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          FactoryDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      FactoryDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      FactoryDef_var (const TAO_Base_var &rhs);
-      FactoryDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_FACTORYDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export FactoryDef_out
+    struct TAO_IFR_Client_Export tao_FactoryDef_cast
     {
-    public:
-      FactoryDef_out (FactoryDef_ptr &);
-      FactoryDef_out (FactoryDef_var &);
-      FactoryDef_out (const FactoryDef_out &);
-      FactoryDef_out &operator= (const FactoryDef_out &);
-      FactoryDef_out &operator= (const FactoryDef_var &);
-      FactoryDef_out &operator= (FactoryDef_ptr);
-      operator FactoryDef_ptr &();
-      FactoryDef_ptr &ptr (void);
-      FactoryDef_ptr operator-> (void);
-    
-    private:
-      FactoryDef_ptr &ptr_;
+      static FactoryDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF_CH_)
 #define _CORBA_COMPONENTIR_FACTORYDEF_CH_
@@ -5124,7 +4016,7 @@ TAO_NAMESPACE  CORBA
       static void _tao_any_destructor (void *);
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -5283,90 +4175,53 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FactoryDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_FINDERDEF___PTR_CH_
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_COMPONENTIR_FINDERDEF__ODDS_N_ENDS_CH_
     
     class FinderDef;
     typedef FinderDef *FinderDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_FINDERDEF___VAR_CH_
+    struct tao_FinderDef_life;
     
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+    typedef
+      TAO_Objref_Var_T<
+          FinderDef,
+          tao_FinderDef_life
+        >
+      FinderDef_var;
+    
+    typedef
+      TAO_Objref_Out_T<
+          FinderDef,
+          tao_FinderDef_life
+        >
+      FinderDef_out;
     
-    class TAO_IFR_Client_Export FinderDef_var : public TAO_Base_var
+    struct TAO_IFR_Client_Export tao_FinderDef_life
     {
-    public:
-      FinderDef_var (void); // default constructor
-      FinderDef_var (FinderDef_ptr p) : ptr_ (p) {} 
-      FinderDef_var (const FinderDef_var &); // copy constructor
-      ~FinderDef_var (void); // destructor
-      
-      FinderDef_var &operator= (FinderDef_ptr);
-      FinderDef_var &operator= (const FinderDef_var &);
-      FinderDef_ptr operator-> (void) const;
-      
-      operator const FinderDef_ptr &() const;
-      operator FinderDef_ptr &();
-      // in, inout, out, _retn 
-      FinderDef_ptr in (void) const;
-      FinderDef_ptr &inout (void);
-      FinderDef_ptr &out (void);
-      FinderDef_ptr _retn (void);
-      FinderDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
       static FinderDef_ptr tao_duplicate (FinderDef_ptr);
       static void tao_release (FinderDef_ptr);
       static FinderDef_ptr tao_nil (void);
-      static FinderDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
+      static CORBA::Boolean tao_marshal (
+          FinderDef_ptr,
+          TAO_OutputCDR &
         );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      FinderDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      FinderDef_var (const TAO_Base_var &rhs);
-      FinderDef_var &operator= (const TAO_Base_var &rhs);
     };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_FINDERDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
     
-    class TAO_IFR_Client_Export FinderDef_out
+    struct TAO_IFR_Client_Export tao_FinderDef_cast
     {
-    public:
-      FinderDef_out (FinderDef_ptr &);
-      FinderDef_out (FinderDef_var &);
-      FinderDef_out (const FinderDef_out &);
-      FinderDef_out &operator= (const FinderDef_out &);
-      FinderDef_out &operator= (const FinderDef_var &);
-      FinderDef_out &operator= (FinderDef_ptr);
-      operator FinderDef_ptr &();
-      FinderDef_ptr &ptr (void);
-      FinderDef_ptr operator-> (void);
-    
-    private:
-      FinderDef_ptr &ptr_;
+      static FinderDef_ptr tao_narrow (
+          CORBA::Object_ptr
+          ACE_ENV_ARG_DECL
+        );
+      static CORBA::Object_ptr tao_upcast (void *);
     };
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF_CH_)
 #define _CORBA_COMPONENTIR_FINDERDEF_CH_
@@ -5405,7 +4260,7 @@ TAO_NAMESPACE  CORBA
       static void _tao_any_destructor (void *);
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -5564,90 +4419,7 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FinderDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF___PTR_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF___PTR_CH_
-    
-    class HomeDef;
-    typedef HomeDef *HomeDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF___VAR_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF___VAR_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-    
-    class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
-    {
-    public:
-      HomeDef_var (void); // default constructor
-      HomeDef_var (HomeDef_ptr p) : ptr_ (p) {} 
-      HomeDef_var (const HomeDef_var &); // copy constructor
-      ~HomeDef_var (void); // destructor
-      
-      HomeDef_var &operator= (HomeDef_ptr);
-      HomeDef_var &operator= (const HomeDef_var &);
-      HomeDef_ptr operator-> (void) const;
-      
-      operator const HomeDef_ptr &() const;
-      operator HomeDef_ptr &();
-      // in, inout, out, _retn 
-      HomeDef_ptr in (void) const;
-      HomeDef_ptr &inout (void);
-      HomeDef_ptr &out (void);
-      HomeDef_ptr _retn (void);
-      HomeDef_ptr ptr (void) const;
-      
-      // Hooks used by template sequence and object manager classes
-      // for non-defined forward declared interfaces.
-      static HomeDef_ptr tao_duplicate (HomeDef_ptr);
-      static void tao_release (HomeDef_ptr);
-      static HomeDef_ptr tao_nil (void);
-      static HomeDef_ptr tao_narrow (
-          CORBA::Object *
-          ACE_ENV_ARG_DECL_NOT_USED
-        );
-      static CORBA::Object * tao_upcast (void *);
-    
-    private:
-      HomeDef_ptr ptr_;
-      // Unimplemented - prevents widening assignment.
-      HomeDef_var (const TAO_Base_var &rhs);
-      HomeDef_var &operator= (const TAO_Base_var &rhs);
-    };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF___OUT_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-    
-    class TAO_IFR_Client_Export HomeDef_out
-    {
-    public:
-      HomeDef_out (HomeDef_ptr &);
-      HomeDef_out (HomeDef_var &);
-      HomeDef_out (const HomeDef_out &);
-      HomeDef_out &operator= (const HomeDef_out &);
-      HomeDef_out &operator= (const HomeDef_var &);
-      HomeDef_out &operator= (HomeDef_ptr);
-      operator HomeDef_ptr &();
-      HomeDef_ptr &ptr (void);
-      HomeDef_ptr operator-> (void);
-    
-    private:
-      HomeDef_ptr &ptr_;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF_CH_)
 #define _CORBA_COMPONENTIR_HOMEDEF_CH_
@@ -5800,7 +4572,7 @@ TAO_NAMESPACE  CORBA
         ));
       
       // TAO_IDL - Generated from
-      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+      // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
       
       virtual CORBA::Boolean _is_a (
           const char *type_id
@@ -6207,9 +4979,25 @@ TAO_NAMESPACE  CORBA
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_HomeDef;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+    
+    struct HomeDescription;
+    
+    typedef
+      TAO_Var_Var_T<
+          HomeDescription
+        >
+      HomeDescription_var;
     
-    class HomeDescription_var;
+    typedef
+      TAO_Out_T<
+          HomeDescription,
+          HomeDescription_var
+        >
+      HomeDescription_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
     
     struct TAO_IFR_Client_Export HomeDescription
     {
@@ -6231,61 +5019,6 @@ TAO_NAMESPACE  CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export HomeDescription_var
-    {
-    public:
-      HomeDescription_var (void);
-      HomeDescription_var (HomeDescription *);
-      HomeDescription_var (const HomeDescription_var &);
-      ~HomeDescription_var (void);
-      
-      HomeDescription_var &operator= (HomeDescription *);
-      HomeDescription_var &operator= (const HomeDescription_var &);
-      HomeDescription *operator-> (void);
-      const HomeDescription *operator-> (void) const;
-      
-      operator const HomeDescription &() const;
-      operator HomeDescription &();
-      operator HomeDescription &() const;
-      
-      // Variable-size types only.
-      operator HomeDescription *&();
-      
-      // in, inout, out, _retn 
-      const HomeDescription &in (void) const;
-      HomeDescription &inout (void);
-      HomeDescription *&out (void);
-      HomeDescription *_retn (void);
-      HomeDescription *ptr (void) const;
-    
-    private:
-      HomeDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export HomeDescription_out
-    {
-    public:
-      HomeDescription_out (HomeDescription *&);
-      HomeDescription_out (HomeDescription_var &);
-      HomeDescription_out (const HomeDescription_out &);
-      HomeDescription_out &operator= (const HomeDescription_out &);
-      HomeDescription_out &operator= (HomeDescription *);
-      operator HomeDescription *&();
-      HomeDescription *&ptr (void);
-      HomeDescription *operator-> (void);
-      
-    private:
-      HomeDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const HomeDescription_var &);
-    };
-    
-    // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_HomeDescription;
@@ -6729,7 +5462,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Componen
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ComponentsC.i"
@@ -6746,4 +5479,3 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Componen
 #include "ace/post.h"
 #endif /* ifndef */
 
-
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.i b/TAO/tao/IFR_Client/IFR_ComponentsC.i
index 57fb1f20d45..5166a2af718 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.i
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.i
@@ -37,13 +37,6 @@ CORBA::ComponentIR::EventDef::EventDef (
   this->CORBA_ComponentIR_EventDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -54,7 +47,6 @@ TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::to_object (
   _tao_elem = CORBA::Object::_duplicate (this->value_);
   return 1;
 }
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -74,24 +66,6 @@ CORBA::ComponentIR::Container::Container (
   this->CORBA_ComponentIR_Container_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::Container>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -111,24 +85,6 @@ CORBA::ComponentIR::ModuleDef::ModuleDef (
   this->CORBA_ComponentIR_ModuleDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -148,24 +104,6 @@ CORBA::ComponentIR::Repository::Repository (
   this->CORBA_ComponentIR_Repository_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -185,238 +123,9 @@ CORBA::ComponentIR::ProvidesDef::ProvidesDef (
   this->CORBA_ComponentIR_ProvidesDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::ProvidesDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::ProvidesDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var::ProvidesDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var::ProvidesDescription_var (ProvidesDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var::ProvidesDescription_var (const ::CORBA::ComponentIR::ProvidesDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::ProvidesDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var::~ProvidesDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var &
-CORBA::ComponentIR::ProvidesDescription_var::operator= (ProvidesDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescription_var &
-CORBA::ComponentIR::ProvidesDescription_var::operator= (const ::CORBA::ComponentIR::ProvidesDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ProvidesDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ProvidesDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ProvidesDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::ProvidesDescription *
-CORBA::ComponentIR::ProvidesDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *
-CORBA::ComponentIR::ProvidesDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var::operator const ::CORBA::ComponentIR::ProvidesDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var::operator ::CORBA::ComponentIR::ProvidesDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var::operator ::CORBA::ComponentIR::ProvidesDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_var::operator ::CORBA::ComponentIR::ProvidesDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::ProvidesDescription &
-CORBA::ComponentIR::ProvidesDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription &
-CORBA::ComponentIR::ProvidesDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *&
-CORBA::ComponentIR::ProvidesDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *
-CORBA::ComponentIR::ProvidesDescription_var::_retn (void)
-{
-  ::CORBA::ComponentIR::ProvidesDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *
-CORBA::ComponentIR::ProvidesDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::ProvidesDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_out::ProvidesDescription_out (::CORBA::ComponentIR::ProvidesDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_out::ProvidesDescription_out (ProvidesDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_out::ProvidesDescription_out (const ::CORBA::ComponentIR::ProvidesDescription_out &p)
-  : ptr_ (ACE_const_cast (ProvidesDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_out &
-CORBA::ComponentIR::ProvidesDescription_out::operator= (const ::CORBA::ComponentIR::ProvidesDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ProvidesDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription_out &
-CORBA::ComponentIR::ProvidesDescription_out::operator= (ProvidesDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ComponentIR::ProvidesDescription_out::operator ::CORBA::ComponentIR::ProvidesDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *&
-CORBA::ComponentIR::ProvidesDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ProvidesDescription *
-CORBA::ComponentIR::ProvidesDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF___CI_)
@@ -433,238 +142,9 @@ CORBA::ComponentIR::UsesDef::UsesDef (
   this->CORBA_ComponentIR_UsesDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::UsesDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::UsesDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var::UsesDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var::UsesDescription_var (UsesDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var::UsesDescription_var (const ::CORBA::ComponentIR::UsesDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::UsesDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var::~UsesDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var &
-CORBA::ComponentIR::UsesDescription_var::operator= (UsesDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescription_var &
-CORBA::ComponentIR::UsesDescription_var::operator= (const ::CORBA::ComponentIR::UsesDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          UsesDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              UsesDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              UsesDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::UsesDescription *
-CORBA::ComponentIR::UsesDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::UsesDescription *
-CORBA::ComponentIR::UsesDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var::operator const ::CORBA::ComponentIR::UsesDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var::operator ::CORBA::ComponentIR::UsesDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var::operator ::CORBA::ComponentIR::UsesDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_var::operator ::CORBA::ComponentIR::UsesDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::UsesDescription &
-CORBA::ComponentIR::UsesDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::UsesDescription &
-CORBA::ComponentIR::UsesDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ComponentIR::UsesDescription *&
-CORBA::ComponentIR::UsesDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::UsesDescription *
-CORBA::ComponentIR::UsesDescription_var::_retn (void)
-{
-  ::CORBA::ComponentIR::UsesDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::UsesDescription *
-CORBA::ComponentIR::UsesDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::UsesDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_out::UsesDescription_out (::CORBA::ComponentIR::UsesDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_out::UsesDescription_out (UsesDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_out::UsesDescription_out (const ::CORBA::ComponentIR::UsesDescription_out &p)
-  : ptr_ (ACE_const_cast (UsesDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_out &
-CORBA::ComponentIR::UsesDescription_out::operator= (const ::CORBA::ComponentIR::UsesDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (UsesDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription_out &
-CORBA::ComponentIR::UsesDescription_out::operator= (UsesDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ComponentIR::UsesDescription_out::operator ::CORBA::ComponentIR::UsesDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::UsesDescription *&
-CORBA::ComponentIR::UsesDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::UsesDescription *
-CORBA::ComponentIR::UsesDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF___CI_)
@@ -681,17 +161,10 @@ CORBA::ComponentIR::EventPortDef::EventPortDef (
   this->CORBA_ComponentIR_EventPortDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::EventPortDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
+TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::to_object (
     CORBA::Object_ptr &_tao_elem
   ) const
 {
@@ -702,217 +175,6 @@ TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::EventPortDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var::EventPortDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var::EventPortDescription_var (EventPortDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var::EventPortDescription_var (const ::CORBA::ComponentIR::EventPortDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::EventPortDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var::~EventPortDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var &
-CORBA::ComponentIR::EventPortDescription_var::operator= (EventPortDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescription_var &
-CORBA::ComponentIR::EventPortDescription_var::operator= (const ::CORBA::ComponentIR::EventPortDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          EventPortDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              EventPortDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              EventPortDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::EventPortDescription *
-CORBA::ComponentIR::EventPortDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *
-CORBA::ComponentIR::EventPortDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var::operator const ::CORBA::ComponentIR::EventPortDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var::operator ::CORBA::ComponentIR::EventPortDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var::operator ::CORBA::ComponentIR::EventPortDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_var::operator ::CORBA::ComponentIR::EventPortDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::EventPortDescription &
-CORBA::ComponentIR::EventPortDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::EventPortDescription &
-CORBA::ComponentIR::EventPortDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *&
-CORBA::ComponentIR::EventPortDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *
-CORBA::ComponentIR::EventPortDescription_var::_retn (void)
-{
-  ::CORBA::ComponentIR::EventPortDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *
-CORBA::ComponentIR::EventPortDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::EventPortDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_out::EventPortDescription_out (::CORBA::ComponentIR::EventPortDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_out::EventPortDescription_out (EventPortDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_out::EventPortDescription_out (const ::CORBA::ComponentIR::EventPortDescription_out &p)
-  : ptr_ (ACE_const_cast (EventPortDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_out &
-CORBA::ComponentIR::EventPortDescription_out::operator= (const ::CORBA::ComponentIR::EventPortDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (EventPortDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription_out &
-CORBA::ComponentIR::EventPortDescription_out::operator= (EventPortDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ComponentIR::EventPortDescription_out::operator ::CORBA::ComponentIR::EventPortDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *&
-CORBA::ComponentIR::EventPortDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::EventPortDescription *
-CORBA::ComponentIR::EventPortDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF___CI_)
@@ -929,17 +191,10 @@ CORBA::ComponentIR::EmitsDef::EmitsDef (
   this->CORBA_ComponentIR_EmitsDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::to_object (
+TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::to_object (
     CORBA::Object_ptr &_tao_elem
   ) const
 {
@@ -966,23 +221,17 @@ CORBA::ComponentIR::PublishesDef::PublishesDef (
   this->CORBA_ComponentIR_PublishesDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::to_object (
+TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::to_object (
     CORBA::Object_ptr &_tao_elem
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
   return 1;
 }
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -1002,24 +251,6 @@ CORBA::ComponentIR::ConsumesDef::ConsumesDef (
   this->CORBA_ComponentIR_ConsumesDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -1039,1611 +270,8 @@ CORBA::ComponentIR::ComponentDef::ComponentDef (
   this->CORBA_ComponentIR_ComponentDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::ComponentDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ComponentIR::ProvidesDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ComponentIR::ProvidesDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (CORBA::ComponentIR::ProvidesDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ComponentIR::ProvidesDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ComponentIR::ProvidesDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ComponentIR::ProvidesDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ComponentIR::ProvidesDescription *tmp =
-            ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ComponentIR::ProvidesDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription *, this->buffer_);
-  CORBA::ComponentIR::ProvidesDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ComponentIR::ProvidesDescription* tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::ProvidesDescription &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ComponentIR::ProvidesDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ComponentIR::ProvidesDescription *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ComponentIR::ProvidesDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::ProvidesDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ComponentIR::ProvidesDescription * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ComponentIR::ProvidesDescription *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ComponentIR::ProvidesDescription *tmp =
-        ACE_reinterpret_cast (CORBA::ComponentIR::ProvidesDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_ProvidesDescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CI_)
-#define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::ProvidesDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::ProvidesDescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::ProvidesDescriptionSeq_var (ProvidesDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::ProvidesDescriptionSeq_var (const ::CORBA::ComponentIR::ProvidesDescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::ProvidesDescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::~ProvidesDescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var &
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator= (ProvidesDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq_var &
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator= (const ::CORBA::ComponentIR::ProvidesDescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ProvidesDescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ProvidesDescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ProvidesDescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ComponentIR::ProvidesDescriptionSeq *
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq *
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator const ::CORBA::ComponentIR::ProvidesDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator ::CORBA::ComponentIR::ProvidesDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator ::CORBA::ComponentIR::ProvidesDescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator ::CORBA::ComponentIR::ProvidesDescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription &
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::ProvidesDescription &
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ComponentIR::ProvidesDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ComponentIR::ProvidesDescriptionSeq &
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq &
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq *&
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq *
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::_retn (void)
-{
-  ::CORBA::ComponentIR::ProvidesDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq *
-CORBA::ComponentIR::ProvidesDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::ProvidesDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::ProvidesDescriptionSeq_out (ProvidesDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::ProvidesDescriptionSeq_out (ProvidesDescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::ProvidesDescriptionSeq_out (const ::CORBA::ComponentIR::ProvidesDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (ProvidesDescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq_out &
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator= (const ::CORBA::ComponentIR::ProvidesDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ProvidesDescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq_out &
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator= (ProvidesDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator ::CORBA::ComponentIR::ProvidesDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq *&
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ProvidesDescriptionSeq *
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ProvidesDescription &
-CORBA::ComponentIR::ProvidesDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ComponentIR::UsesDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ComponentIR::UsesDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (CORBA::ComponentIR::UsesDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ComponentIR::UsesDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ComponentIR::UsesDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ComponentIR::UsesDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ComponentIR::UsesDescription *tmp =
-            ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ComponentIR::UsesDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription *, this->buffer_);
-  CORBA::ComponentIR::UsesDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ComponentIR::UsesDescription* tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::UsesDescription &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ComponentIR::UsesDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ComponentIR::UsesDescription *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ComponentIR::UsesDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::UsesDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ComponentIR::UsesDescription * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ComponentIR::UsesDescription *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ComponentIR::UsesDescription *tmp =
-        ACE_reinterpret_cast (CORBA::ComponentIR::UsesDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_UsesDescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CI_)
-#define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::UsesDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var::UsesDescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var::UsesDescriptionSeq_var (UsesDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var::UsesDescriptionSeq_var (const ::CORBA::ComponentIR::UsesDescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::UsesDescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var::~UsesDescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var &
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator= (UsesDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq_var &
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator= (const ::CORBA::ComponentIR::UsesDescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          UsesDescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              UsesDescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              UsesDescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ComponentIR::UsesDescriptionSeq *
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq *
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator const ::CORBA::ComponentIR::UsesDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator ::CORBA::ComponentIR::UsesDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator ::CORBA::ComponentIR::UsesDescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator ::CORBA::ComponentIR::UsesDescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription &
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::UsesDescription &
-CORBA::ComponentIR::UsesDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ComponentIR::UsesDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ComponentIR::UsesDescriptionSeq &
-CORBA::ComponentIR::UsesDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq &
-CORBA::ComponentIR::UsesDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq *&
-CORBA::ComponentIR::UsesDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq *
-CORBA::ComponentIR::UsesDescriptionSeq_var::_retn (void)
-{
-  ::CORBA::ComponentIR::UsesDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq *
-CORBA::ComponentIR::UsesDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::UsesDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_out::UsesDescriptionSeq_out (UsesDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_out::UsesDescriptionSeq_out (UsesDescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_out::UsesDescriptionSeq_out (const ::CORBA::ComponentIR::UsesDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (UsesDescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq_out &
-CORBA::ComponentIR::UsesDescriptionSeq_out::operator= (const ::CORBA::ComponentIR::UsesDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (UsesDescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq_out &
-CORBA::ComponentIR::UsesDescriptionSeq_out::operator= (UsesDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescriptionSeq_out::operator ::CORBA::ComponentIR::UsesDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq *&
-CORBA::ComponentIR::UsesDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::UsesDescriptionSeq *
-CORBA::ComponentIR::UsesDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::UsesDescription &
-CORBA::ComponentIR::UsesDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CI_
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ComponentIR::EventPortDescription *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ComponentIR::EventPortDescription[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (CORBA::ComponentIR::EventPortDescription *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ComponentIR::EventPortDescription *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ComponentIR::EventPortDescription *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ComponentIR::EventPortDescription * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ComponentIR::EventPortDescription *tmp =
-            ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ComponentIR::EventPortDescription *tmp1 =
-    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription *, this->buffer_);
-  CORBA::ComponentIR::EventPortDescription * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ComponentIR::EventPortDescription* tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::EventPortDescription &
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ComponentIR::EventPortDescription * const tmp =
-    ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ComponentIR::EventPortDescription *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ComponentIR::EventPortDescription*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::EventPortDescription *
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ComponentIR::EventPortDescription * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::ComponentIR::_TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ComponentIR::EventPortDescription *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ComponentIR::EventPortDescription *tmp =
-        ACE_reinterpret_cast (CORBA::ComponentIR::EventPortDescription*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ComponentIR_EventPortDescriptionSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CI_)
-#define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::EventPortDescriptionSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var::EventPortDescriptionSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var::EventPortDescriptionSeq_var (EventPortDescriptionSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var::EventPortDescriptionSeq_var (const ::CORBA::ComponentIR::EventPortDescriptionSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::EventPortDescriptionSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var::~EventPortDescriptionSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var &
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator= (EventPortDescriptionSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq_var &
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator= (const ::CORBA::ComponentIR::EventPortDescriptionSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          EventPortDescriptionSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              EventPortDescriptionSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              EventPortDescriptionSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ComponentIR::EventPortDescriptionSeq *
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq *
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator const ::CORBA::ComponentIR::EventPortDescriptionSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator ::CORBA::ComponentIR::EventPortDescriptionSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator ::CORBA::ComponentIR::EventPortDescriptionSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator ::CORBA::ComponentIR::EventPortDescriptionSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription &
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ComponentIR::EventPortDescription &
-CORBA::ComponentIR::EventPortDescriptionSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ComponentIR::EventPortDescription &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ComponentIR::EventPortDescriptionSeq &
-CORBA::ComponentIR::EventPortDescriptionSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq &
-CORBA::ComponentIR::EventPortDescriptionSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq *&
-CORBA::ComponentIR::EventPortDescriptionSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq *
-CORBA::ComponentIR::EventPortDescriptionSeq_var::_retn (void)
-{
-  ::CORBA::ComponentIR::EventPortDescriptionSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq *
-CORBA::ComponentIR::EventPortDescriptionSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::EventPortDescriptionSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_out::EventPortDescriptionSeq_out (EventPortDescriptionSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_out::EventPortDescriptionSeq_out (EventPortDescriptionSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_out::EventPortDescriptionSeq_out (const ::CORBA::ComponentIR::EventPortDescriptionSeq_out &p)
-  : ptr_ (ACE_const_cast (EventPortDescriptionSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq_out &
-CORBA::ComponentIR::EventPortDescriptionSeq_out::operator= (const ::CORBA::ComponentIR::EventPortDescriptionSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (EventPortDescriptionSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq_out &
-CORBA::ComponentIR::EventPortDescriptionSeq_out::operator= (EventPortDescriptionSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescriptionSeq_out::operator ::CORBA::ComponentIR::EventPortDescriptionSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq *&
-CORBA::ComponentIR::EventPortDescriptionSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::EventPortDescriptionSeq *
-CORBA::ComponentIR::EventPortDescriptionSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::EventPortDescription &
-CORBA::ComponentIR::EventPortDescriptionSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::ComponentDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var::ComponentDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var::ComponentDescription_var (ComponentDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var::ComponentDescription_var (const ::CORBA::ComponentIR::ComponentDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::ComponentDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var::~ComponentDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var &
-CORBA::ComponentIR::ComponentDescription_var::operator= (ComponentDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::ComponentDescription_var &
-CORBA::ComponentIR::ComponentDescription_var::operator= (const ::CORBA::ComponentIR::ComponentDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ComponentDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ComponentDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ComponentDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::ComponentDescription *
-CORBA::ComponentIR::ComponentDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *
-CORBA::ComponentIR::ComponentDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var::operator const ::CORBA::ComponentIR::ComponentDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var::operator ::CORBA::ComponentIR::ComponentDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var::operator ::CORBA::ComponentIR::ComponentDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_var::operator ::CORBA::ComponentIR::ComponentDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::ComponentDescription &
-CORBA::ComponentIR::ComponentDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ComponentDescription &
-CORBA::ComponentIR::ComponentDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *&
-CORBA::ComponentIR::ComponentDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *
-CORBA::ComponentIR::ComponentDescription_var::_retn (void)
-{
-  ::CORBA::ComponentIR::ComponentDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *
-CORBA::ComponentIR::ComponentDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::ComponentDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_out::ComponentDescription_out (::CORBA::ComponentIR::ComponentDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_out::ComponentDescription_out (ComponentDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_out::ComponentDescription_out (const ::CORBA::ComponentIR::ComponentDescription_out &p)
-  : ptr_ (ACE_const_cast (ComponentDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_out &
-CORBA::ComponentIR::ComponentDescription_out::operator= (const ::CORBA::ComponentIR::ComponentDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ComponentDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::ComponentDescription_out &
-CORBA::ComponentIR::ComponentDescription_out::operator= (ComponentDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ComponentIR::ComponentDescription_out::operator ::CORBA::ComponentIR::ComponentDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *&
-CORBA::ComponentIR::ComponentDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::ComponentDescription *
-CORBA::ComponentIR::ComponentDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
@@ -2661,24 +289,6 @@ CORBA::ComponentIR::FactoryDef::FactoryDef (
   this->CORBA_ComponentIR_FactoryDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -2698,24 +308,6 @@ CORBA::ComponentIR::FinderDef::FinderDef (
   this->CORBA_ComponentIR_FinderDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -2735,238 +327,9 @@ CORBA::ComponentIR::HomeDef::HomeDef (
   this->CORBA_ComponentIR_HomeDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ComponentIR::HomeDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::HomeDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var::HomeDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var::HomeDescription_var (HomeDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var::HomeDescription_var (const ::CORBA::ComponentIR::HomeDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ComponentIR::HomeDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var::~HomeDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var &
-CORBA::ComponentIR::HomeDescription_var::operator= (HomeDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ComponentIR::HomeDescription_var &
-CORBA::ComponentIR::HomeDescription_var::operator= (const ::CORBA::ComponentIR::HomeDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          HomeDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              HomeDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              HomeDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::HomeDescription *
-CORBA::ComponentIR::HomeDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::HomeDescription *
-CORBA::ComponentIR::HomeDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var::operator const ::CORBA::ComponentIR::HomeDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var::operator ::CORBA::ComponentIR::HomeDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var::operator ::CORBA::ComponentIR::HomeDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_var::operator ::CORBA::ComponentIR::HomeDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ComponentIR::HomeDescription &
-CORBA::ComponentIR::HomeDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::HomeDescription &
-CORBA::ComponentIR::HomeDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ComponentIR::HomeDescription *&
-CORBA::ComponentIR::HomeDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::HomeDescription *
-CORBA::ComponentIR::HomeDescription_var::_retn (void)
-{
-  ::CORBA::ComponentIR::HomeDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::HomeDescription *
-CORBA::ComponentIR::HomeDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ComponentIR::HomeDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_out::HomeDescription_out (::CORBA::ComponentIR::HomeDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_out::HomeDescription_out (HomeDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_out::HomeDescription_out (const ::CORBA::ComponentIR::HomeDescription_out &p)
-  : ptr_ (ACE_const_cast (HomeDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_out &
-CORBA::ComponentIR::HomeDescription_out::operator= (const ::CORBA::ComponentIR::HomeDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (HomeDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ComponentIR::HomeDescription_out &
-CORBA::ComponentIR::HomeDescription_out::operator= (HomeDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ComponentIR::HomeDescription_out::operator ::CORBA::ComponentIR::HomeDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::HomeDescription *&
-CORBA::ComponentIR::HomeDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ComponentIR::HomeDescription *
-CORBA::ComponentIR::HomeDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
@@ -3058,7 +421,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -3118,7 +481,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -3180,7 +543,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -3320,7 +683,7 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -3409,7 +772,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -3468,5 +831,3 @@ CORBA::Boolean operator>> (
       return 0;
     }
 }
-
-
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index 9bf149f64a1..9a27c1aa222 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -58,6 +58,8 @@
 
 module CORBA
 {
+  typeprefix CORBA "omg.org";
+
 // Already defined in corbafwd.h, included from orb.idl.
 /*
   typedef short ValueModifier;
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 91a50c83955..6aa185c0434 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -50,7 +49,7 @@
 int CORBA::FixedDef::_tao_class_id = 0;
 
 CORBA::FixedDef_ptr
-tao_CORBA_FixedDef_duplicate (
+CORBA::tao_FixedDef_life::tao_duplicate (
     CORBA::FixedDef_ptr p
   )
 {
@@ -58,7 +57,7 @@ tao_CORBA_FixedDef_duplicate (
 }
 
 void
-tao_CORBA_FixedDef_release (
+CORBA::tao_FixedDef_life::tao_release (
     CORBA::FixedDef_ptr p
   )
 {
@@ -66,228 +65,64 @@ tao_CORBA_FixedDef_release (
 }
 
 CORBA::FixedDef_ptr
-tao_CORBA_FixedDef_nil (
+CORBA::tao_FixedDef_life::tao_nil (
     void
   )
 {
   return CORBA::FixedDef::_nil ();
 }
 
-CORBA::FixedDef_ptr
-tao_CORBA_FixedDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::FixedDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_FixedDef_upcast (
-    void *src
-  )
-{
-  CORBA::FixedDef **tmp =
-    ACE_static_cast (CORBA::FixedDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_FixedDef_marshal (
+CORBA::tao_FixedDef_life::tao_marshal (
     CORBA::FixedDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::FixedDef_var
-// *************************************************************
-
-CORBA::FixedDef_var::FixedDef_var (void)
-  : ptr_ (FixedDef::_nil ())
-{}
-
-::CORBA::FixedDef_ptr
-CORBA::FixedDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::FixedDef_var::FixedDef_var (const ::CORBA::FixedDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (FixedDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::FixedDef_var::~FixedDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::FixedDef_var &
-CORBA::FixedDef_var::operator= (FixedDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::FixedDef_var &
-CORBA::FixedDef_var::operator= (const ::CORBA::FixedDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::FixedDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::FixedDef_var::operator const ::CORBA::FixedDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::FixedDef_var::operator ::CORBA::FixedDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::FixedDef_ptr
-CORBA::FixedDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::FixedDef_ptr
-CORBA::FixedDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::FixedDef_ptr &
-CORBA::FixedDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::FixedDef_ptr &
-CORBA::FixedDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::FixedDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::FixedDef_ptr
-CORBA::FixedDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::FixedDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::FixedDef::_nil ();
-  return val;
-}
-
-::CORBA::FixedDef_ptr
-CORBA::FixedDef_var::tao_duplicate (FixedDef_ptr p)
-{
-  return ::CORBA::FixedDef::_duplicate (p);
-}
-
-void
-CORBA::FixedDef_var::tao_release (FixedDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::FixedDef_ptr
-CORBA::FixedDef_var::tao_nil (void)
-{
-  return ::CORBA::FixedDef::_nil ();
-}
-
-::CORBA::FixedDef_ptr
-CORBA::FixedDef_var::tao_narrow (
+CORBA::FixedDef_ptr
+CORBA::tao_FixedDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::FixedDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::FixedDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::FixedDef_var::tao_upcast (void *src)
+CORBA::tao_FixedDef_cast::tao_upcast (
+    void *src
+  )
 {
-  FixedDef **tmp =
-    ACE_static_cast (FixedDef **, src);
+  CORBA::FixedDef **tmp =
+    ACE_static_cast (CORBA::FixedDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::FixedDef_out
-// *************************************************************
-
-CORBA::FixedDef_out::FixedDef_out (FixedDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::FixedDef::_nil ();
-}
-
-CORBA::FixedDef_out::FixedDef_out (FixedDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::FixedDef::_nil ();
-}
-
-CORBA::FixedDef_out::FixedDef_out (const ::CORBA::FixedDef_out &p)
-  : ptr_ (ACE_const_cast (FixedDef_out &, p).ptr_)
-{}
-
-::CORBA::FixedDef_out &
-CORBA::FixedDef_out::operator= (const ::CORBA::FixedDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (FixedDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::FixedDef_out &
-CORBA::FixedDef_out::operator= (const ::CORBA::FixedDef_var &p)
-{
-  this->ptr_ = ::CORBA::FixedDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::FixedDef_out &
-CORBA::FixedDef_out::operator= (FixedDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::FixedDef_out::operator ::CORBA::FixedDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::FixedDef_ptr &
-CORBA::FixedDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::FixedDef_ptr
-CORBA::FixedDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::FixedDef,
+        CORBA::tao_FixedDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::FixedDef,
+        CORBA::tao_FixedDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::FixedDef, \
+        CORBA::tao_FixedDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::FixedDef, \
+        CORBA::tao_FixedDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -307,29 +142,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::UShort result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (const TAO_ClientRequestInfo_CORBA_FixedDef_digits_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_digits_get &);
-    
+
     ::CORBA::UShort _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -342,7 +177,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -354,11 +189,11 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -367,17 +202,17 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::UShort result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -395,10 +230,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -407,15 +242,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_digits_set &);
     const CORBA::UShort & digits_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::TAO_ClientRequestInfo_CORBA_FixedDef_digits_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::UShort & digits
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       digits_ (digits)
@@ -429,15 +264,15 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (ACE_ENV_SINGLE_ARG_D
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= digits_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -449,11 +284,11 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (ACE_ENV_SINGLE_ARG_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -462,7 +297,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -481,29 +316,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Short result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (const TAO_ClientRequestInfo_CORBA_FixedDef_scale_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_scale_get &);
-    
+
     ::CORBA::Short _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -516,7 +351,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (ACE_ENV_SINGLE_ARG_DE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -528,11 +363,11 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (ACE_ENV_SINGLE_ARG_D
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -541,17 +376,17 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Short result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -569,10 +404,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -581,15 +416,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_FixedDef_scale_set &);
     const CORBA::Short & scale_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::TAO_ClientRequestInfo_CORBA_FixedDef_scale_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Short & scale
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       scale_ (scale)
@@ -603,15 +438,15 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (ACE_ENV_SINGLE_ARG_DE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= scale_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -623,11 +458,11 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (ACE_ENV_SINGLE_ARG_D
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -636,7 +471,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -648,7 +483,7 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
@@ -672,12 +507,12 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
 {
   CORBA::UShort _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_digits",
@@ -685,22 +520,22 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_get _tao_ri (
           &_tao_call,
@@ -708,14 +543,14 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -723,77 +558,84 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::UShort _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::UShort _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -803,59 +645,57 @@ CORBA::UShort CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -871,12 +711,12 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_digits",
@@ -884,22 +724,22 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_set _tao_ri (
           &_tao_call,
@@ -908,14 +748,14 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -923,70 +763,76 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << digits)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << digits)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -996,56 +842,54 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::digits (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -1062,12 +906,12 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
 {
   CORBA::Short _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_scale",
@@ -1075,22 +919,22 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_get _tao_ri (
           &_tao_call,
@@ -1098,14 +942,14 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1113,77 +957,84 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Short _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Short _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1193,59 +1044,57 @@ CORBA::Short CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -1261,12 +1110,12 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_scale",
@@ -1274,22 +1123,22 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_set _tao_ri (
           &_tao_call,
@@ -1298,14 +1147,14 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1313,70 +1162,76 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << scale)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << scale)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1386,61 +1241,59 @@ void CORBA::_TAO_FixedDef_Remote_Proxy_Impl::scale (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -1491,8 +1344,8 @@ CORBA::_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::FixedDef::FixedDef (int collocated)
 {
@@ -1508,14 +1361,14 @@ CORBA::FixedDef::CORBA_FixedDef_setup_collocation (int collocated)
   else
     this->the_TAO_FixedDef_Proxy_Broker_ =
       ::CORBA::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
 CORBA::FixedDef::~FixedDef (void)
 {}
 
-void 
+void
 CORBA::FixedDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   FixedDef *tmp = ACE_static_cast (FixedDef *, _tao_void_pointer);
@@ -1532,7 +1385,7 @@ CORBA::FixedDef::_narrow (
     {
       return FixedDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -1541,17 +1394,17 @@ CORBA::FixedDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (FixedDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return FixedDef::_nil ();
         }
     }
-  
+
   return FixedDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::FixedDef_ptr 
+CORBA::FixedDef_ptr
 CORBA::FixedDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1561,18 +1414,18 @@ CORBA::FixedDef::_unchecked_narrow (
     {
       return FixedDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       FixedDef_ptr default_proxy = FixedDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -1590,7 +1443,7 @@ CORBA::FixedDef::_unchecked_narrow (
               FixedDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -1603,10 +1456,10 @@ CORBA::FixedDef::_unchecked_narrow (
               FixedDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           FixedDef_ptr,
@@ -1626,7 +1479,7 @@ CORBA::FixedDef::_duplicate (FixedDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1669,7 +1522,7 @@ CORBA::FixedDef::_is_a (
 void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, FixedDef)::_tao_class_id)
@@ -1716,12 +1569,12 @@ void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1730,6 +1583,12 @@ const char* CORBA::FixedDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/FixedDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::FixedDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -1740,10 +1599,10 @@ CORBA::UShort CORBA::FixedDef::digits (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy = 
+  _TAO_FixedDef_Proxy_Impl &proxy =
     this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.digits (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1761,10 +1620,10 @@ void CORBA::FixedDef::digits (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy = 
+  _TAO_FixedDef_Proxy_Impl &proxy =
     this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.digits (
       this,
       digits
@@ -1782,10 +1641,10 @@ CORBA::Short CORBA::FixedDef::scale (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy = 
+  _TAO_FixedDef_Proxy_Impl &proxy =
     this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.scale (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1803,10 +1662,10 @@ void CORBA::FixedDef::scale (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy = 
+  _TAO_FixedDef_Proxy_Impl &proxy =
     this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.scale (
       this,
       scale
@@ -1821,17 +1680,17 @@ static const CORBA::Long _oc_CORBA_FixedDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4669), 
-  ACE_NTOHL (0x78656444), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4669),
+  ACE_NTOHL (0x78656444),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FixedDef:1.0
     9,
-  ACE_NTOHL (0x46697865), 
-  ACE_NTOHL (0x64446566), 
+  ACE_NTOHL (0x46697865),
+  ACE_NTOHL (0x64446566),
   ACE_NTOHL (0x0),  // name = FixedDef
   };
 
@@ -1859,41 +1718,41 @@ static const CORBA::Long _oc_CORBA_ValueMember[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c75654d), 
-  ACE_NTOHL (0x656d6265), 
-  ACE_NTOHL (0x723a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5661),
+  ACE_NTOHL (0x6c75654d),
+  ACE_NTOHL (0x656d6265),
+  ACE_NTOHL (0x723a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
     12,
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x654d656d), 
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x654d656d),
   ACE_NTOHL (0x62657200),  // name = ValueMember
   7, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -1902,96 +1761,96 @@ static const CORBA::Long _oc_CORBA_ValueMember[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff9c, // negative offset (-100)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
   9,
-  ACE_NTOHL (0x74797065), 
-  ACE_NTOHL (0x5f646566), 
+  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x5f646566),
   ACE_NTOHL (0x0),  // name = type_def
     CORBA::tk_objref, // typecode kind
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4944), 
-    ACE_NTOHL (0x4c547970), 
-    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4944),
+    ACE_NTOHL (0x4c547970),
+    ACE_NTOHL (0x653a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
         8,
-    ACE_NTOHL (0x49444c54), 
+    ACE_NTOHL (0x49444c54),
     ACE_NTOHL (0x79706500),  // name = IDLType
-    
+
   7,
-  ACE_NTOHL (0x61636365), 
+  ACE_NTOHL (0x61636365),
   ACE_NTOHL (0x73730000),  // name = access
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5669), 
-    ACE_NTOHL (0x73696269), 
-    ACE_NTOHL (0x6c697479), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5669),
+    ACE_NTOHL (0x73696269),
+    ACE_NTOHL (0x6c697479),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
         11,
-    ACE_NTOHL (0x56697369), 
-    ACE_NTOHL (0x62696c69), 
+    ACE_NTOHL (0x56697369),
+    ACE_NTOHL (0x62696c69),
     ACE_NTOHL (0x74790000),  // name = Visibility
         CORBA::tk_short,
 
@@ -2015,7 +1874,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ValueMember::_tao_any_destructor (void *_tao_void_pointer)
@@ -2024,117 +1883,70 @@ void CORBA::ValueMember::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:100
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CS_
+template class
+  TAO_Var_Var_T<
+      ValueMember
+    >;
 
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ValueMember* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ValueMember *old =
-        ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Out_T<
+      ValueMember,
+      ValueMember_var
+    >;
 
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ValueMember *tmp =
-    ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ValueMember \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      ValueMember, \
+      ValueMember_var \
+    >
 
-#if !defined (_CORBA_VALUEMEMBERSEQ_CS_)
-#define _CORBA_VALUEMEMBERSEQ_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ValueMemberSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 CORBA::ValueMemberSeq::ValueMemberSeq (void)
 {}
 
 CORBA::ValueMemberSeq::ValueMemberSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ValueMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::ValueMember
+      >
+    (max)
 {}
 
 CORBA::ValueMemberSeq::ValueMemberSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ValueMember *buffer,
+    CORBA::ValueMember* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ValueMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::ValueMember
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ValueMemberSeq::ValueMemberSeq (const ValueMemberSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ValueMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::ValueMember
+      >
+    (seq)
 {}
 
-CORBA::ValueMemberSeq::~ValueMemberSeq (void) // dtor
+CORBA::ValueMemberSeq::~ValueMemberSeq (void)
 {}
 
 void CORBA::ValueMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -2143,7 +1955,37 @@ void CORBA::ValueMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      ValueMemberSeq,
+      CORBA::ValueMember
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ValueMemberSeq,
+      ValueMemberSeq_var,
+      CORBA::ValueMember
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ValueMemberSeq, \
+      CORBA::ValueMember \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ValueMemberSeq, \
+      ValueMemberSeq_var, \
+      CORBA::ValueMember \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -2152,20 +1994,20 @@ static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c75654d), 
-  ACE_NTOHL (0x656d6265), 
-  ACE_NTOHL (0x72536571), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5661),
+  ACE_NTOHL (0x6c75654d),
+  ACE_NTOHL (0x656d6265),
+  ACE_NTOHL (0x72536571),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
     15,
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x654d656d), 
-  ACE_NTOHL (0x62657253), 
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x654d656d),
+  ACE_NTOHL (0x62657253),
   ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
     CORBA::tk_sequence, // typecode kind
   544, // encapsulation length
@@ -2174,41 +2016,41 @@ static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
     528, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5661), 
-      ACE_NTOHL (0x6c75654d), 
-      ACE_NTOHL (0x656d6265), 
-      ACE_NTOHL (0x723a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f5661),
+      ACE_NTOHL (0x6c75654d),
+      ACE_NTOHL (0x656d6265),
+      ACE_NTOHL (0x723a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
             12,
-      ACE_NTOHL (0x56616c75), 
-      ACE_NTOHL (0x654d656d), 
+      ACE_NTOHL (0x56616c75),
+      ACE_NTOHL (0x654d656d),
       ACE_NTOHL (0x62657200),  // name = ValueMember
       7, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4964), 
-        ACE_NTOHL (0x656e7469), 
-        ACE_NTOHL (0x66696572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4964),
+        ACE_NTOHL (0x656e7469),
+        ACE_NTOHL (0x66696572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
                 11,
-        ACE_NTOHL (0x4964656e), 
-        ACE_NTOHL (0x74696669), 
+        ACE_NTOHL (0x4964656e),
+        ACE_NTOHL (0x74696669),
         ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       3,
@@ -2217,96 +2059,96 @@ static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x49643a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x49643a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
                 13,
-        ACE_NTOHL (0x5265706f), 
-        ACE_NTOHL (0x7369746f), 
-        ACE_NTOHL (0x72794964), 
+        ACE_NTOHL (0x5265706f),
+        ACE_NTOHL (0x7369746f),
+        ACE_NTOHL (0x72794964),
         ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       11,
-      ACE_NTOHL (0x64656669), 
-      ACE_NTOHL (0x6e65645f), 
+      ACE_NTOHL (0x64656669),
+      ACE_NTOHL (0x6e65645f),
       ACE_NTOHL (0x696e0000),  // name = defined_in
             0xffffffff, // indirection
       0xffffff9c, // negative offset (-100)
       8,
-      ACE_NTOHL (0x76657273), 
+      ACE_NTOHL (0x76657273),
       ACE_NTOHL (0x696f6e00),  // name = version
             CORBA::tk_alias, // typecode kind for typedefs
       68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5665), 
-        ACE_NTOHL (0x7273696f), 
-        ACE_NTOHL (0x6e537065), 
-        ACE_NTOHL (0x633a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5665),
+        ACE_NTOHL (0x7273696f),
+        ACE_NTOHL (0x6e537065),
+        ACE_NTOHL (0x633a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
                 12,
-        ACE_NTOHL (0x56657273), 
-        ACE_NTOHL (0x696f6e53), 
+        ACE_NTOHL (0x56657273),
+        ACE_NTOHL (0x696f6e53),
         ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       5,
-      ACE_NTOHL (0x74797065), 
+      ACE_NTOHL (0x74797065),
       ACE_NTOHL (0x0),  // name = type
             CORBA::tk_TypeCode,
 
       9,
-      ACE_NTOHL (0x74797065), 
-      ACE_NTOHL (0x5f646566), 
+      ACE_NTOHL (0x74797065),
+      ACE_NTOHL (0x5f646566),
       ACE_NTOHL (0x0),  // name = type_def
             CORBA::tk_objref, // typecode kind
       52, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4944), 
-        ACE_NTOHL (0x4c547970), 
-        ACE_NTOHL (0x653a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4944),
+        ACE_NTOHL (0x4c547970),
+        ACE_NTOHL (0x653a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                 8,
-        ACE_NTOHL (0x49444c54), 
+        ACE_NTOHL (0x49444c54),
         ACE_NTOHL (0x79706500),  // name = IDLType
-        
+
       7,
-      ACE_NTOHL (0x61636365), 
+      ACE_NTOHL (0x61636365),
       ACE_NTOHL (0x73730000),  // name = access
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5669), 
-        ACE_NTOHL (0x73696269), 
-        ACE_NTOHL (0x6c697479), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5669),
+        ACE_NTOHL (0x73696269),
+        ACE_NTOHL (0x6c697479),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
                 11,
-        ACE_NTOHL (0x56697369), 
-        ACE_NTOHL (0x62696c69), 
+        ACE_NTOHL (0x56697369),
+        ACE_NTOHL (0x62696c69),
         ACE_NTOHL (0x74790000),  // name = Visibility
                 CORBA::tk_short,
 
@@ -2339,7 +2181,7 @@ TAO_NAMESPACE_END
 int CORBA::ValueMemberDef::_tao_class_id = 0;
 
 CORBA::ValueMemberDef_ptr
-tao_CORBA_ValueMemberDef_duplicate (
+CORBA::tao_ValueMemberDef_life::tao_duplicate (
     CORBA::ValueMemberDef_ptr p
   )
 {
@@ -2347,7 +2189,7 @@ tao_CORBA_ValueMemberDef_duplicate (
 }
 
 void
-tao_CORBA_ValueMemberDef_release (
+CORBA::tao_ValueMemberDef_life::tao_release (
     CORBA::ValueMemberDef_ptr p
   )
 {
@@ -2355,228 +2197,64 @@ tao_CORBA_ValueMemberDef_release (
 }
 
 CORBA::ValueMemberDef_ptr
-tao_CORBA_ValueMemberDef_nil (
+CORBA::tao_ValueMemberDef_life::tao_nil (
     void
   )
 {
   return CORBA::ValueMemberDef::_nil ();
 }
 
-CORBA::ValueMemberDef_ptr
-tao_CORBA_ValueMemberDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ValueMemberDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ValueMemberDef_upcast (
-    void *src
-  )
-{
-  CORBA::ValueMemberDef **tmp =
-    ACE_static_cast (CORBA::ValueMemberDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ValueMemberDef_marshal (
+CORBA::tao_ValueMemberDef_life::tao_marshal (
     CORBA::ValueMemberDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ValueMemberDef_var
-// *************************************************************
-
-CORBA::ValueMemberDef_var::ValueMemberDef_var (void)
-  : ptr_ (ValueMemberDef::_nil ())
-{}
-
-::CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ValueMemberDef_var::ValueMemberDef_var (const ::CORBA::ValueMemberDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ValueMemberDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ValueMemberDef_var::~ValueMemberDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ValueMemberDef_var &
-CORBA::ValueMemberDef_var::operator= (ValueMemberDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ValueMemberDef_var &
-CORBA::ValueMemberDef_var::operator= (const ::CORBA::ValueMemberDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ValueMemberDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ValueMemberDef_var::operator const ::CORBA::ValueMemberDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ValueMemberDef_var::operator ::CORBA::ValueMemberDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_var::in (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::ValueMemberDef_ptr &
-CORBA::ValueMemberDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueMemberDef_ptr &
-CORBA::ValueMemberDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ValueMemberDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ValueMemberDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ValueMemberDef::_nil ();
-  return val;
-}
-
-::CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_var::tao_duplicate (ValueMemberDef_ptr p)
-{
-  return ::CORBA::ValueMemberDef::_duplicate (p);
-}
-
-void
-CORBA::ValueMemberDef_var::tao_release (ValueMemberDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_var::tao_nil (void)
-{
-  return ::CORBA::ValueMemberDef::_nil ();
-}
-
-::CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_var::tao_narrow (
+CORBA::ValueMemberDef_ptr
+CORBA::tao_ValueMemberDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ValueMemberDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueMemberDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ValueMemberDef_var::tao_upcast (void *src)
+CORBA::tao_ValueMemberDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ValueMemberDef **tmp =
-    ACE_static_cast (ValueMemberDef **, src);
+  CORBA::ValueMemberDef **tmp =
+    ACE_static_cast (CORBA::ValueMemberDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ValueMemberDef_out
-// *************************************************************
-
-CORBA::ValueMemberDef_out::ValueMemberDef_out (ValueMemberDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ValueMemberDef::_nil ();
-}
-
-CORBA::ValueMemberDef_out::ValueMemberDef_out (ValueMemberDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ValueMemberDef::_nil ();
-}
-
-CORBA::ValueMemberDef_out::ValueMemberDef_out (const ::CORBA::ValueMemberDef_out &p)
-  : ptr_ (ACE_const_cast (ValueMemberDef_out &, p).ptr_)
-{}
-
-::CORBA::ValueMemberDef_out &
-CORBA::ValueMemberDef_out::operator= (const ::CORBA::ValueMemberDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ValueMemberDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ValueMemberDef_out &
-CORBA::ValueMemberDef_out::operator= (const ::CORBA::ValueMemberDef_var &p)
-{
-  this->ptr_ = ::CORBA::ValueMemberDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ValueMemberDef_out &
-CORBA::ValueMemberDef_out::operator= (ValueMemberDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ValueMemberDef_out::operator ::CORBA::ValueMemberDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueMemberDef_ptr &
-CORBA::ValueMemberDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ValueMemberDef,
+        CORBA::tao_ValueMemberDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ValueMemberDef,
+        CORBA::tao_ValueMemberDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ValueMemberDef, \
+        CORBA::tao_ValueMemberDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ValueMemberDef, \
+        CORBA::tao_ValueMemberDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -2596,29 +2274,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::TypeCode_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get &);
-    
+
     ::CORBA::TypeCode_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2631,7 +2309,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2643,11 +2321,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2656,17 +2334,17 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2683,29 +2361,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2718,7 +2396,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2730,11 +2408,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2743,17 +2421,17 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2771,10 +2449,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2783,15 +2461,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set &);
     CORBA::IDLType_ptr type_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       type_def_ (type_def)
@@ -2805,15 +2483,15 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2825,11 +2503,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2838,7 +2516,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -2857,29 +2535,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Visibility result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get &);
-    
+
     ::CORBA::Visibility _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -2892,7 +2570,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -2904,11 +2582,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -2917,17 +2595,17 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Visibility result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -2945,10 +2623,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2957,15 +2635,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set &);
     const CORBA::Visibility & access_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Visibility & access
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       access_ (access)
@@ -2979,15 +2657,15 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= access_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -2999,11 +2677,11 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3012,7 +2690,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3024,7 +2702,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_AR
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
@@ -3048,12 +2726,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
 {
   CORBA::TypeCode_var _tao_retval (CORBA::TypeCode::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -3061,22 +2739,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get _tao_ri (
           &_tao_call,
@@ -3084,14 +2762,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3099,78 +2777,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::TypeCode_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::TypeCode_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3180,59 +2865,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -3248,12 +2931,12 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type_def",
@@ -3261,22 +2944,22 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get _tao_ri (
           &_tao_call,
@@ -3284,14 +2967,14 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3299,78 +2982,85 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3380,59 +3070,57 @@ CORBA::TypeCode_ptr CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -3448,12 +3136,12 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_type_def",
@@ -3461,22 +3149,22 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set _tao_ri (
           &_tao_call,
@@ -3485,14 +3173,14 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3500,70 +3188,76 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3573,56 +3267,54 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -3639,12 +3331,12 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
 {
   CORBA::Visibility _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_access",
@@ -3652,22 +3344,22 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get _tao_ri (
           &_tao_call,
@@ -3675,14 +3367,14 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3690,77 +3382,84 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Visibility _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Visibility _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3770,59 +3469,57 @@ CORBA::Visibility CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -3838,12 +3535,12 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_access",
@@ -3851,22 +3548,22 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set _tao_ri (
           &_tao_call,
@@ -3875,14 +3572,14 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -3890,70 +3587,76 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << access)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << access)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -3963,61 +3666,59 @@ void CORBA::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -4068,8 +3769,8 @@ CORBA::_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ValueMemberDef::ValueMemberDef (int collocated)
 {
@@ -4085,14 +3786,14 @@ CORBA::ValueMemberDef::CORBA_ValueMemberDef_setup_collocation (int collocated)
   else
     this->the_TAO_ValueMemberDef_Proxy_Broker_ =
       ::CORBA::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
 CORBA::ValueMemberDef::~ValueMemberDef (void)
 {}
 
-void 
+void
 CORBA::ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueMemberDef *tmp = ACE_static_cast (ValueMemberDef *, _tao_void_pointer);
@@ -4109,7 +3810,7 @@ CORBA::ValueMemberDef::_narrow (
     {
       return ValueMemberDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -4118,17 +3819,17 @@ CORBA::ValueMemberDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ValueMemberDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ValueMemberDef::_nil ();
         }
     }
-  
+
   return ValueMemberDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ValueMemberDef_ptr 
+CORBA::ValueMemberDef_ptr
 CORBA::ValueMemberDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4138,18 +3839,18 @@ CORBA::ValueMemberDef::_unchecked_narrow (
     {
       return ValueMemberDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ValueMemberDef_ptr default_proxy = ValueMemberDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -4167,7 +3868,7 @@ CORBA::ValueMemberDef::_unchecked_narrow (
               ValueMemberDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -4180,10 +3881,10 @@ CORBA::ValueMemberDef::_unchecked_narrow (
               ValueMemberDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ValueMemberDef_ptr,
@@ -4203,7 +3904,7 @@ CORBA::ValueMemberDef::_duplicate (ValueMemberDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4246,7 +3947,7 @@ CORBA::ValueMemberDef::_is_a (
 void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ValueMemberDef)::_tao_class_id)
@@ -4293,12 +3994,12 @@ void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4307,6 +4008,12 @@ const char* CORBA::ValueMemberDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -4317,10 +4024,10 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -4337,10 +4044,10 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -4358,10 +4065,10 @@ void CORBA::ValueMemberDef::type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.type_def (
       this,
       type_def
@@ -4379,10 +4086,10 @@ CORBA::Visibility CORBA::ValueMemberDef::access (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.access (
       this
       ACE_ENV_ARG_PARAMETER
@@ -4400,10 +4107,10 @@ void CORBA::ValueMemberDef::access (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
+  _TAO_ValueMemberDef_Proxy_Impl &proxy =
     this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.access (
       this,
       access
@@ -4418,20 +4125,20 @@ static const CORBA::Long _oc_CORBA_ValueMemberDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c75654d), 
-  ACE_NTOHL (0x656d6265), 
-  ACE_NTOHL (0x72446566), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5661),
+  ACE_NTOHL (0x6c75654d),
+  ACE_NTOHL (0x656d6265),
+  ACE_NTOHL (0x72446566),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberDef:1.0
     15,
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x654d656d), 
-  ACE_NTOHL (0x62657244), 
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x654d656d),
+  ACE_NTOHL (0x62657244),
   ACE_NTOHL (0x65660000),  // name = ValueMemberDef
   };
 
@@ -4458,7 +4165,7 @@ TAO_NAMESPACE_END
 int CORBA::ValueDef::_tao_class_id = 0;
 
 CORBA::ValueDef_ptr
-tao_CORBA_ValueDef_duplicate (
+CORBA::tao_ValueDef_life::tao_duplicate (
     CORBA::ValueDef_ptr p
   )
 {
@@ -4466,7 +4173,7 @@ tao_CORBA_ValueDef_duplicate (
 }
 
 void
-tao_CORBA_ValueDef_release (
+CORBA::tao_ValueDef_life::tao_release (
     CORBA::ValueDef_ptr p
   )
 {
@@ -4474,228 +4181,64 @@ tao_CORBA_ValueDef_release (
 }
 
 CORBA::ValueDef_ptr
-tao_CORBA_ValueDef_nil (
+CORBA::tao_ValueDef_life::tao_nil (
     void
   )
 {
   return CORBA::ValueDef::_nil ();
 }
 
-CORBA::ValueDef_ptr
-tao_CORBA_ValueDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ValueDef_upcast (
-    void *src
-  )
-{
-  CORBA::ValueDef **tmp =
-    ACE_static_cast (CORBA::ValueDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ValueDef_marshal (
+CORBA::tao_ValueDef_life::tao_marshal (
     CORBA::ValueDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ValueDef_var
-// *************************************************************
-
-CORBA::ValueDef_var::ValueDef_var (void)
-  : ptr_ (ValueDef::_nil ())
-{}
-
-::CORBA::ValueDef_ptr
-CORBA::ValueDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ValueDef_var::ValueDef_var (const ::CORBA::ValueDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ValueDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ValueDef_var::~ValueDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ValueDef_var &
-CORBA::ValueDef_var::operator= (ValueDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ValueDef_var &
-CORBA::ValueDef_var::operator= (const ::CORBA::ValueDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ValueDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ValueDef_var::operator const ::CORBA::ValueDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ValueDef_var::operator ::CORBA::ValueDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueDef_ptr
-CORBA::ValueDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueDef_ptr
-CORBA::ValueDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueDef_ptr &
-CORBA::ValueDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueDef_ptr &
-CORBA::ValueDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ValueDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ValueDef_ptr
-CORBA::ValueDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ValueDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ValueDef::_nil ();
-  return val;
-}
-
-::CORBA::ValueDef_ptr
-CORBA::ValueDef_var::tao_duplicate (ValueDef_ptr p)
-{
-  return ::CORBA::ValueDef::_duplicate (p);
-}
-
-void
-CORBA::ValueDef_var::tao_release (ValueDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ValueDef_ptr
-CORBA::ValueDef_var::tao_nil (void)
-{
-  return ::CORBA::ValueDef::_nil ();
-}
-
-::CORBA::ValueDef_ptr
-CORBA::ValueDef_var::tao_narrow (
+CORBA::ValueDef_ptr
+CORBA::tao_ValueDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ValueDef_var::tao_upcast (void *src)
+CORBA::tao_ValueDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ValueDef **tmp =
-    ACE_static_cast (ValueDef **, src);
+  CORBA::ValueDef **tmp =
+    ACE_static_cast (CORBA::ValueDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ValueDef_out
-// *************************************************************
-
-CORBA::ValueDef_out::ValueDef_out (ValueDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ValueDef::_nil ();
-}
-
-CORBA::ValueDef_out::ValueDef_out (ValueDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ValueDef::_nil ();
-}
-
-CORBA::ValueDef_out::ValueDef_out (const ::CORBA::ValueDef_out &p)
-  : ptr_ (ACE_const_cast (ValueDef_out &, p).ptr_)
-{}
-
-::CORBA::ValueDef_out &
-CORBA::ValueDef_out::operator= (const ::CORBA::ValueDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ValueDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ValueDef_out &
-CORBA::ValueDef_out::operator= (const ::CORBA::ValueDef_var &p)
-{
-  this->ptr_ = ::CORBA::ValueDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ValueDef_out &
-CORBA::ValueDef_out::operator= (ValueDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ValueDef_out::operator ::CORBA::ValueDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueDef_ptr &
-CORBA::ValueDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueDef_ptr
-CORBA::ValueDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ValueDef,
+        CORBA::tao_ValueDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ValueDef,
+        CORBA::tao_ValueDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ValueDef, \
+        CORBA::tao_ValueDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ValueDef, \
+        CORBA::tao_ValueDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -4715,29 +4258,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InterfaceDefSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get &);
-    
+
     ::CORBA::InterfaceDefSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -4750,7 +4293,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4762,11 +4305,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4775,17 +4318,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (::CORBA::InterfaceDefSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -4803,10 +4346,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4815,15 +4358,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set &);
     const CORBA::InterfaceDefSeq & supported_interfaces_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::InterfaceDefSeq & supported_interfaces
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       supported_interfaces_ (supported_interfaces)
@@ -4837,15 +4380,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->supported_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -4857,11 +4400,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4870,7 +4413,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4889,29 +4432,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::InitializerSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get &);
-    
+
     ::CORBA::InitializerSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -4924,7 +4467,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -4936,11 +4479,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4949,17 +4492,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (::CORBA::InitializerSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -4977,10 +4520,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4989,15 +4532,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set &);
     const CORBA::InitializerSeq & initializers_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       initializers_ (initializers)
@@ -5011,15 +4554,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5031,11 +4574,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5044,7 +4587,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -5063,29 +4606,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get &);
-    
+
     ::CORBA::ValueDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5098,7 +4641,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5110,11 +4653,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5123,17 +4666,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (::CORBA::ValueDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -5151,10 +4694,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5163,15 +4706,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set &);
     CORBA::ValueDef_ptr base_value_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::ValueDef_ptr base_value
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       base_value_ (base_value)
@@ -5185,15 +4728,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->base_value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5205,11 +4748,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5218,7 +4761,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -5237,29 +4780,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueDefSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get &);
-    
+
     ::CORBA::ValueDefSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5272,7 +4815,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5284,11 +4827,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5297,17 +4840,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (::CORBA::ValueDefSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -5325,10 +4868,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5337,15 +4880,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set &);
     const CORBA::ValueDefSeq & abstract_base_values_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ValueDefSeq & abstract_base_values
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       abstract_base_values_ (abstract_base_values)
@@ -5359,15 +4902,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->abstract_base_values_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5379,11 +4922,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5392,7 +4935,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -5411,29 +4954,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (const TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get &);
-    
+
     ::CORBA::Boolean _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5446,7 +4989,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5458,11 +5001,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5471,17 +5014,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Boolean result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -5499,10 +5042,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5511,15 +5054,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set &);
     const CORBA::Boolean & is_abstract_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_abstract
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       is_abstract_ (is_abstract)
@@ -5533,15 +5076,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (ACE_ENV_SINGLE_
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5553,11 +5096,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (ACE_ENV_SINGLE
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5566,7 +5109,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -5585,29 +5128,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (const TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get &);
-    
+
     ::CORBA::Boolean _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5620,7 +5163,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (ACE_ENV_SINGLE_AR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5632,11 +5175,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (ACE_ENV_SINGLE_A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5645,17 +5188,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Boolean result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -5673,10 +5216,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5685,15 +5228,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set &);
     const CORBA::Boolean & is_custom_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_custom
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       is_custom_ (is_custom)
@@ -5707,15 +5250,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (ACE_ENV_SINGLE_AR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_custom_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5727,11 +5270,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (ACE_ENV_SINGLE_A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5740,7 +5283,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -5759,29 +5302,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (const TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get &);
-    
+
     ::CORBA::Boolean _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -5794,7 +5337,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -5806,11 +5349,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5819,17 +5362,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -5847,10 +5390,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5859,15 +5402,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set &);
     const CORBA::Boolean & is_truncatable_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_truncatable
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       is_truncatable_ (is_truncatable)
@@ -5881,15 +5424,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (ACE_ENV_SING
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5901,11 +5444,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (ACE_ENV_SIN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -5914,7 +5457,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -5934,31 +5477,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_is_a (const TAO_ClientRequestInfo_CORBA_ValueDef_is_a &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_is_a &);
     const char * id_;
-    
+
     ::CORBA::Boolean _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_is_a::TAO_ClientRequestInfo_CORBA_ValueDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id)
@@ -5972,15 +5515,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -5992,11 +5535,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6005,17 +5548,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Boolean result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -6032,29 +5575,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueDef::FullValueDescription * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (const TAO_ClientRequestInfo_CORBA_ValueDef_describe_value &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_describe_value &);
-    
+
     ::CORBA::ValueDef::FullValueDescription * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -6067,7 +5610,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (ACE_ENV_SINGLE_A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -6079,11 +5622,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (ACE_ENV_SINGLE_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6092,17 +5635,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (::CORBA::ValueDef::FullValueDescription * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -6124,15 +5667,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ValueMemberDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member (const TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member &);
@@ -6141,13 +5684,13 @@ public:
     const char * version_;
     CORBA::IDLType_ptr type_;
     const CORBA::Visibility & access_;
-    
+
     ::CORBA::ValueMemberDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -6156,7 +5699,7 @@ public:
       const char * version,
       CORBA::IDLType_ptr type,
       const CORBA::Visibility & access
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -6174,31 +5717,31 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (ACE_ENV_SIN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= access_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -6210,11 +5753,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (ACE_ENV_SI
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6223,17 +5766,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (::CORBA::ValueMemberDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -6255,15 +5798,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::AttributeDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute (const TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute &);
@@ -6272,13 +5815,13 @@ public:
     const char * version_;
     CORBA::IDLType_ptr type_;
     const CORBA::AttributeMode & mode_;
-    
+
     ::CORBA::AttributeDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -6287,7 +5830,7 @@ public:
       const char * version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode & mode
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -6305,31 +5848,31 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -6341,11 +5884,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6354,17 +5897,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (::CORBA::AttributeDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -6389,15 +5932,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::OperationDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueDef_create_operation (const TAO_ClientRequestInfo_CORBA_ValueDef_create_operation &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_create_operation &);
@@ -6409,13 +5952,13 @@ public:
     const CORBA::ParDescriptionSeq & params_;
     const CORBA::ExceptionDefSeq & exceptions_;
     const CORBA::ContextIdSeq & contexts_;
-    
+
     ::CORBA::OperationDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_CORBA_ValueDef_create_operation (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -6427,7 +5970,7 @@ public:
       const CORBA::ParDescriptionSeq & params,
       const CORBA::ExceptionDefSeq & exceptions,
       const CORBA::ContextIdSeq & contexts
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -6448,43 +5991,43 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (ACE_ENV_SINGLE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (8);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->result_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->params_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->contexts_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -6496,11 +6039,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (ACE_ENV_SINGL
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -6509,17 +6052,17 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_AR
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (::CORBA::OperationDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -6529,7 +6072,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (::CORBA::Operatio
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
@@ -6553,18 +6096,18 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
 {
   CORBA::InterfaceDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::InterfaceDefSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_supported_interfaces",
@@ -6572,22 +6115,22 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get _tao_ri (
           &_tao_call,
@@ -6595,14 +6138,14 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6610,78 +6153,85 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InterfaceDefSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InterfaceDefSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -6691,59 +6241,57 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -6759,12 +6307,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_supported_interfaces",
@@ -6772,22 +6320,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set _tao_ri (
           &_tao_call,
@@ -6796,14 +6344,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6811,70 +6359,76 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << supported_interfaces)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << supported_interfaces)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -6884,56 +6438,54 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -6950,18 +6502,18 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
 {
   CORBA::InitializerSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::InitializerSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::InitializerSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_initializers",
@@ -6969,22 +6521,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get _tao_ri (
           &_tao_call,
@@ -6992,14 +6544,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7007,78 +6559,85 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::InitializerSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::InitializerSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7088,59 +6647,57 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -7156,12 +6713,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_initializers",
@@ -7169,22 +6726,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set _tao_ri (
           &_tao_call,
@@ -7193,14 +6750,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7208,70 +6765,76 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << initializers)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << initializers)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7281,56 +6844,54 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -7347,12 +6908,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
 {
   CORBA::ValueDef_var _tao_retval (CORBA::ValueDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_value",
@@ -7360,22 +6921,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get _tao_ri (
           &_tao_call,
@@ -7383,14 +6944,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7398,78 +6959,85 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ValueDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ValueDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7479,59 +7047,57 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -7547,12 +7113,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_base_value",
@@ -7560,22 +7126,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set _tao_ri (
           &_tao_call,
@@ -7584,14 +7150,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7599,70 +7165,76 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << base_value)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << base_value)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7672,56 +7244,54 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -7738,18 +7308,18 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
 {
   CORBA::ValueDefSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ValueDefSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ValueDefSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_abstract_base_values",
@@ -7757,22 +7327,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get _tao_ri (
           &_tao_call,
@@ -7780,14 +7350,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7795,78 +7365,85 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ValueDefSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ValueDefSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7876,59 +7453,57 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -7944,12 +7519,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_abstract_base_values",
@@ -7957,22 +7532,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set _tao_ri (
           &_tao_call,
@@ -7981,14 +7556,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7996,70 +7571,76 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << abstract_base_values)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << abstract_base_values)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -8069,56 +7650,54 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -8135,12 +7714,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_abstract",
@@ -8148,22 +7727,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get _tao_ri (
           &_tao_call,
@@ -8171,14 +7750,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8186,77 +7765,84 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Boolean _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -8266,59 +7852,57 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -8334,12 +7918,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_abstract",
@@ -8347,22 +7931,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set _tao_ri (
           &_tao_call,
@@ -8371,14 +7955,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8386,70 +7970,76 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << CORBA::Any::from_boolean (is_abstract))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << CORBA::Any::from_boolean (is_abstract))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -8459,56 +8049,54 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -8525,12 +8113,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_custom",
@@ -8538,22 +8126,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get _tao_ri (
           &_tao_call,
@@ -8561,14 +8149,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8576,77 +8164,84 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Boolean _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -8656,59 +8251,57 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -8724,12 +8317,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_custom",
@@ -8737,22 +8330,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set _tao_ri (
           &_tao_call,
@@ -8761,14 +8354,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8776,70 +8369,76 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << CORBA::Any::from_boolean (is_custom))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << CORBA::Any::from_boolean (is_custom))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -8849,56 +8448,54 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -8915,12 +8512,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_is_truncatable",
@@ -8928,22 +8525,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get _tao_ri (
           &_tao_call,
@@ -8951,14 +8548,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -8966,77 +8563,84 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Boolean _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -9046,59 +8650,57 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -9114,12 +8716,12 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_is_truncatable",
@@ -9127,22 +8729,22 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set _tao_ri (
           &_tao_call,
@@ -9151,14 +8753,14 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9166,70 +8768,76 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << CORBA::Any::from_boolean (is_truncatable))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << CORBA::Any::from_boolean (is_truncatable))
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -9239,56 +8847,54 @@ void CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -9306,12 +8912,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "is_a",
@@ -9319,22 +8925,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_a _tao_ri (
           &_tao_call,
@@ -9343,14 +8949,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9358,90 +8964,94 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Boolean _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -9451,59 +9061,57 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -9519,18 +9127,18 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::ValueDef::FullValueDescription_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ValueDef::FullValueDescription *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ValueDef::FullValueDescription, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_value",
@@ -9538,22 +9146,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_describe_value _tao_ri (
           &_tao_call,
@@ -9561,14 +9169,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9576,78 +9184,85 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ValueDef::FullValueDescription * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ValueDef::FullValueDescription * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -9657,59 +9272,57 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -9730,12 +9343,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::ValueMemberDef_var _tao_retval (CORBA::ValueMemberDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_value_member",
@@ -9743,22 +9356,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member _tao_ri (
           &_tao_call,
@@ -9771,14 +9384,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -9786,95 +9399,99 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << type) &&
-              (_tao_out << access)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << type) &&
+                  (_tao_out << access)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ValueMemberDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ValueMemberDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -9884,59 +9501,57 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -9957,12 +9572,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::AttributeDef_var _tao_retval (CORBA::AttributeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_attribute",
@@ -9970,22 +9585,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
       5,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute _tao_ri (
           &_tao_call,
@@ -9998,14 +9613,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -10013,95 +9628,99 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << type) &&
-              (_tao_out << mode)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << type) &&
+                  (_tao_out << mode)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::AttributeDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::AttributeDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -10111,59 +9730,57 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -10187,12 +9804,12 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
 {
   CORBA::OperationDef_var _tao_retval (CORBA::OperationDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_operation",
@@ -10200,22 +9817,22 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
       8,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_create_operation _tao_ri (
           &_tao_call,
@@ -10231,14 +9848,14 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -10246,98 +9863,102 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << result) &&
-              (_tao_out << mode) &&
-              (_tao_out << params) &&
-              (_tao_out << exceptions) &&
-              (_tao_out << contexts)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << result) &&
+                  (_tao_out << mode) &&
+                  (_tao_out << params) &&
+                  (_tao_out << exceptions) &&
+                  (_tao_out << contexts)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::OperationDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::OperationDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -10347,63 +9968,61 @@ CORBA::Boolean CORBA::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -10454,8 +10073,8 @@ CORBA::_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ValueDef::ValueDef (int collocated)
 {
@@ -10471,7 +10090,7 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation (int collocated)
   else
     this->the_TAO_ValueDef_Proxy_Broker_ =
       ::CORBA::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Container_setup_collocation (collocated);
   this->CORBA_Contained_setup_collocation (collocated);
   this->CORBA_IDLType_setup_collocation (collocated);
@@ -10480,7 +10099,7 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation (int collocated)
 CORBA::ValueDef::~ValueDef (void)
 {}
 
-void 
+void
 CORBA::ValueDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueDef *tmp = ACE_static_cast (ValueDef *, _tao_void_pointer);
@@ -10497,7 +10116,7 @@ CORBA::ValueDef::_narrow (
     {
       return ValueDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -10506,17 +10125,17 @@ CORBA::ValueDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ValueDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ValueDef::_nil ();
         }
     }
-  
+
   return ValueDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ValueDef_ptr 
+CORBA::ValueDef_ptr
 CORBA::ValueDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -10526,18 +10145,18 @@ CORBA::ValueDef::_unchecked_narrow (
     {
       return ValueDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ValueDef_ptr default_proxy = ValueDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -10555,7 +10174,7 @@ CORBA::ValueDef::_unchecked_narrow (
               ValueDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -10568,10 +10187,10 @@ CORBA::ValueDef::_unchecked_narrow (
               ValueDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ValueDef_ptr,
@@ -10591,7 +10210,7 @@ CORBA::ValueDef::_duplicate (ValueDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -10642,7 +10261,7 @@ CORBA::ValueDef::_is_a (
 void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ValueDef)::_tao_class_id)
@@ -10717,12 +10336,12 @@ void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -10731,6 +10350,12 @@ const char* CORBA::ValueDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ValueDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ValueDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -10741,10 +10366,10 @@ const char* CORBA::ValueDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.supported_interfaces (
       this
       ACE_ENV_ARG_PARAMETER
@@ -10762,10 +10387,10 @@ void CORBA::ValueDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.supported_interfaces (
       this,
       supported_interfaces
@@ -10783,10 +10408,10 @@ void CORBA::ValueDef::supported_interfaces (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.initializers (
       this
       ACE_ENV_ARG_PARAMETER
@@ -10804,10 +10429,10 @@ void CORBA::ValueDef::initializers (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.initializers (
       this,
       initializers
@@ -10825,10 +10450,10 @@ void CORBA::ValueDef::initializers (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.base_value (
       this
       ACE_ENV_ARG_PARAMETER
@@ -10846,10 +10471,10 @@ void CORBA::ValueDef::base_value (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.base_value (
       this,
       base_value
@@ -10867,10 +10492,10 @@ void CORBA::ValueDef::base_value (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.abstract_base_values (
       this
       ACE_ENV_ARG_PARAMETER
@@ -10888,10 +10513,10 @@ void CORBA::ValueDef::abstract_base_values (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.abstract_base_values (
       this,
       abstract_base_values
@@ -10909,10 +10534,10 @@ CORBA::Boolean CORBA::ValueDef::is_abstract (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_abstract (
       this
       ACE_ENV_ARG_PARAMETER
@@ -10930,10 +10555,10 @@ void CORBA::ValueDef::is_abstract (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.is_abstract (
       this,
       is_abstract
@@ -10951,10 +10576,10 @@ CORBA::Boolean CORBA::ValueDef::is_custom (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_custom (
       this
       ACE_ENV_ARG_PARAMETER
@@ -10972,10 +10597,10 @@ void CORBA::ValueDef::is_custom (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.is_custom (
       this,
       is_custom
@@ -10993,10 +10618,10 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_truncatable (
       this
       ACE_ENV_ARG_PARAMETER
@@ -11014,10 +10639,10 @@ void CORBA::ValueDef::is_truncatable (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.is_truncatable (
       this,
       is_truncatable
@@ -11036,10 +10661,10 @@ CORBA::Boolean CORBA::ValueDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.is_a (
       this,
       id
@@ -11054,48 +10679,48 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   52,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c756544), 
-  ACE_NTOHL (0x65662f46), 
-  ACE_NTOHL (0x756c6c56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5661),
+  ACE_NTOHL (0x6c756544),
+  ACE_NTOHL (0x65662f46),
+  ACE_NTOHL (0x756c6c56),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0
     21,
-  ACE_NTOHL (0x46756c6c), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x46756c6c),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = FullValueDescription
   15, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -11104,87 +10729,87 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61), 
-  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x69735f61),
+  ACE_NTOHL (0x62737472),
   ACE_NTOHL (0x61637400),  // name = is_abstract
     CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63), 
-  ACE_NTOHL (0x7573746f), 
+  ACE_NTOHL (0x69735f63),
+  ACE_NTOHL (0x7573746f),
   ACE_NTOHL (0x6d000000),  // name = is_custom
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff74, // negative offset (-140)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
   1340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x4f704465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1260, // encapsulation length
@@ -11193,27 +10818,27 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
       1244, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffdec, // negative offset (-532)
@@ -11222,73 +10847,73 @@ static const CORBA::Long _oc_CORBA_ValueDef_FullValueDescription[] =
                 0xffffffff, // indirection
         0xfffffe30, // negative offset (-464)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffe18, // negative offset (-488)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffea0, // negative offset (-352)
         7,
-        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x72657375),
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
-          ACE_NTOHL (0x65726174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f70),
+          ACE_NTOHL (0x65726174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x4f706572),
+          ACE_NTOHL (0x6174696f),
+          ACE_NTOHL (0x6e4d6f64),
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e), 
-          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4f505f4e),
+          ACE_NTOHL (0x4f524d41),
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f), 
-          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x4f505f4f),
+          ACE_NTOHL (0x4e455741),
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-          
+
         9,
-        ACE_NTOHL (0x636f6e74), 
-        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x636f6e74),
+        ACE_NTOHL (0x65787473),
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         168, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
-          ACE_NTOHL (0x6e746578), 
-          ACE_NTOHL (0x74496453), 
-          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+          ACE_NTOHL (0x74496453),
+          ACE_NTOHL (0x65713a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x436f6e74),
+          ACE_NTOHL (0x65787449),
+          ACE_NTOHL (0x64536571),
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           96, // encapsulation length
@@ -11297,21 +10922,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             80, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f436f),
+              ACE_NTOHL (0x6e746578),
+              ACE_NTOHL (0x74496465),
+              ACE_NTOHL (0x6e746966),
+              ACE_NTOHL (0x6965723a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x436f6e74),
+              ACE_NTOHL (0x65787449),
+              ACE_NTOHL (0x64656e74),
+              ACE_NTOHL (0x69666965),
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             0xffffffff, // indirection
               0xfffffc6c, // negative offset (-916)
@@ -11320,28 +10945,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261), 
-        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x70617261),
+        ACE_NTOHL (0x6d657465),
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         428, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x50617244),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           348, // encapsulation length
@@ -11350,117 +10975,117 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             332, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x74657244), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x74657244),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x72446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffffb8c, // negative offset (-1140)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
-                
+
               5,
-              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x6d6f6465),
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
-                ACE_NTOHL (0x72616d65), 
-                ACE_NTOHL (0x7465724d), 
-                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5061),
+                ACE_NTOHL (0x72616d65),
+                ACE_NTOHL (0x7465724d),
+                ACE_NTOHL (0x6f64653a),
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x50617261),
+                ACE_NTOHL (0x6d657465),
+                ACE_NTOHL (0x724d6f64),
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f4f55),
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-                
+
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
@@ -11469,27 +11094,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             180, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff9c8, // negative offset (-1592)
@@ -11498,18 +11123,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                             0xffffffff, // indirection
               0xfffffa0c, // negative offset (-1524)
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             0xffffffff, // indirection
               0xfffff9f4, // negative offset (-1548)
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
                             0xffffffff, // indirection
               0xfffffa7c, // negative offset (-1412)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -11522,29 +11147,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   404, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
-    ACE_NTOHL (0x74724465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4174),
+    ACE_NTOHL (0x74724465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
         19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x41747472),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     320, // encapsulation length
@@ -11553,27 +11178,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       304, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
-        ACE_NTOHL (0x74726962), 
-        ACE_NTOHL (0x75746544), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4174),
+        ACE_NTOHL (0x74726962),
+        ACE_NTOHL (0x75746544),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
                 21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x41747472),
+        ACE_NTOHL (0x69627574),
+        ACE_NTOHL (0x65446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = AttributeDescription
         6, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff894, // negative offset (-1900)
@@ -11582,78 +11207,78 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffff8d8, // negative offset (-1832)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffff8c0, // negative offset (-1856)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffff948, // negative offset (-1720)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-          
+
 
       0U,
 
 
   8,
-  ACE_NTOHL (0x6d656d62), 
+  ACE_NTOHL (0x6d656d62),
   ACE_NTOHL (0x65727300),  // name = members
     CORBA::tk_alias, // typecode kind for typedefs
   360, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
-    ACE_NTOHL (0x6c75654d), 
-    ACE_NTOHL (0x656d6265), 
-    ACE_NTOHL (0x72536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5661),
+    ACE_NTOHL (0x6c75654d),
+    ACE_NTOHL (0x656d6265),
+    ACE_NTOHL (0x72536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
         15,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x654d656d), 
-    ACE_NTOHL (0x62657253), 
+    ACE_NTOHL (0x56616c75),
+    ACE_NTOHL (0x654d656d),
+    ACE_NTOHL (0x62657253),
     ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
         CORBA::tk_sequence, // typecode kind
     284, // encapsulation length
@@ -11662,22 +11287,22 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       268, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5661), 
-        ACE_NTOHL (0x6c75654d), 
-        ACE_NTOHL (0x656d6265), 
-        ACE_NTOHL (0x723a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5661),
+        ACE_NTOHL (0x6c75654d),
+        ACE_NTOHL (0x656d6265),
+        ACE_NTOHL (0x723a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
                 12,
-        ACE_NTOHL (0x56616c75), 
-        ACE_NTOHL (0x654d656d), 
+        ACE_NTOHL (0x56616c75),
+        ACE_NTOHL (0x654d656d),
         ACE_NTOHL (0x62657200),  // name = ValueMember
         7, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff708, // negative offset (-2296)
@@ -11686,46 +11311,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffff74c, // negative offset (-2228)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffff734, // negative offset (-2252)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffff7bc, // negative offset (-2116)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x5f646566), 
+        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x5f646566),
         ACE_NTOHL (0x0),  // name = type_def
                 0xffffffff, // indirection
         0xfffffb3c, // negative offset (-1220)
         7,
-        ACE_NTOHL (0x61636365), 
+        ACE_NTOHL (0x61636365),
         ACE_NTOHL (0x73730000),  // name = access
                 CORBA::tk_alias, // typecode kind for typedefs
         64, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5669), 
-          ACE_NTOHL (0x73696269), 
-          ACE_NTOHL (0x6c697479), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5669),
+          ACE_NTOHL (0x73696269),
+          ACE_NTOHL (0x6c697479),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
                     11,
-          ACE_NTOHL (0x56697369), 
-          ACE_NTOHL (0x62696c69), 
+          ACE_NTOHL (0x56697369),
+          ACE_NTOHL (0x62696c69),
           ACE_NTOHL (0x74790000),  // name = Visibility
                     CORBA::tk_short,
 
@@ -11735,28 +11360,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   13,
-  ACE_NTOHL (0x696e6974), 
-  ACE_NTOHL (0x69616c69), 
-  ACE_NTOHL (0x7a657273), 
+  ACE_NTOHL (0x696e6974),
+  ACE_NTOHL (0x69616c69),
+  ACE_NTOHL (0x7a657273),
   ACE_NTOHL (0x0),  // name = initializers
     CORBA::tk_alias, // typecode kind for typedefs
   416, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f496e), 
-    ACE_NTOHL (0x69746961), 
-    ACE_NTOHL (0x6c697a65), 
-    ACE_NTOHL (0x72536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f496e),
+    ACE_NTOHL (0x69746961),
+    ACE_NTOHL (0x6c697a65),
+    ACE_NTOHL (0x72536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
         15,
-    ACE_NTOHL (0x496e6974), 
-    ACE_NTOHL (0x69616c69), 
-    ACE_NTOHL (0x7a657253), 
+    ACE_NTOHL (0x496e6974),
+    ACE_NTOHL (0x69616c69),
+    ACE_NTOHL (0x7a657253),
     ACE_NTOHL (0x65710000),  // name = InitializerSeq
         CORBA::tk_sequence, // typecode kind
     340, // encapsulation length
@@ -11765,41 +11390,41 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       324, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f496e), 
-        ACE_NTOHL (0x69746961), 
-        ACE_NTOHL (0x6c697a65), 
-        ACE_NTOHL (0x723a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f496e),
+        ACE_NTOHL (0x69746961),
+        ACE_NTOHL (0x6c697a65),
+        ACE_NTOHL (0x723a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
                 12,
-        ACE_NTOHL (0x496e6974), 
-        ACE_NTOHL (0x69616c69), 
+        ACE_NTOHL (0x496e6974),
+        ACE_NTOHL (0x69616c69),
         ACE_NTOHL (0x7a657200),  // name = Initializer
         2, // member count
                 8,
-        ACE_NTOHL (0x6d656d62), 
+        ACE_NTOHL (0x6d656d62),
         ACE_NTOHL (0x65727300),  // name = members
                 CORBA::tk_alias, // typecode kind for typedefs
         220, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           38,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5374), 
-          ACE_NTOHL (0x72756374), 
-          ACE_NTOHL (0x4d656d62), 
-          ACE_NTOHL (0x65725365), 
-          ACE_NTOHL (0x713a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5374),
+          ACE_NTOHL (0x72756374),
+          ACE_NTOHL (0x4d656d62),
+          ACE_NTOHL (0x65725365),
+          ACE_NTOHL (0x713a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
                     16,
-          ACE_NTOHL (0x53747275), 
-          ACE_NTOHL (0x63744d65), 
-          ACE_NTOHL (0x6d626572), 
+          ACE_NTOHL (0x53747275),
+          ACE_NTOHL (0x63744d65),
+          ACE_NTOHL (0x6d626572),
           ACE_NTOHL (0x53657100),  // name = StructMemberSeq
                     CORBA::tk_sequence, // typecode kind
           144, // encapsulation length
@@ -11808,34 +11433,34 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             128, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5374), 
-              ACE_NTOHL (0x72756374), 
-              ACE_NTOHL (0x4d656d62), 
-              ACE_NTOHL (0x65723a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5374),
+              ACE_NTOHL (0x72756374),
+              ACE_NTOHL (0x4d656d62),
+              ACE_NTOHL (0x65723a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
                             13,
-              ACE_NTOHL (0x53747275), 
-              ACE_NTOHL (0x63744d65), 
-              ACE_NTOHL (0x6d626572), 
+              ACE_NTOHL (0x53747275),
+              ACE_NTOHL (0x63744d65),
+              ACE_NTOHL (0x6d626572),
               ACE_NTOHL (0x0),  // name = StructMember
               3, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff4d4, // negative offset (-2860)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
                             0xffffffff, // indirection
               0xfffff944, // negative offset (-1724)
@@ -11844,7 +11469,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff494, // negative offset (-2924)
@@ -11853,30 +11478,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   21,
-  ACE_NTOHL (0x73757070), 
-  ACE_NTOHL (0x6f727465), 
-  ACE_NTOHL (0x645f696e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636573), 
+  ACE_NTOHL (0x73757070),
+  ACE_NTOHL (0x6f727465),
+  ACE_NTOHL (0x645f696e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636573),
   ACE_NTOHL (0x0),  // name = supported_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
@@ -11887,29 +11512,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   21,
-  ACE_NTOHL (0x61627374), 
-  ACE_NTOHL (0x72616374), 
-  ACE_NTOHL (0x5f626173), 
-  ACE_NTOHL (0x655f7661), 
-  ACE_NTOHL (0x6c756573), 
+  ACE_NTOHL (0x61627374),
+  ACE_NTOHL (0x72616374),
+  ACE_NTOHL (0x5f626173),
+  ACE_NTOHL (0x655f7661),
+  ACE_NTOHL (0x6c756573),
   ACE_NTOHL (0x0),  // name = abstract_base_values
     0xffffffff, // indirection
   0xffffff7c, // negative offset (-132)
   15,
-  ACE_NTOHL (0x69735f74), 
-  ACE_NTOHL (0x72756e63), 
-  ACE_NTOHL (0x61746162), 
+  ACE_NTOHL (0x69735f74),
+  ACE_NTOHL (0x72756e63),
+  ACE_NTOHL (0x61746162),
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f76616c), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f76616c),
   ACE_NTOHL (0x75650000),  // name = base_value
     0xffffffff, // indirection
   0xfffff410, // negative offset (-3056)
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -11926,7 +11551,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef_FullValueDescription (
 ::CORBA::TypeCode_ptr CORBA::ValueDef::_tc_FullValueDescription =
   &_tc_TAO_tc_CORBA_ValueDef_FullValueDescription;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -11936,6 +11561,37 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      FullValueDescription
+    >;
+
+template class
+  TAO_Out_T<
+      FullValueDescription,
+      FullValueDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      FullValueDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      FullValueDescription, \
+      FullValueDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ValueDef::FullValueDescription * CORBA::ValueDef::describe_value (
@@ -11945,10 +11601,10 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_value (
       this
       ACE_ENV_ARG_PARAMETER
@@ -11970,10 +11626,10 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_value_member (
       this,
       id,
@@ -12000,10 +11656,10 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_attribute (
       this,
       id,
@@ -12033,10 +11689,10 @@ void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
+  _TAO_ValueDef_Proxy_Impl &proxy =
     this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_operation (
       this,
       id,
@@ -12058,17 +11714,17 @@ static const CORBA::Long _oc_CORBA_ValueDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c756544), 
-  ACE_NTOHL (0x65663a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5661),
+  ACE_NTOHL (0x6c756544),
+  ACE_NTOHL (0x65663a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
     9,
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65446566), 
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65446566),
   ACE_NTOHL (0x0),  // name = ValueDef
   };
 
@@ -12096,44 +11752,44 @@ static const CORBA::Long _oc_CORBA_ValueDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c756544), 
-  ACE_NTOHL (0x65736372), 
-  ACE_NTOHL (0x69707469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5661),
+  ACE_NTOHL (0x6c756544),
+  ACE_NTOHL (0x65736372),
+  ACE_NTOHL (0x69707469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDescription:1.0
     17,
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65446573), 
-  ACE_NTOHL (0x63726970), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65446573),
+  ACE_NTOHL (0x63726970),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = ValueDescription
   10, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -12142,89 +11798,89 @@ static const CORBA::Long _oc_CORBA_ValueDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61), 
-  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x69735f61),
+  ACE_NTOHL (0x62737472),
   ACE_NTOHL (0x61637400),  // name = is_abstract
     CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63), 
-  ACE_NTOHL (0x7573746f), 
+  ACE_NTOHL (0x69735f63),
+  ACE_NTOHL (0x7573746f),
   ACE_NTOHL (0x6d000000),  // name = is_custom
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff74, // negative offset (-140)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   21,
-  ACE_NTOHL (0x73757070), 
-  ACE_NTOHL (0x6f727465), 
-  ACE_NTOHL (0x645f696e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636573), 
+  ACE_NTOHL (0x73757070),
+  ACE_NTOHL (0x6f727465),
+  ACE_NTOHL (0x645f696e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636573),
   ACE_NTOHL (0x0),  // name = supported_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
@@ -12235,24 +11891,24 @@ static const CORBA::Long _oc_CORBA_ValueDescription[] =
 
 
   21,
-  ACE_NTOHL (0x61627374), 
-  ACE_NTOHL (0x72616374), 
-  ACE_NTOHL (0x5f626173), 
-  ACE_NTOHL (0x655f7661), 
-  ACE_NTOHL (0x6c756573), 
+  ACE_NTOHL (0x61627374),
+  ACE_NTOHL (0x72616374),
+  ACE_NTOHL (0x5f626173),
+  ACE_NTOHL (0x655f7661),
+  ACE_NTOHL (0x6c756573),
   ACE_NTOHL (0x0),  // name = abstract_base_values
     0xffffffff, // indirection
   0xffffff7c, // negative offset (-132)
   15,
-  ACE_NTOHL (0x69735f74), 
-  ACE_NTOHL (0x72756e63), 
-  ACE_NTOHL (0x61746162), 
+  ACE_NTOHL (0x69735f74),
+  ACE_NTOHL (0x72756e63),
+  ACE_NTOHL (0x61746162),
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f76616c), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f76616c),
   ACE_NTOHL (0x75650000),  // name = base_value
     0xffffffff, // indirection
   0xfffffe48, // negative offset (-440)
@@ -12275,7 +11931,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ValueDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -12285,12 +11941,43 @@ void CORBA::ValueDescription::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ValueDescription
+    >;
+
+template class
+  TAO_Out_T<
+      ValueDescription,
+      ValueDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ValueDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ValueDescription, \
+      ValueDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::ExtValueDef::_tao_class_id = 0;
 
 CORBA::ExtValueDef_ptr
-tao_CORBA_ExtValueDef_duplicate (
+CORBA::tao_ExtValueDef_life::tao_duplicate (
     CORBA::ExtValueDef_ptr p
   )
 {
@@ -12298,7 +11985,7 @@ tao_CORBA_ExtValueDef_duplicate (
 }
 
 void
-tao_CORBA_ExtValueDef_release (
+CORBA::tao_ExtValueDef_life::tao_release (
     CORBA::ExtValueDef_ptr p
   )
 {
@@ -12306,228 +11993,64 @@ tao_CORBA_ExtValueDef_release (
 }
 
 CORBA::ExtValueDef_ptr
-tao_CORBA_ExtValueDef_nil (
+CORBA::tao_ExtValueDef_life::tao_nil (
     void
   )
 {
   return CORBA::ExtValueDef::_nil ();
 }
 
-CORBA::ExtValueDef_ptr
-tao_CORBA_ExtValueDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ExtValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ExtValueDef_upcast (
-    void *src
-  )
-{
-  CORBA::ExtValueDef **tmp =
-    ACE_static_cast (CORBA::ExtValueDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ExtValueDef_marshal (
+CORBA::tao_ExtValueDef_life::tao_marshal (
     CORBA::ExtValueDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ExtValueDef_var
-// *************************************************************
-
-CORBA::ExtValueDef_var::ExtValueDef_var (void)
-  : ptr_ (ExtValueDef::_nil ())
-{}
-
-::CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ExtValueDef_var::ExtValueDef_var (const ::CORBA::ExtValueDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ExtValueDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ExtValueDef_var::~ExtValueDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ExtValueDef_var &
-CORBA::ExtValueDef_var::operator= (ExtValueDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtValueDef_var &
-CORBA::ExtValueDef_var::operator= (const ::CORBA::ExtValueDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ExtValueDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ExtValueDef_var::operator const ::CORBA::ExtValueDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ExtValueDef_var::operator ::CORBA::ExtValueDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef_var::operator-> (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtValueDef_ptr &
-CORBA::ExtValueDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtValueDef_ptr &
-CORBA::ExtValueDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtValueDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ExtValueDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ExtValueDef::_nil ();
-  return val;
-}
-
-::CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef_var::tao_duplicate (ExtValueDef_ptr p)
-{
-  return ::CORBA::ExtValueDef::_duplicate (p);
-}
-
-void
-CORBA::ExtValueDef_var::tao_release (ExtValueDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef_var::tao_nil (void)
-{
-  return ::CORBA::ExtValueDef::_nil ();
-}
-
-::CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef_var::tao_narrow (
+CORBA::ExtValueDef_ptr
+CORBA::tao_ExtValueDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ExtValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExtValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ExtValueDef_var::tao_upcast (void *src)
+CORBA::tao_ExtValueDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ExtValueDef **tmp =
-    ACE_static_cast (ExtValueDef **, src);
+  CORBA::ExtValueDef **tmp =
+    ACE_static_cast (CORBA::ExtValueDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ExtValueDef_out
-// *************************************************************
-
-CORBA::ExtValueDef_out::ExtValueDef_out (ExtValueDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ExtValueDef::_nil ();
-}
-
-CORBA::ExtValueDef_out::ExtValueDef_out (ExtValueDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ExtValueDef::_nil ();
-}
-
-CORBA::ExtValueDef_out::ExtValueDef_out (const ::CORBA::ExtValueDef_out &p)
-  : ptr_ (ACE_const_cast (ExtValueDef_out &, p).ptr_)
-{}
-
-::CORBA::ExtValueDef_out &
-CORBA::ExtValueDef_out::operator= (const ::CORBA::ExtValueDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtValueDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ExtValueDef_out &
-CORBA::ExtValueDef_out::operator= (const ::CORBA::ExtValueDef_var &p)
-{
-  this->ptr_ = ::CORBA::ExtValueDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ExtValueDef_out &
-CORBA::ExtValueDef_out::operator= (ExtValueDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ExtValueDef_out::operator ::CORBA::ExtValueDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtValueDef_ptr &
-CORBA::ExtValueDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ExtValueDef_ptr
-CORBA::ExtValueDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ExtValueDef,
+        CORBA::tao_ExtValueDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ExtValueDef,
+        CORBA::tao_ExtValueDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ExtValueDef, \
+        CORBA::tao_ExtValueDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ExtValueDef, \
+        CORBA::tao_ExtValueDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -12547,29 +12070,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExtInitializerSeq * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get (const TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get &);
-    
+
     ::CORBA::ExtInitializerSeq * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -12582,7 +12105,7 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::arguments (ACE_ENV
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -12594,11 +12117,11 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::exceptions (ACE_EN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12607,17 +12130,17 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (ACE_ENV_SI
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get::result (::CORBA::ExtInitializerSeq * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12635,10 +12158,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -12647,15 +12170,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set &);
     const CORBA::ExtInitializerSeq & ext_initializers_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ExtInitializerSeq & ext_initializers
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       ext_initializers_ (ext_initializers)
@@ -12669,15 +12192,15 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::arguments (ACE_ENV
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->ext_initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -12689,11 +12212,11 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::exceptions (ACE_EN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12702,7 +12225,7 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set::result (ACE_ENV_SI
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -12721,29 +12244,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExtValueDef::ExtFullValueDescription * result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value (const TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value &);
-    
+
     ::CORBA::ExtValueDef::ExtFullValueDescription * _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -12756,7 +12279,7 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::arguments (ACE_ENV_S
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -12768,11 +12291,11 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::exceptions (ACE_ENV_
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12781,17 +12304,17 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (ACE_ENV_SING
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value::result (::CORBA::ExtValueDef::ExtFullValueDescription * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12815,15 +12338,15 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::ExtAttributeDef_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute (const TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute &);
@@ -12834,13 +12357,13 @@ public:
     const CORBA::AttributeMode & mode_;
     const CORBA::ExceptionDefSeq & get_exceptions_;
     const CORBA::ExceptionDefSeq & set_exceptions_;
-    
+
     ::CORBA::ExtAttributeDef_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
@@ -12851,7 +12374,7 @@ public:
       CORBA::AttributeMode & mode,
       const CORBA::ExceptionDefSeq & get_exceptions,
       const CORBA::ExceptionDefSeq & set_exceptions
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       id_ (id),
@@ -12871,39 +12394,39 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::arguments (ACE_ENV
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (7);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->mode_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->get_exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->set_exceptions_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -12915,11 +12438,11 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::exceptions (ACE_EN
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -12928,17 +12451,17 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (ACE_ENV_SI
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (::CORBA::ExtAttributeDef_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -12948,7 +12471,7 @@ TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute::result (::CORBA::E
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ExtValueDef_Proxy_Impl::_TAO_ExtValueDef_Proxy_Impl (void)
@@ -12972,18 +12495,18 @@ CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::_TAO_ExtValueDef_Remote_Proxy_Impl (v
 {
   CORBA::ExtInitializerSeq_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ExtInitializerSeq *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ExtInitializerSeq, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_ext_initializers",
@@ -12991,22 +12514,22 @@ CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::_TAO_ExtValueDef_Remote_Proxy_Impl (v
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_get _tao_ri (
           &_tao_call,
@@ -13014,14 +12537,14 @@ CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::_TAO_ExtValueDef_Remote_Proxy_Impl (v
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13029,78 +12552,85 @@ CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::_TAO_ExtValueDef_Remote_Proxy_Impl (v
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExtInitializerSeq * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExtInitializerSeq * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13110,59 +12640,57 @@ CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::_TAO_ExtValueDef_Remote_Proxy_Impl (v
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13178,12 +12706,12 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_ext_initializers",
@@ -13191,22 +12719,22 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtValueDef_ext_initializers_set _tao_ri (
           &_tao_call,
@@ -13215,14 +12743,14 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13230,70 +12758,76 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << ext_initializers)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << ext_initializers)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13303,56 +12837,54 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -13369,18 +12901,18 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
 {
   CORBA::ExtValueDef::ExtFullValueDescription_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-  
+
   {
     CORBA::ExtValueDef::ExtFullValueDescription *tmp;
     ACE_NEW_RETURN (tmp, CORBA::ExtValueDef::ExtFullValueDescription, _tao_retval._retn ());
     _tao_retval = tmp;
   }
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_ext_value",
@@ -13388,22 +12920,22 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtValueDef_describe_ext_value _tao_ri (
           &_tao_call,
@@ -13411,14 +12943,14 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13426,78 +12958,85 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExtValueDef::ExtFullValueDescription * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExtValueDef::ExtFullValueDescription * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13507,59 +13046,57 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -13582,12 +13119,12 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
 {
   CORBA::ExtAttributeDef_var _tao_retval (CORBA::ExtAttributeDef::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_ext_attribute",
@@ -13595,22 +13132,22 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
       7,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExtValueDef_create_ext_attribute _tao_ri (
           &_tao_call,
@@ -13625,14 +13162,14 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -13640,97 +13177,101 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << type) &&
-              (_tao_out << mode) &&
-              (_tao_out << get_exceptions) &&
-              (_tao_out << set_exceptions)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << id) &&
+                  (_tao_out << name) &&
+                  (_tao_out << version) &&
+                  (_tao_out << type) &&
+                  (_tao_out << mode) &&
+                  (_tao_out << get_exceptions) &&
+                  (_tao_out << set_exceptions)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::ExtAttributeDef_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::ExtAttributeDef_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -13740,63 +13281,61 @@ void CORBA::_TAO_ExtValueDef_Remote_Proxy_Impl::ext_initializers (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -13847,8 +13386,8 @@ CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ExtValueDef::ExtValueDef (int collocated)
 {
@@ -13864,14 +13403,14 @@ CORBA::ExtValueDef::CORBA_ExtValueDef_setup_collocation (int collocated)
   else
     this->the_TAO_ExtValueDef_Proxy_Broker_ =
       ::CORBA::_TAO_ExtValueDef_Remote_Proxy_Broker::the_TAO_ExtValueDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_ValueDef_setup_collocation (collocated);
 }
 
 CORBA::ExtValueDef::~ExtValueDef (void)
 {}
 
-void 
+void
 CORBA::ExtValueDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtValueDef *tmp = ACE_static_cast (ExtValueDef *, _tao_void_pointer);
@@ -13888,7 +13427,7 @@ CORBA::ExtValueDef::_narrow (
     {
       return ExtValueDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -13897,17 +13436,17 @@ CORBA::ExtValueDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ExtValueDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ExtValueDef::_nil ();
         }
     }
-  
+
   return ExtValueDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ExtValueDef_ptr 
+CORBA::ExtValueDef_ptr
 CORBA::ExtValueDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -13917,18 +13456,18 @@ CORBA::ExtValueDef::_unchecked_narrow (
     {
       return ExtValueDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ExtValueDef_ptr default_proxy = ExtValueDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -13946,7 +13485,7 @@ CORBA::ExtValueDef::_unchecked_narrow (
               ExtValueDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -13959,10 +13498,10 @@ CORBA::ExtValueDef::_unchecked_narrow (
               ExtValueDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ExtValueDef_ptr,
@@ -13982,7 +13521,7 @@ CORBA::ExtValueDef::_duplicate (ExtValueDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -14037,7 +13576,7 @@ CORBA::ExtValueDef::_is_a (
 void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ExtValueDef)::_tao_class_id)
@@ -14126,12 +13665,12 @@ void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -14140,6 +13679,12 @@ const char* CORBA::ExtValueDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ExtValueDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -14150,10 +13695,10 @@ const char* CORBA::ExtValueDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_ExtValueDef_Proxy_Impl &proxy = 
+  _TAO_ExtValueDef_Proxy_Impl &proxy =
     this->the_TAO_ExtValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.ext_initializers (
       this
       ACE_ENV_ARG_PARAMETER
@@ -14171,10 +13716,10 @@ void CORBA::ExtValueDef::ext_initializers (
     CORBA::SystemException
   ))
 {
-  _TAO_ExtValueDef_Proxy_Impl &proxy = 
+  _TAO_ExtValueDef_Proxy_Impl &proxy =
     this->the_TAO_ExtValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.ext_initializers (
       this,
       ext_initializers
@@ -14189,50 +13734,50 @@ static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   58,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x7456616c), 
-  ACE_NTOHL (0x75654465), 
-  ACE_NTOHL (0x662f4578), 
-  ACE_NTOHL (0x7446756c), 
-  ACE_NTOHL (0x6c56616c), 
-  ACE_NTOHL (0x75654465), 
-  ACE_NTOHL (0x73637269), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x7456616c),
+  ACE_NTOHL (0x75654465),
+  ACE_NTOHL (0x662f4578),
+  ACE_NTOHL (0x7446756c),
+  ACE_NTOHL (0x6c56616c),
+  ACE_NTOHL (0x75654465),
+  ACE_NTOHL (0x73637269),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0
     24,
-  ACE_NTOHL (0x45787446), 
-  ACE_NTOHL (0x756c6c56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x45787446),
+  ACE_NTOHL (0x756c6c56),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = ExtFullValueDescription
   15, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4964), 
-    ACE_NTOHL (0x656e7469), 
-    ACE_NTOHL (0x66696572), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4964),
+    ACE_NTOHL (0x656e7469),
+    ACE_NTOHL (0x66696572),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
         11,
-    ACE_NTOHL (0x4964656e), 
-    ACE_NTOHL (0x74696669), 
+    ACE_NTOHL (0x4964656e),
+    ACE_NTOHL (0x74696669),
     ACE_NTOHL (0x65720000),  // name = Identifier
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   3,
@@ -14241,87 +13786,87 @@ static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49643a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49643a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
         13,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x0),  // name = RepositoryId
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   12,
-  ACE_NTOHL (0x69735f61), 
-  ACE_NTOHL (0x62737472), 
+  ACE_NTOHL (0x69735f61),
+  ACE_NTOHL (0x62737472),
   ACE_NTOHL (0x61637400),  // name = is_abstract
     CORBA::tk_boolean,
 
   10,
-  ACE_NTOHL (0x69735f63), 
-  ACE_NTOHL (0x7573746f), 
+  ACE_NTOHL (0x69735f63),
+  ACE_NTOHL (0x7573746f),
   ACE_NTOHL (0x6d000000),  // name = is_custom
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x64656669), 
-  ACE_NTOHL (0x6e65645f), 
+  ACE_NTOHL (0x64656669),
+  ACE_NTOHL (0x6e65645f),
   ACE_NTOHL (0x696e0000),  // name = defined_in
     0xffffffff, // indirection
   0xffffff74, // negative offset (-140)
   8,
-  ACE_NTOHL (0x76657273), 
+  ACE_NTOHL (0x76657273),
   ACE_NTOHL (0x696f6e00),  // name = version
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     34,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5665), 
-    ACE_NTOHL (0x7273696f), 
-    ACE_NTOHL (0x6e537065), 
-    ACE_NTOHL (0x633a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5665),
+    ACE_NTOHL (0x7273696f),
+    ACE_NTOHL (0x6e537065),
+    ACE_NTOHL (0x633a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
         12,
-    ACE_NTOHL (0x56657273), 
-    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x56657273),
+    ACE_NTOHL (0x696f6e53),
     ACE_NTOHL (0x70656300),  // name = VersionSpec
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   11,
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e730000),  // name = operations
     CORBA::tk_alias, // typecode kind for typedefs
   1340, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f70),
+    ACE_NTOHL (0x44657363),
+    ACE_NTOHL (0x72697074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
         17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x4f704465),
+    ACE_NTOHL (0x73637269),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
     ACE_NTOHL (0x0),  // name = OpDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     1260, // encapsulation length
@@ -14330,27 +13875,27 @@ static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
       1244, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
-        ACE_NTOHL (0x65726174), 
-        ACE_NTOHL (0x696f6e44), 
-        ACE_NTOHL (0x65736372), 
-        ACE_NTOHL (0x69707469), 
-        ACE_NTOHL (0x6f6e3a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f70),
+        ACE_NTOHL (0x65726174),
+        ACE_NTOHL (0x696f6e44),
+        ACE_NTOHL (0x65736372),
+        ACE_NTOHL (0x69707469),
+        ACE_NTOHL (0x6f6e3a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
                 21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x4f706572),
+        ACE_NTOHL (0x6174696f),
+        ACE_NTOHL (0x6e446573),
+        ACE_NTOHL (0x63726970),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = OperationDescription
         9, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffffdec, // negative offset (-532)
@@ -14359,73 +13904,73 @@ static const CORBA::Long _oc_CORBA_ExtValueDef_ExtFullValueDescription[] =
                 0xffffffff, // indirection
         0xfffffe30, // negative offset (-464)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffffe18, // negative offset (-488)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffffea0, // negative offset (-352)
         7,
-        ACE_NTOHL (0x72657375), 
+        ACE_NTOHL (0x72657375),
         ACE_NTOHL (0x6c740000),  // name = result
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         100, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
-          ACE_NTOHL (0x65726174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f70),
+          ACE_NTOHL (0x65726174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
           14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
+          ACE_NTOHL (0x4f706572),
+          ACE_NTOHL (0x6174696f),
+          ACE_NTOHL (0x6e4d6f64),
           ACE_NTOHL (0x65000000),  // name = OperationMode
           2, // member count
           10,
-          ACE_NTOHL (0x4f505f4e), 
-          ACE_NTOHL (0x4f524d41), 
+          ACE_NTOHL (0x4f505f4e),
+          ACE_NTOHL (0x4f524d41),
           ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
           10,
-          ACE_NTOHL (0x4f505f4f), 
-          ACE_NTOHL (0x4e455741), 
+          ACE_NTOHL (0x4f505f4f),
+          ACE_NTOHL (0x4e455741),
           ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
-          
+
         9,
-        ACE_NTOHL (0x636f6e74), 
-        ACE_NTOHL (0x65787473), 
+        ACE_NTOHL (0x636f6e74),
+        ACE_NTOHL (0x65787473),
         ACE_NTOHL (0x0),  // name = contexts
                 CORBA::tk_alias, // typecode kind for typedefs
         168, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
-          ACE_NTOHL (0x6e746578), 
-          ACE_NTOHL (0x74496453), 
-          ACE_NTOHL (0x65713a31), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f436f),
+          ACE_NTOHL (0x6e746578),
+          ACE_NTOHL (0x74496453),
+          ACE_NTOHL (0x65713a31),
           ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
                     13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
+          ACE_NTOHL (0x436f6e74),
+          ACE_NTOHL (0x65787449),
+          ACE_NTOHL (0x64536571),
           ACE_NTOHL (0x0),  // name = ContextIdSeq
                     CORBA::tk_sequence, // typecode kind
           96, // encapsulation length
@@ -14434,21 +13979,21 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             80, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f436f),
+              ACE_NTOHL (0x6e746578),
+              ACE_NTOHL (0x74496465),
+              ACE_NTOHL (0x6e746966),
+              ACE_NTOHL (0x6965723a),
               ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
                             18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
+              ACE_NTOHL (0x436f6e74),
+              ACE_NTOHL (0x65787449),
+              ACE_NTOHL (0x64656e74),
+              ACE_NTOHL (0x69666965),
               ACE_NTOHL (0x72000000),  // name = ContextIdentifier
                             0xffffffff, // indirection
               0xfffffc6c, // negative offset (-916)
@@ -14457,28 +14002,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x70617261), 
-        ACE_NTOHL (0x6d657465), 
+        ACE_NTOHL (0x70617261),
+        ACE_NTOHL (0x6d657465),
         ACE_NTOHL (0x72730000),  // name = parameters
                 CORBA::tk_alias, // typecode kind for typedefs
         428, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
-          ACE_NTOHL (0x72446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5061),
+          ACE_NTOHL (0x72446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x50617244),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           348, // encapsulation length
@@ -14487,117 +14032,117 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             332, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
-              ACE_NTOHL (0x72616d65), 
-              ACE_NTOHL (0x74657244), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5061),
+              ACE_NTOHL (0x72616d65),
+              ACE_NTOHL (0x74657244),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
                             21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x50617261),
+              ACE_NTOHL (0x6d657465),
+              ACE_NTOHL (0x72446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ParameterDescription
               4, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffffb8c, // negative offset (-1140)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
                             CORBA::tk_objref, // typecode kind
               52, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
-                ACE_NTOHL (0x4c547970), 
-                ACE_NTOHL (0x653a312e), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f4944),
+                ACE_NTOHL (0x4c547970),
+                ACE_NTOHL (0x653a312e),
                 ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
                                 8,
-                ACE_NTOHL (0x49444c54), 
+                ACE_NTOHL (0x49444c54),
                 ACE_NTOHL (0x79706500),  // name = IDLType
-                
+
               5,
-              ACE_NTOHL (0x6d6f6465), 
+              ACE_NTOHL (0x6d6f6465),
               ACE_NTOHL (0x0),  // name = mode
                             CORBA::tk_enum, // typecode kind
               116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
-                ACE_NTOHL (0x72616d65), 
-                ACE_NTOHL (0x7465724d), 
-                ACE_NTOHL (0x6f64653a), 
+                ACE_NTOHL (0x49444c3a),
+                ACE_NTOHL (0x6f6d672e),
+                ACE_NTOHL (0x6f72672f),
+                ACE_NTOHL (0x434f5242),
+                ACE_NTOHL (0x412f5061),
+                ACE_NTOHL (0x72616d65),
+                ACE_NTOHL (0x7465724d),
+                ACE_NTOHL (0x6f64653a),
                 ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
                 14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
+                ACE_NTOHL (0x50617261),
+                ACE_NTOHL (0x6d657465),
+                ACE_NTOHL (0x724d6f64),
                 ACE_NTOHL (0x65000000),  // name = ParameterMode
                 3, // member count
                 9,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x0),  // name = PARAM_IN
                 10,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f4f55), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f4f55),
                 ACE_NTOHL (0x54000000),  // name = PARAM_OUT
                 12,
-                ACE_NTOHL (0x50415241), 
-                ACE_NTOHL (0x4d5f494e), 
+                ACE_NTOHL (0x50415241),
+                ACE_NTOHL (0x4d5f494e),
                 ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-                
+
 
             0U,
 
 
         11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 CORBA::tk_alias, // typecode kind for typedefs
         276, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
-          ACE_NTOHL (0x63446573), 
-          ACE_NTOHL (0x63726970), 
-          ACE_NTOHL (0x74696f6e), 
-          ACE_NTOHL (0x5365713a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4578),
+          ACE_NTOHL (0x63446573),
+          ACE_NTOHL (0x63726970),
+          ACE_NTOHL (0x74696f6e),
+          ACE_NTOHL (0x5365713a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
                     18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
+          ACE_NTOHL (0x45786344),
+          ACE_NTOHL (0x65736372),
+          ACE_NTOHL (0x69707469),
+          ACE_NTOHL (0x6f6e5365),
           ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
                     CORBA::tk_sequence, // typecode kind
           196, // encapsulation length
@@ -14606,27 +14151,27 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             180, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
-              ACE_NTOHL (0x63657074), 
-              ACE_NTOHL (0x696f6e44), 
-              ACE_NTOHL (0x65736372), 
-              ACE_NTOHL (0x69707469), 
-              ACE_NTOHL (0x6f6e3a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f4578),
+              ACE_NTOHL (0x63657074),
+              ACE_NTOHL (0x696f6e44),
+              ACE_NTOHL (0x65736372),
+              ACE_NTOHL (0x69707469),
+              ACE_NTOHL (0x6f6e3a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
                             21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
+              ACE_NTOHL (0x45786365),
+              ACE_NTOHL (0x7074696f),
+              ACE_NTOHL (0x6e446573),
+              ACE_NTOHL (0x63726970),
+              ACE_NTOHL (0x74696f6e),
               ACE_NTOHL (0x0),  // name = ExceptionDescription
               5, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff9c8, // negative offset (-1592)
@@ -14635,18 +14180,18 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                             0xffffffff, // indirection
               0xfffffa0c, // negative offset (-1524)
               11,
-              ACE_NTOHL (0x64656669), 
-              ACE_NTOHL (0x6e65645f), 
+              ACE_NTOHL (0x64656669),
+              ACE_NTOHL (0x6e65645f),
               ACE_NTOHL (0x696e0000),  // name = defined_in
                             0xffffffff, // indirection
               0xfffff9f4, // negative offset (-1548)
               8,
-              ACE_NTOHL (0x76657273), 
+              ACE_NTOHL (0x76657273),
               ACE_NTOHL (0x696f6e00),  // name = version
                             0xffffffff, // indirection
               0xfffffa7c, // negative offset (-1412)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
@@ -14659,30 +14204,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   11,
-  ACE_NTOHL (0x61747472), 
-  ACE_NTOHL (0x69627574), 
+  ACE_NTOHL (0x61747472),
+  ACE_NTOHL (0x69627574),
   ACE_NTOHL (0x65730000),  // name = attributes
     CORBA::tk_alias, // typecode kind for typedefs
   468, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4578), 
-    ACE_NTOHL (0x74417474), 
-    ACE_NTOHL (0x72446573), 
-    ACE_NTOHL (0x63726970), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4578),
+    ACE_NTOHL (0x74417474),
+    ACE_NTOHL (0x72446573),
+    ACE_NTOHL (0x63726970),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0
         22,
-    ACE_NTOHL (0x45787441), 
-    ACE_NTOHL (0x74747244), 
-    ACE_NTOHL (0x65736372), 
-    ACE_NTOHL (0x69707469), 
-    ACE_NTOHL (0x6f6e5365), 
+    ACE_NTOHL (0x45787441),
+    ACE_NTOHL (0x74747244),
+    ACE_NTOHL (0x65736372),
+    ACE_NTOHL (0x69707469),
+    ACE_NTOHL (0x6f6e5365),
     ACE_NTOHL (0x71000000),  // name = ExtAttrDescriptionSeq
         CORBA::tk_sequence, // typecode kind
     380, // encapsulation length
@@ -14691,28 +14236,28 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       364, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         46,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x74417474), 
-        ACE_NTOHL (0x72696275), 
-        ACE_NTOHL (0x74654465), 
-        ACE_NTOHL (0x73637269), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e3a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x74417474),
+        ACE_NTOHL (0x72696275),
+        ACE_NTOHL (0x74654465),
+        ACE_NTOHL (0x73637269),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e3a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtAttributeDescription:1.0
                 24,
-        ACE_NTOHL (0x45787441), 
-        ACE_NTOHL (0x74747269), 
-        ACE_NTOHL (0x62757465), 
-        ACE_NTOHL (0x44657363), 
-        ACE_NTOHL (0x72697074), 
+        ACE_NTOHL (0x45787441),
+        ACE_NTOHL (0x74747269),
+        ACE_NTOHL (0x62757465),
+        ACE_NTOHL (0x44657363),
+        ACE_NTOHL (0x72697074),
         ACE_NTOHL (0x696f6e00),  // name = ExtAttributeDescription
         8, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff88c, // negative offset (-1908)
@@ -14721,64 +14266,64 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffff8d0, // negative offset (-1840)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffff8b8, // negative offset (-1864)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffff940, // negative offset (-1728)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         5,
-        ACE_NTOHL (0x6d6f6465), 
+        ACE_NTOHL (0x6d6f6465),
         ACE_NTOHL (0x0),  // name = mode
                 CORBA::tk_enum, // typecode kind
         104, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           36,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
-          ACE_NTOHL (0x74726962), 
-          ACE_NTOHL (0x7574654d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4174),
+          ACE_NTOHL (0x74726962),
+          ACE_NTOHL (0x7574654d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
           14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
+          ACE_NTOHL (0x41747472),
+          ACE_NTOHL (0x69627574),
+          ACE_NTOHL (0x654d6f64),
           ACE_NTOHL (0x65000000),  // name = AttributeMode
           2, // member count
           12,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f4e4f52), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f4e4f52),
           ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
           14,
-          ACE_NTOHL (0x41545452), 
-          ACE_NTOHL (0x5f524541), 
-          ACE_NTOHL (0x444f4e4c), 
+          ACE_NTOHL (0x41545452),
+          ACE_NTOHL (0x5f524541),
+          ACE_NTOHL (0x444f4e4c),
           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
-          
+
         15,
-        ACE_NTOHL (0x6765745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x6765745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = get_exceptions
                 0xffffffff, // indirection
         0xfffffd18, // negative offset (-744)
         15,
-        ACE_NTOHL (0x7075745f), 
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x7075745f),
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = put_exceptions
                 0xffffffff, // indirection
         0xfffffcfc, // negative offset (-772)
@@ -14787,26 +14332,26 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   8,
-  ACE_NTOHL (0x6d656d62), 
+  ACE_NTOHL (0x6d656d62),
   ACE_NTOHL (0x65727300),  // name = members
     CORBA::tk_alias, // typecode kind for typedefs
   360, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
-    ACE_NTOHL (0x6c75654d), 
-    ACE_NTOHL (0x656d6265), 
-    ACE_NTOHL (0x72536571), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5661),
+    ACE_NTOHL (0x6c75654d),
+    ACE_NTOHL (0x656d6265),
+    ACE_NTOHL (0x72536571),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
         15,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x654d656d), 
-    ACE_NTOHL (0x62657253), 
+    ACE_NTOHL (0x56616c75),
+    ACE_NTOHL (0x654d656d),
+    ACE_NTOHL (0x62657253),
     ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
         CORBA::tk_sequence, // typecode kind
     284, // encapsulation length
@@ -14815,22 +14360,22 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       268, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5661), 
-        ACE_NTOHL (0x6c75654d), 
-        ACE_NTOHL (0x656d6265), 
-        ACE_NTOHL (0x723a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5661),
+        ACE_NTOHL (0x6c75654d),
+        ACE_NTOHL (0x656d6265),
+        ACE_NTOHL (0x723a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
                 12,
-        ACE_NTOHL (0x56616c75), 
-        ACE_NTOHL (0x654d656d), 
+        ACE_NTOHL (0x56616c75),
+        ACE_NTOHL (0x654d656d),
         ACE_NTOHL (0x62657200),  // name = ValueMember
         7, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff6c8, // negative offset (-2360)
@@ -14839,46 +14384,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
                 0xffffffff, // indirection
         0xfffff70c, // negative offset (-2292)
         11,
-        ACE_NTOHL (0x64656669), 
-        ACE_NTOHL (0x6e65645f), 
+        ACE_NTOHL (0x64656669),
+        ACE_NTOHL (0x6e65645f),
         ACE_NTOHL (0x696e0000),  // name = defined_in
                 0xffffffff, // indirection
         0xfffff6f4, // negative offset (-2316)
         8,
-        ACE_NTOHL (0x76657273), 
+        ACE_NTOHL (0x76657273),
         ACE_NTOHL (0x696f6e00),  // name = version
                 0xffffffff, // indirection
         0xfffff77c, // negative offset (-2180)
         5,
-        ACE_NTOHL (0x74797065), 
+        ACE_NTOHL (0x74797065),
         ACE_NTOHL (0x0),  // name = type
                 CORBA::tk_TypeCode,
 
         9,
-        ACE_NTOHL (0x74797065), 
-        ACE_NTOHL (0x5f646566), 
+        ACE_NTOHL (0x74797065),
+        ACE_NTOHL (0x5f646566),
         ACE_NTOHL (0x0),  // name = type_def
                 0xffffffff, // indirection
         0xfffffafc, // negative offset (-1284)
         7,
-        ACE_NTOHL (0x61636365), 
+        ACE_NTOHL (0x61636365),
         ACE_NTOHL (0x73730000),  // name = access
                 CORBA::tk_alias, // typecode kind for typedefs
         64, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5669), 
-          ACE_NTOHL (0x73696269), 
-          ACE_NTOHL (0x6c697479), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5669),
+          ACE_NTOHL (0x73696269),
+          ACE_NTOHL (0x6c697479),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
                     11,
-          ACE_NTOHL (0x56697369), 
-          ACE_NTOHL (0x62696c69), 
+          ACE_NTOHL (0x56697369),
+          ACE_NTOHL (0x62696c69),
           ACE_NTOHL (0x74790000),  // name = Visibility
                     CORBA::tk_short,
 
@@ -14888,29 +14433,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   13,
-  ACE_NTOHL (0x696e6974), 
-  ACE_NTOHL (0x69616c69), 
-  ACE_NTOHL (0x7a657273), 
+  ACE_NTOHL (0x696e6974),
+  ACE_NTOHL (0x69616c69),
+  ACE_NTOHL (0x7a657273),
   ACE_NTOHL (0x0),  // name = initializers
     CORBA::tk_alias, // typecode kind for typedefs
   452, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4578), 
-    ACE_NTOHL (0x74496e69), 
-    ACE_NTOHL (0x7469616c), 
-    ACE_NTOHL (0x697a6572), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4578),
+    ACE_NTOHL (0x74496e69),
+    ACE_NTOHL (0x7469616c),
+    ACE_NTOHL (0x697a6572),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExtInitializerSeq:1.0
         18,
-    ACE_NTOHL (0x45787449), 
-    ACE_NTOHL (0x6e697469), 
-    ACE_NTOHL (0x616c697a), 
-    ACE_NTOHL (0x65725365), 
+    ACE_NTOHL (0x45787449),
+    ACE_NTOHL (0x6e697469),
+    ACE_NTOHL (0x616c697a),
+    ACE_NTOHL (0x65725365),
     ACE_NTOHL (0x71000000),  // name = ExtInitializerSeq
         CORBA::tk_sequence, // typecode kind
     372, // encapsulation length
@@ -14919,43 +14464,43 @@ TAO_ENCAP_BYTE_ORDER, // byte order
       356, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         37,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4578), 
-        ACE_NTOHL (0x74496e69), 
-        ACE_NTOHL (0x7469616c), 
-        ACE_NTOHL (0x697a6572), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4578),
+        ACE_NTOHL (0x74496e69),
+        ACE_NTOHL (0x7469616c),
+        ACE_NTOHL (0x697a6572),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ExtInitializer:1.0
                 15,
-        ACE_NTOHL (0x45787449), 
-        ACE_NTOHL (0x6e697469), 
-        ACE_NTOHL (0x616c697a), 
+        ACE_NTOHL (0x45787449),
+        ACE_NTOHL (0x6e697469),
+        ACE_NTOHL (0x616c697a),
         ACE_NTOHL (0x65720000),  // name = ExtInitializer
         3, // member count
                 8,
-        ACE_NTOHL (0x6d656d62), 
+        ACE_NTOHL (0x6d656d62),
         ACE_NTOHL (0x65727300),  // name = members
                 CORBA::tk_alias, // typecode kind for typedefs
         220, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           38,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5374), 
-          ACE_NTOHL (0x72756374), 
-          ACE_NTOHL (0x4d656d62), 
-          ACE_NTOHL (0x65725365), 
-          ACE_NTOHL (0x713a312e), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5374),
+          ACE_NTOHL (0x72756374),
+          ACE_NTOHL (0x4d656d62),
+          ACE_NTOHL (0x65725365),
+          ACE_NTOHL (0x713a312e),
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
                     16,
-          ACE_NTOHL (0x53747275), 
-          ACE_NTOHL (0x63744d65), 
-          ACE_NTOHL (0x6d626572), 
+          ACE_NTOHL (0x53747275),
+          ACE_NTOHL (0x63744d65),
+          ACE_NTOHL (0x6d626572),
           ACE_NTOHL (0x53657100),  // name = StructMemberSeq
                     CORBA::tk_sequence, // typecode kind
           144, // encapsulation length
@@ -14964,34 +14509,34 @@ TAO_ENCAP_BYTE_ORDER, // byte order
             128, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               35,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5374), 
-              ACE_NTOHL (0x72756374), 
-              ACE_NTOHL (0x4d656d62), 
-              ACE_NTOHL (0x65723a31), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x6f6d672e),
+              ACE_NTOHL (0x6f72672f),
+              ACE_NTOHL (0x434f5242),
+              ACE_NTOHL (0x412f5374),
+              ACE_NTOHL (0x72756374),
+              ACE_NTOHL (0x4d656d62),
+              ACE_NTOHL (0x65723a31),
               ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
                             13,
-              ACE_NTOHL (0x53747275), 
-              ACE_NTOHL (0x63744d65), 
-              ACE_NTOHL (0x6d626572), 
+              ACE_NTOHL (0x53747275),
+              ACE_NTOHL (0x63744d65),
+              ACE_NTOHL (0x6d626572),
               ACE_NTOHL (0x0),  // name = StructMember
               3, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
                             0xffffffff, // indirection
               0xfffff488, // negative offset (-2936)
               5,
-              ACE_NTOHL (0x74797065), 
+              ACE_NTOHL (0x74797065),
               ACE_NTOHL (0x0),  // name = type
                             CORBA::tk_TypeCode,
 
               9,
-              ACE_NTOHL (0x74797065), 
-              ACE_NTOHL (0x5f646566), 
+              ACE_NTOHL (0x74797065),
+              ACE_NTOHL (0x5f646566),
               ACE_NTOHL (0x0),  // name = type_def
                             0xffffffff, // indirection
               0xfffff8f8, // negative offset (-1800)
@@ -15000,13 +14545,13 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
         11,
-        ACE_NTOHL (0x65786365), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x65786365),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = exceptions
                 0xffffffff, // indirection
         0xfffff9b4, // negative offset (-1612)
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
                 0xffffffff, // indirection
         0xfffff430, // negative offset (-3024)
@@ -15015,30 +14560,30 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   21,
-  ACE_NTOHL (0x73757070), 
-  ACE_NTOHL (0x6f727465), 
-  ACE_NTOHL (0x645f696e), 
-  ACE_NTOHL (0x74657266), 
-  ACE_NTOHL (0x61636573), 
+  ACE_NTOHL (0x73757070),
+  ACE_NTOHL (0x6f727465),
+  ACE_NTOHL (0x645f696e),
+  ACE_NTOHL (0x74657266),
+  ACE_NTOHL (0x61636573),
   ACE_NTOHL (0x0),  // name = supported_interfaces
     CORBA::tk_alias, // typecode kind for typedefs
   92, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x49645365), 
-    ACE_NTOHL (0x713a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x49645365),
+    ACE_NTOHL (0x713a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
         16,
-    ACE_NTOHL (0x5265706f), 
-    ACE_NTOHL (0x7369746f), 
-    ACE_NTOHL (0x72794964), 
+    ACE_NTOHL (0x5265706f),
+    ACE_NTOHL (0x7369746f),
+    ACE_NTOHL (0x72794964),
     ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
@@ -15049,29 +14594,29 @@ TAO_ENCAP_BYTE_ORDER, // byte order
 
 
   21,
-  ACE_NTOHL (0x61627374), 
-  ACE_NTOHL (0x72616374), 
-  ACE_NTOHL (0x5f626173), 
-  ACE_NTOHL (0x655f7661), 
-  ACE_NTOHL (0x6c756573), 
+  ACE_NTOHL (0x61627374),
+  ACE_NTOHL (0x72616374),
+  ACE_NTOHL (0x5f626173),
+  ACE_NTOHL (0x655f7661),
+  ACE_NTOHL (0x6c756573),
   ACE_NTOHL (0x0),  // name = abstract_base_values
     0xffffffff, // indirection
   0xffffff7c, // negative offset (-132)
   15,
-  ACE_NTOHL (0x69735f74), 
-  ACE_NTOHL (0x72756e63), 
-  ACE_NTOHL (0x61746162), 
+  ACE_NTOHL (0x69735f74),
+  ACE_NTOHL (0x72756e63),
+  ACE_NTOHL (0x61746162),
   ACE_NTOHL (0x6c650000),  // name = is_truncatable
     CORBA::tk_boolean,
 
   11,
-  ACE_NTOHL (0x62617365), 
-  ACE_NTOHL (0x5f76616c), 
+  ACE_NTOHL (0x62617365),
+  ACE_NTOHL (0x5f76616c),
   ACE_NTOHL (0x75650000),  // name = base_value
     0xffffffff, // indirection
   0xfffff3ac, // negative offset (-3156)
   5,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x0),  // name = type
     CORBA::tk_TypeCode,
 
@@ -15088,7 +14633,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ExtValueDef_ExtFullValueDescription (
 ::CORBA::TypeCode_ptr CORBA::ExtValueDef::_tc_ExtFullValueDescription =
   &_tc_TAO_tc_CORBA_ExtValueDef_ExtFullValueDescription;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (void *_tao_void_pointer)
@@ -15098,6 +14643,37 @@ void CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (void *_ta
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ExtFullValueDescription
+    >;
+
+template class
+  TAO_Out_T<
+      ExtFullValueDescription,
+      ExtFullValueDescription_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ExtFullValueDescription \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ExtFullValueDescription, \
+      ExtFullValueDescription_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
 ::CORBA::ExtValueDef::ExtFullValueDescription * CORBA::ExtValueDef::describe_ext_value (
@@ -15107,10 +14683,10 @@ void CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (void *_ta
     CORBA::SystemException
   ))
 {
-  _TAO_ExtValueDef_Proxy_Impl &proxy = 
+  _TAO_ExtValueDef_Proxy_Impl &proxy =
     this->the_TAO_ExtValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_ext_value (
       this
       ACE_ENV_ARG_PARAMETER
@@ -15134,10 +14710,10 @@ void CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (void *_ta
     CORBA::SystemException
   ))
 {
-  _TAO_ExtValueDef_Proxy_Impl &proxy = 
+  _TAO_ExtValueDef_Proxy_Impl &proxy =
     this->the_TAO_ExtValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_ext_attribute (
       this,
       id,
@@ -15158,18 +14734,18 @@ static const CORBA::Long _oc_CORBA_ExtValueDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4578), 
-  ACE_NTOHL (0x7456616c), 
-  ACE_NTOHL (0x75654465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4578),
+  ACE_NTOHL (0x7456616c),
+  ACE_NTOHL (0x75654465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ExtValueDef:1.0
     12,
-  ACE_NTOHL (0x45787456), 
-  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x45787456),
+  ACE_NTOHL (0x616c7565),
   ACE_NTOHL (0x44656600),  // name = ExtValueDef
   };
 
@@ -15196,7 +14772,7 @@ TAO_NAMESPACE_END
 int CORBA::ValueBoxDef::_tao_class_id = 0;
 
 CORBA::ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_duplicate (
+CORBA::tao_ValueBoxDef_life::tao_duplicate (
     CORBA::ValueBoxDef_ptr p
   )
 {
@@ -15204,7 +14780,7 @@ tao_CORBA_ValueBoxDef_duplicate (
 }
 
 void
-tao_CORBA_ValueBoxDef_release (
+CORBA::tao_ValueBoxDef_life::tao_release (
     CORBA::ValueBoxDef_ptr p
   )
 {
@@ -15212,228 +14788,64 @@ tao_CORBA_ValueBoxDef_release (
 }
 
 CORBA::ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_nil (
+CORBA::tao_ValueBoxDef_life::tao_nil (
     void
   )
 {
   return CORBA::ValueBoxDef::_nil ();
 }
 
-CORBA::ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::ValueBoxDef::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_ValueBoxDef_upcast (
-    void *src
-  )
-{
-  CORBA::ValueBoxDef **tmp =
-    ACE_static_cast (CORBA::ValueBoxDef **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_ValueBoxDef_marshal (
+CORBA::tao_ValueBoxDef_life::tao_marshal (
     CORBA::ValueBoxDef_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::ValueBoxDef_var
-// *************************************************************
-
-CORBA::ValueBoxDef_var::ValueBoxDef_var (void)
-  : ptr_ (ValueBoxDef::_nil ())
-{}
-
-::CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::ValueBoxDef_var::ValueBoxDef_var (const ::CORBA::ValueBoxDef_var &p)
-  : TAO_Base_var (),
-    ptr_ (ValueBoxDef::_duplicate (p.ptr ()))
-{}
-
-CORBA::ValueBoxDef_var::~ValueBoxDef_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::ValueBoxDef_var &
-CORBA::ValueBoxDef_var::operator= (ValueBoxDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ValueBoxDef_var &
-CORBA::ValueBoxDef_var::operator= (const ::CORBA::ValueBoxDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::ValueBoxDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::ValueBoxDef_var::operator const ::CORBA::ValueBoxDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::ValueBoxDef_var::operator ::CORBA::ValueBoxDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueBoxDef_ptr &
-CORBA::ValueBoxDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueBoxDef_ptr &
-CORBA::ValueBoxDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ValueBoxDef::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::ValueBoxDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::ValueBoxDef::_nil ();
-  return val;
-}
-
-::CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_var::tao_duplicate (ValueBoxDef_ptr p)
-{
-  return ::CORBA::ValueBoxDef::_duplicate (p);
-}
-
-void
-CORBA::ValueBoxDef_var::tao_release (ValueBoxDef_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_var::tao_nil (void)
-{
-  return ::CORBA::ValueBoxDef::_nil ();
+  return p->marshal (cdr);
 }
 
-::CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_var::tao_narrow (
+CORBA::ValueBoxDef_ptr
+CORBA::tao_ValueBoxDef_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::ValueBoxDef::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueBoxDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::ValueBoxDef_var::tao_upcast (void *src)
+CORBA::tao_ValueBoxDef_cast::tao_upcast (
+    void *src
+  )
 {
-  ValueBoxDef **tmp =
-    ACE_static_cast (ValueBoxDef **, src);
+  CORBA::ValueBoxDef **tmp =
+    ACE_static_cast (CORBA::ValueBoxDef **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::ValueBoxDef_out
-// *************************************************************
-
-CORBA::ValueBoxDef_out::ValueBoxDef_out (ValueBoxDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::ValueBoxDef::_nil ();
-}
-
-CORBA::ValueBoxDef_out::ValueBoxDef_out (ValueBoxDef_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::ValueBoxDef::_nil ();
-}
-
-CORBA::ValueBoxDef_out::ValueBoxDef_out (const ::CORBA::ValueBoxDef_out &p)
-  : ptr_ (ACE_const_cast (ValueBoxDef_out &, p).ptr_)
-{}
-
-::CORBA::ValueBoxDef_out &
-CORBA::ValueBoxDef_out::operator= (const ::CORBA::ValueBoxDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (ValueBoxDef_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::ValueBoxDef_out &
-CORBA::ValueBoxDef_out::operator= (const ::CORBA::ValueBoxDef_var &p)
-{
-  this->ptr_ = ::CORBA::ValueBoxDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::ValueBoxDef_out &
-CORBA::ValueBoxDef_out::operator= (ValueBoxDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::ValueBoxDef_out::operator ::CORBA::ValueBoxDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueBoxDef_ptr &
-CORBA::ValueBoxDef_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::ValueBoxDef,
+        CORBA::tao_ValueBoxDef_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::ValueBoxDef,
+        CORBA::tao_ValueBoxDef_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::ValueBoxDef, \
+        CORBA::tao_ValueBoxDef_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::ValueBoxDef, \
+        CORBA::tao_ValueBoxDef_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -15453,29 +14865,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::IDLType_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get &);
-    
+
     ::CORBA::IDLType_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -15488,7 +14900,7 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -15500,11 +14912,11 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15513,17 +14925,17 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (::CORBA::IDLType_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -15541,10 +14953,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -15553,15 +14965,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set &);
     CORBA::IDLType_ptr original_type_def_;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
-  
+
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       original_type_def_ (original_type_def)
@@ -15575,15 +14987,15 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (ACE_EN
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<=  this->original_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -15595,11 +15007,11 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (ACE_E
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -15608,7 +15020,7 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_S
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -15620,7 +15032,7 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_S
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
@@ -15644,12 +15056,12 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
 {
   CORBA::IDLType_var _tao_retval (CORBA::IDLType::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_original_type_def",
@@ -15657,22 +15069,22 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get _tao_ri (
           &_tao_call,
@@ -15680,14 +15092,14 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -15695,78 +15107,85 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::IDLType_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::IDLType_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -15776,59 +15195,57 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (v
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -15844,12 +15261,12 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_original_type_def",
@@ -15857,22 +15274,22 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set _tao_ri (
           &_tao_call,
@@ -15881,14 +15298,14 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -15896,70 +15313,76 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << original_type_def)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << original_type_def)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -15969,61 +15392,59 @@ void CORBA::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -16074,8 +15495,8 @@ CORBA::_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:234
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::ValueBoxDef::ValueBoxDef (int collocated)
 {
@@ -16091,14 +15512,14 @@ CORBA::ValueBoxDef::CORBA_ValueBoxDef_setup_collocation (int collocated)
   else
     this->the_TAO_ValueBoxDef_Proxy_Broker_ =
       ::CORBA::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
 CORBA::ValueBoxDef::~ValueBoxDef (void)
 {}
 
-void 
+void
 CORBA::ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ValueBoxDef *tmp = ACE_static_cast (ValueBoxDef *, _tao_void_pointer);
@@ -16115,7 +15536,7 @@ CORBA::ValueBoxDef::_narrow (
     {
       return ValueBoxDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -16124,17 +15545,17 @@ CORBA::ValueBoxDef::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ValueBoxDef::_nil ());
-      
+
       if (is_a == 0)
         {
           return ValueBoxDef::_nil ();
         }
     }
-  
+
   return ValueBoxDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::ValueBoxDef_ptr 
+CORBA::ValueBoxDef_ptr
 CORBA::ValueBoxDef::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16144,18 +15565,18 @@ CORBA::ValueBoxDef::_unchecked_narrow (
     {
       return ValueBoxDef::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ValueBoxDef_ptr default_proxy = ValueBoxDef::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -16173,7 +15594,7 @@ CORBA::ValueBoxDef::_unchecked_narrow (
               ValueBoxDef::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -16186,10 +15607,10 @@ CORBA::ValueBoxDef::_unchecked_narrow (
               ValueBoxDef::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ValueBoxDef_ptr,
@@ -16209,7 +15630,7 @@ CORBA::ValueBoxDef::_duplicate (ValueBoxDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -16260,7 +15681,7 @@ CORBA::ValueBoxDef::_is_a (
 void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, ValueBoxDef)::_tao_class_id)
@@ -16335,12 +15756,12 @@ void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -16349,6 +15770,12 @@ const char* CORBA::ValueBoxDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
 }
 
+CORBA::Boolean
+CORBA::ValueBoxDef::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -16359,10 +15786,10 @@ const char* CORBA::ValueBoxDef::_interface_repository_id (void) const
     CORBA::SystemException
   ))
 {
-  _TAO_ValueBoxDef_Proxy_Impl &proxy = 
+  _TAO_ValueBoxDef_Proxy_Impl &proxy =
     this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.original_type_def (
       this
       ACE_ENV_ARG_PARAMETER
@@ -16380,10 +15807,10 @@ void CORBA::ValueBoxDef::original_type_def (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueBoxDef_Proxy_Impl &proxy = 
+  _TAO_ValueBoxDef_Proxy_Impl &proxy =
     this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.original_type_def (
       this,
       original_type_def
@@ -16398,18 +15825,18 @@ static const CORBA::Long _oc_CORBA_ValueBoxDef[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5661), 
-  ACE_NTOHL (0x6c756542), 
-  ACE_NTOHL (0x6f784465), 
-  ACE_NTOHL (0x663a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5661),
+  ACE_NTOHL (0x6c756542),
+  ACE_NTOHL (0x6f784465),
+  ACE_NTOHL (0x663a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueBoxDef:1.0
     12,
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65426f78), 
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65426f78),
   ACE_NTOHL (0x44656600),  // name = ValueBoxDef
   };
 
@@ -16484,7 +15911,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::FixedDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -16549,7 +15976,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ValueMember>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -16607,6 +16034,13 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
 
@@ -16715,7 +16149,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ValueDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -16780,7 +16214,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -16899,7 +16333,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<CORBA::ExtValueDef>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -17019,7 +16453,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -17038,12 +16472,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::FixedDef::_unchecked_narrow (
@@ -17062,7 +16496,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -17070,20 +16504,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -17093,7 +16527,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -17103,32 +16537,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -17147,12 +16581,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ValueMemberDef::_unchecked_narrow (
@@ -17171,7 +16605,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -17190,12 +16624,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ValueDef::_unchecked_narrow (
@@ -17214,7 +16648,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -17233,12 +16667,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ExtValueDef::_unchecked_narrow (
@@ -17257,7 +16691,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -17276,12 +16710,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::ValueBoxDef::_unchecked_narrow (
@@ -17298,5 +16732,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
-
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index 953a8b658cc..f30d5590da9 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -27,17 +27,13 @@
 
 #include "ace/pre.h"
 
-#include "tao/corba.h"
+#include "IFR_BasicC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-#include "ifr_client_export.h"
-
-#include "IFR_BasicC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -68,90 +64,53 @@ TAO_NAMESPACE  CORBA
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_FIXEDDEF___PTR_CH_)
-#define _CORBA_FIXEDDEF___PTR_CH_
+#if !defined (_CORBA_FIXEDDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_FIXEDDEF__ODDS_N_ENDS_CH_
   
   class FixedDef;
   typedef FixedDef *FixedDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF___VAR_CH_)
-#define _CORBA_FIXEDDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export FixedDef_var : public TAO_Base_var
+  struct tao_FixedDef_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        FixedDef,
+        tao_FixedDef_life
+      >
+    FixedDef_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        FixedDef,
+        tao_FixedDef_life
+      >
+    FixedDef_out;
+  
+  struct TAO_IFR_Client_Export tao_FixedDef_life
   {
-  public:
-    FixedDef_var (void); // default constructor
-    FixedDef_var (FixedDef_ptr p) : ptr_ (p) {} 
-    FixedDef_var (const FixedDef_var &); // copy constructor
-    ~FixedDef_var (void); // destructor
-    
-    FixedDef_var &operator= (FixedDef_ptr);
-    FixedDef_var &operator= (const FixedDef_var &);
-    FixedDef_ptr operator-> (void) const;
-    
-    operator const FixedDef_ptr &() const;
-    operator FixedDef_ptr &();
-    // in, inout, out, _retn 
-    FixedDef_ptr in (void) const;
-    FixedDef_ptr &inout (void);
-    FixedDef_ptr &out (void);
-    FixedDef_ptr _retn (void);
-    FixedDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static FixedDef_ptr tao_duplicate (FixedDef_ptr);
     static void tao_release (FixedDef_ptr);
     static FixedDef_ptr tao_nil (void);
-    static FixedDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        FixedDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    FixedDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    FixedDef_var (const TAO_Base_var &rhs);
-    FixedDef_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF___OUT_CH_)
-#define _CORBA_FIXEDDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_IFR_Client_Export FixedDef_out
+  struct TAO_IFR_Client_Export tao_FixedDef_cast
   {
-  public:
-    FixedDef_out (FixedDef_ptr &);
-    FixedDef_out (FixedDef_var &);
-    FixedDef_out (const FixedDef_out &);
-    FixedDef_out &operator= (const FixedDef_out &);
-    FixedDef_out &operator= (const FixedDef_var &);
-    FixedDef_out &operator= (FixedDef_ptr);
-    operator FixedDef_ptr &();
-    FixedDef_ptr &ptr (void);
-    FixedDef_ptr operator-> (void);
-  
-  private:
-    FixedDef_ptr &ptr_;
+    static FixedDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_FIXEDDEF_CH_)
 #define _CORBA_FIXEDDEF_CH_
@@ -232,7 +191,7 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -483,9 +442,25 @@ TAO_NAMESPACE  CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_FixedDef;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  struct ValueMember;
   
-  class ValueMember_var;
+  typedef
+    TAO_Var_Var_T<
+        ValueMember
+      >
+    ValueMember_var;
+  
+  typedef
+    TAO_Out_T<
+        ValueMember,
+        ValueMember_var
+      >
+    ValueMember_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_IFR_Client_Export ValueMember
   {
@@ -502,234 +477,52 @@ TAO_NAMESPACE  CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export ValueMember_var
-  {
-  public:
-    ValueMember_var (void);
-    ValueMember_var (ValueMember *);
-    ValueMember_var (const ValueMember_var &);
-    ~ValueMember_var (void);
-    
-    ValueMember_var &operator= (ValueMember *);
-    ValueMember_var &operator= (const ValueMember_var &);
-    ValueMember *operator-> (void);
-    const ValueMember *operator-> (void) const;
-    
-    operator const ValueMember &() const;
-    operator ValueMember &();
-    operator ValueMember &() const;
-    
-    // Variable-size types only.
-    operator ValueMember *&();
-    
-    // in, inout, out, _retn 
-    const ValueMember &in (void) const;
-    ValueMember &inout (void);
-    ValueMember *&out (void);
-    ValueMember *_retn (void);
-    ValueMember *ptr (void) const;
-  
-  private:
-    ValueMember *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export ValueMember_out
-  {
-  public:
-    ValueMember_out (ValueMember *&);
-    ValueMember_out (ValueMember_var &);
-    ValueMember_out (const ValueMember_out &);
-    ValueMember_out &operator= (const ValueMember_out &);
-    ValueMember_out &operator= (ValueMember *);
-    operator ValueMember *&();
-    ValueMember *&ptr (void);
-    ValueMember *operator-> (void);
-    
-  private:
-    ValueMember *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ValueMember_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueMember;
   
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CH_
-  
-  class TAO_IFR_Client_Export _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ValueMember *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (
-        const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void);
-    
-    // = Accessors.
-    ValueMember &operator[] (CORBA::ULong i);
-    const ValueMember &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ValueMember *allocbuf (CORBA::ULong size);
-    static void freebuf (ValueMember *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ValueMember *get_buffer (CORBA::Boolean orphan = 0);
-    const ValueMember *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ValueMember *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEMEMBERSEQ_CH_)
-#define _CORBA_VALUEMEMBERSEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
   
   class ValueMemberSeq;
-  class ValueMemberSeq_var;
-  
-  // *************************************************************
-  // CORBA::ValueMemberSeq
-  // *************************************************************
   
-  class TAO_IFR_Client_Export ValueMemberSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ValueMember>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_VarSeq_Var_T<
+        ValueMemberSeq,
+        ValueMember
+      >
+    ValueMemberSeq_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ValueMemberSeq,
+        ValueMemberSeq_var,
+        ValueMember
+      >
+    ValueMemberSeq_out;
+  
+  class TAO_IFR_Client_Export ValueMemberSeq
+    : public
+        TAO_Unbounded_Sequence<
+            ValueMember
+          >
   {
   public:
     ValueMemberSeq (void);
     ValueMemberSeq (CORBA::ULong max);
     ValueMemberSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ValueMember *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ValueMember* buffer, 
         CORBA::Boolean release = 0
       );
     ValueMemberSeq (const ValueMemberSeq &);
     ~ValueMemberSeq (void);
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
     
     typedef ValueMemberSeq_var _var_type;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERSEQ___VAR_CH_)
-#define _CORBA_VALUEMEMBERSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ValueMemberSeq_var
-  // *************************************************************
-  
-  class TAO_IFR_Client_Export ValueMemberSeq_var
-  {
-  public:
-    ValueMemberSeq_var (void);
-    ValueMemberSeq_var (ValueMemberSeq *);
-    ValueMemberSeq_var (const ValueMemberSeq_var &);
-    ~ValueMemberSeq_var (void);
-    
-    ValueMemberSeq_var &operator= (ValueMemberSeq *);
-    ValueMemberSeq_var &operator= (const ValueMemberSeq_var &);
-    ValueMemberSeq *operator-> (void);
-    const ValueMemberSeq *operator-> (void) const;
-    
-    operator const ValueMemberSeq &() const;
-    operator ValueMemberSeq &();
-    operator ValueMemberSeq &() const;
-    
-    // Variable-size base types only.
-    operator ValueMemberSeq *&();
-    
-    ValueMember & operator[] (CORBA::ULong index);
-    const ValueMember & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ValueMemberSeq &in (void) const;
-    ValueMemberSeq &inout (void);
-    ValueMemberSeq *&out (void);
-    ValueMemberSeq *_retn (void);
-    ValueMemberSeq *ptr (void) const;
-  
-  private:
-    ValueMemberSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERSEQ___OUT_CH_)
-#define _CORBA_VALUEMEMBERSEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_IFR_Client_Export ValueMemberSeq_out
-  {
-  public:
-    ValueMemberSeq_out (ValueMemberSeq *&);
-    ValueMemberSeq_out (ValueMemberSeq_var &);
-    ValueMemberSeq_out (const ValueMemberSeq_out &);
-    ValueMemberSeq_out &operator= (const ValueMemberSeq_out &);
-    ValueMemberSeq_out &operator= (ValueMemberSeq *);
-    operator ValueMemberSeq *&();
-    ValueMemberSeq *&ptr (void);
-    ValueMemberSeq *operator-> (void);
-    ValueMember & operator[] (CORBA::ULong index);
-  
-  private:
-    ValueMemberSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ValueMemberSeq_var &);
-  };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -737,90 +530,53 @@ TAO_NAMESPACE  CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueMemberSeq;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_VALUEMEMBERDEF___PTR_CH_)
-#define _CORBA_VALUEMEMBERDEF___PTR_CH_
+#if !defined (_CORBA_VALUEMEMBERDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_VALUEMEMBERDEF__ODDS_N_ENDS_CH_
   
   class ValueMemberDef;
   typedef ValueMemberDef *ValueMemberDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERDEF___VAR_CH_)
-#define _CORBA_VALUEMEMBERDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ValueMemberDef_var : public TAO_Base_var
+  struct tao_ValueMemberDef_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ValueMemberDef,
+        tao_ValueMemberDef_life
+      >
+    ValueMemberDef_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ValueMemberDef,
+        tao_ValueMemberDef_life
+      >
+    ValueMemberDef_out;
+  
+  struct TAO_IFR_Client_Export tao_ValueMemberDef_life
   {
-  public:
-    ValueMemberDef_var (void); // default constructor
-    ValueMemberDef_var (ValueMemberDef_ptr p) : ptr_ (p) {} 
-    ValueMemberDef_var (const ValueMemberDef_var &); // copy constructor
-    ~ValueMemberDef_var (void); // destructor
-    
-    ValueMemberDef_var &operator= (ValueMemberDef_ptr);
-    ValueMemberDef_var &operator= (const ValueMemberDef_var &);
-    ValueMemberDef_ptr operator-> (void) const;
-    
-    operator const ValueMemberDef_ptr &() const;
-    operator ValueMemberDef_ptr &();
-    // in, inout, out, _retn 
-    ValueMemberDef_ptr in (void) const;
-    ValueMemberDef_ptr &inout (void);
-    ValueMemberDef_ptr &out (void);
-    ValueMemberDef_ptr _retn (void);
-    ValueMemberDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ValueMemberDef_ptr tao_duplicate (ValueMemberDef_ptr);
     static void tao_release (ValueMemberDef_ptr);
     static ValueMemberDef_ptr tao_nil (void);
-    static ValueMemberDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ValueMemberDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ValueMemberDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ValueMemberDef_var (const TAO_Base_var &rhs);
-    ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERDEF___OUT_CH_)
-#define _CORBA_VALUEMEMBERDEF___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ValueMemberDef_out
+  struct TAO_IFR_Client_Export tao_ValueMemberDef_cast
   {
-  public:
-    ValueMemberDef_out (ValueMemberDef_ptr &);
-    ValueMemberDef_out (ValueMemberDef_var &);
-    ValueMemberDef_out (const ValueMemberDef_out &);
-    ValueMemberDef_out &operator= (const ValueMemberDef_out &);
-    ValueMemberDef_out &operator= (const ValueMemberDef_var &);
-    ValueMemberDef_out &operator= (ValueMemberDef_ptr);
-    operator ValueMemberDef_ptr &();
-    ValueMemberDef_ptr &ptr (void);
-    ValueMemberDef_ptr operator-> (void);
-  
-  private:
-    ValueMemberDef_ptr &ptr_;
+    static ValueMemberDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_VALUEMEMBERDEF_CH_)
 #define _CORBA_VALUEMEMBERDEF_CH_
@@ -911,7 +667,7 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -1184,90 +940,53 @@ TAO_NAMESPACE  CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueMemberDef;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_VALUEDEF___PTR_CH_)
-#define _CORBA_VALUEDEF___PTR_CH_
+#if !defined (_CORBA_VALUEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_VALUEDEF__ODDS_N_ENDS_CH_
   
   class ValueDef;
   typedef ValueDef *ValueDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF___VAR_CH_)
-#define _CORBA_VALUEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ValueDef_var : public TAO_Base_var
+  struct tao_ValueDef_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ValueDef,
+        tao_ValueDef_life
+      >
+    ValueDef_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ValueDef,
+        tao_ValueDef_life
+      >
+    ValueDef_out;
+  
+  struct TAO_IFR_Client_Export tao_ValueDef_life
   {
-  public:
-    ValueDef_var (void); // default constructor
-    ValueDef_var (ValueDef_ptr p) : ptr_ (p) {} 
-    ValueDef_var (const ValueDef_var &); // copy constructor
-    ~ValueDef_var (void); // destructor
-    
-    ValueDef_var &operator= (ValueDef_ptr);
-    ValueDef_var &operator= (const ValueDef_var &);
-    ValueDef_ptr operator-> (void) const;
-    
-    operator const ValueDef_ptr &() const;
-    operator ValueDef_ptr &();
-    // in, inout, out, _retn 
-    ValueDef_ptr in (void) const;
-    ValueDef_ptr &inout (void);
-    ValueDef_ptr &out (void);
-    ValueDef_ptr _retn (void);
-    ValueDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ValueDef_ptr tao_duplicate (ValueDef_ptr);
     static void tao_release (ValueDef_ptr);
     static ValueDef_ptr tao_nil (void);
-    static ValueDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ValueDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ValueDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ValueDef_var (const TAO_Base_var &rhs);
-    ValueDef_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF___OUT_CH_)
-#define _CORBA_VALUEDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_IFR_Client_Export ValueDef_out
+  struct TAO_IFR_Client_Export tao_ValueDef_cast
   {
-  public:
-    ValueDef_out (ValueDef_ptr &);
-    ValueDef_out (ValueDef_var &);
-    ValueDef_out (const ValueDef_out &);
-    ValueDef_out &operator= (const ValueDef_out &);
-    ValueDef_out &operator= (const ValueDef_var &);
-    ValueDef_out &operator= (ValueDef_ptr);
-    operator ValueDef_ptr &();
-    ValueDef_ptr &ptr (void);
-    ValueDef_ptr operator-> (void);
-  
-  private:
-    ValueDef_ptr &ptr_;
+    static ValueDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_VALUEDEF_CH_)
 #define _CORBA_VALUEDEF_CH_
@@ -1466,9 +1185,25 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+    
+    struct FullValueDescription;
     
-    class FullValueDescription_var;
+    typedef
+      TAO_Var_Var_T<
+          FullValueDescription
+        >
+      FullValueDescription_var;
+    
+    typedef
+      TAO_Out_T<
+          FullValueDescription,
+          FullValueDescription_var
+        >
+      FullValueDescription_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
     
     struct TAO_IFR_Client_Export FullValueDescription
     {
@@ -1493,61 +1228,6 @@ TAO_NAMESPACE  CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export FullValueDescription_var
-    {
-    public:
-      FullValueDescription_var (void);
-      FullValueDescription_var (FullValueDescription *);
-      FullValueDescription_var (const FullValueDescription_var &);
-      ~FullValueDescription_var (void);
-      
-      FullValueDescription_var &operator= (FullValueDescription *);
-      FullValueDescription_var &operator= (const FullValueDescription_var &);
-      FullValueDescription *operator-> (void);
-      const FullValueDescription *operator-> (void) const;
-      
-      operator const FullValueDescription &() const;
-      operator FullValueDescription &();
-      operator FullValueDescription &() const;
-      
-      // Variable-size types only.
-      operator FullValueDescription *&();
-      
-      // in, inout, out, _retn 
-      const FullValueDescription &in (void) const;
-      FullValueDescription &inout (void);
-      FullValueDescription *&out (void);
-      FullValueDescription *_retn (void);
-      FullValueDescription *ptr (void) const;
-    
-    private:
-      FullValueDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export FullValueDescription_out
-    {
-    public:
-      FullValueDescription_out (FullValueDescription *&);
-      FullValueDescription_out (FullValueDescription_var &);
-      FullValueDescription_out (const FullValueDescription_out &);
-      FullValueDescription_out &operator= (const FullValueDescription_out &);
-      FullValueDescription_out &operator= (FullValueDescription *);
-      operator FullValueDescription *&();
-      FullValueDescription *&ptr (void);
-      FullValueDescription *operator-> (void);
-      
-    private:
-      FullValueDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const FullValueDescription_var &);
-    };
-    
-    // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     static ::CORBA::TypeCode_ptr _tc_FullValueDescription;
@@ -1611,7 +1291,7 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -2244,9 +1924,25 @@ TAO_NAMESPACE  CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDef;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  struct ValueDescription;
   
-  class ValueDescription_var;
+  typedef
+    TAO_Var_Var_T<
+        ValueDescription
+      >
+    ValueDescription_var;
+  
+  typedef
+    TAO_Out_T<
+        ValueDescription,
+        ValueDescription_var
+      >
+    ValueDescription_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_IFR_Client_Export ValueDescription
   {
@@ -2266,150 +1962,58 @@ TAO_NAMESPACE  CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_IFR_Client_Export ValueDescription_var
-  {
-  public:
-    ValueDescription_var (void);
-    ValueDescription_var (ValueDescription *);
-    ValueDescription_var (const ValueDescription_var &);
-    ~ValueDescription_var (void);
-    
-    ValueDescription_var &operator= (ValueDescription *);
-    ValueDescription_var &operator= (const ValueDescription_var &);
-    ValueDescription *operator-> (void);
-    const ValueDescription *operator-> (void) const;
-    
-    operator const ValueDescription &() const;
-    operator ValueDescription &();
-    operator ValueDescription &() const;
-    
-    // Variable-size types only.
-    operator ValueDescription *&();
-    
-    // in, inout, out, _retn 
-    const ValueDescription &in (void) const;
-    ValueDescription &inout (void);
-    ValueDescription *&out (void);
-    ValueDescription *_retn (void);
-    ValueDescription *ptr (void) const;
-  
-  private:
-    ValueDescription *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_IFR_Client_Export ValueDescription_out
-  {
-  public:
-    ValueDescription_out (ValueDescription *&);
-    ValueDescription_out (ValueDescription_var &);
-    ValueDescription_out (const ValueDescription_out &);
-    ValueDescription_out &operator= (const ValueDescription_out &);
-    ValueDescription_out &operator= (ValueDescription *);
-    operator ValueDescription *&();
-    ValueDescription *&ptr (void);
-    ValueDescription *operator-> (void);
-    
-  private:
-    ValueDescription *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ValueDescription_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ValueDescription;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_EXTVALUEDEF___PTR_CH_)
-#define _CORBA_EXTVALUEDEF___PTR_CH_
+#if !defined (_CORBA_EXTVALUEDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_EXTVALUEDEF__ODDS_N_ENDS_CH_
   
   class ExtValueDef;
   typedef ExtValueDef *ExtValueDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTVALUEDEF___VAR_CH_)
-#define _CORBA_EXTVALUEDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ExtValueDef_var : public TAO_Base_var
+  struct tao_ExtValueDef_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ExtValueDef,
+        tao_ExtValueDef_life
+      >
+    ExtValueDef_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ExtValueDef,
+        tao_ExtValueDef_life
+      >
+    ExtValueDef_out;
+  
+  struct TAO_IFR_Client_Export tao_ExtValueDef_life
   {
-  public:
-    ExtValueDef_var (void); // default constructor
-    ExtValueDef_var (ExtValueDef_ptr p) : ptr_ (p) {} 
-    ExtValueDef_var (const ExtValueDef_var &); // copy constructor
-    ~ExtValueDef_var (void); // destructor
-    
-    ExtValueDef_var &operator= (ExtValueDef_ptr);
-    ExtValueDef_var &operator= (const ExtValueDef_var &);
-    ExtValueDef_ptr operator-> (void) const;
-    
-    operator const ExtValueDef_ptr &() const;
-    operator ExtValueDef_ptr &();
-    // in, inout, out, _retn 
-    ExtValueDef_ptr in (void) const;
-    ExtValueDef_ptr &inout (void);
-    ExtValueDef_ptr &out (void);
-    ExtValueDef_ptr _retn (void);
-    ExtValueDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ExtValueDef_ptr tao_duplicate (ExtValueDef_ptr);
     static void tao_release (ExtValueDef_ptr);
     static ExtValueDef_ptr tao_nil (void);
-    static ExtValueDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ExtValueDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ExtValueDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ExtValueDef_var (const TAO_Base_var &rhs);
-    ExtValueDef_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTVALUEDEF___OUT_CH_)
-#define _CORBA_EXTVALUEDEF___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IFR_Client_Export ExtValueDef_out
+  struct TAO_IFR_Client_Export tao_ExtValueDef_cast
   {
-  public:
-    ExtValueDef_out (ExtValueDef_ptr &);
-    ExtValueDef_out (ExtValueDef_var &);
-    ExtValueDef_out (const ExtValueDef_out &);
-    ExtValueDef_out &operator= (const ExtValueDef_out &);
-    ExtValueDef_out &operator= (const ExtValueDef_var &);
-    ExtValueDef_out &operator= (ExtValueDef_ptr);
-    operator ExtValueDef_ptr &();
-    ExtValueDef_ptr &ptr (void);
-    ExtValueDef_ptr operator-> (void);
-  
-  private:
-    ExtValueDef_ptr &ptr_;
+    static ExtValueDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_EXTVALUEDEF_CH_)
 #define _CORBA_EXTVALUEDEF_CH_
@@ -2469,9 +2073,25 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
     
-    class ExtFullValueDescription_var;
+    struct ExtFullValueDescription;
+    
+    typedef
+      TAO_Var_Var_T<
+          ExtFullValueDescription
+        >
+      ExtFullValueDescription_var;
+    
+    typedef
+      TAO_Out_T<
+          ExtFullValueDescription,
+          ExtFullValueDescription_var
+        >
+      ExtFullValueDescription_out;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
     
     struct TAO_IFR_Client_Export ExtFullValueDescription
     {
@@ -2496,61 +2116,6 @@ TAO_NAMESPACE  CORBA
     };
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-    
-    class TAO_IFR_Client_Export ExtFullValueDescription_var
-    {
-    public:
-      ExtFullValueDescription_var (void);
-      ExtFullValueDescription_var (ExtFullValueDescription *);
-      ExtFullValueDescription_var (const ExtFullValueDescription_var &);
-      ~ExtFullValueDescription_var (void);
-      
-      ExtFullValueDescription_var &operator= (ExtFullValueDescription *);
-      ExtFullValueDescription_var &operator= (const ExtFullValueDescription_var &);
-      ExtFullValueDescription *operator-> (void);
-      const ExtFullValueDescription *operator-> (void) const;
-      
-      operator const ExtFullValueDescription &() const;
-      operator ExtFullValueDescription &();
-      operator ExtFullValueDescription &() const;
-      
-      // Variable-size types only.
-      operator ExtFullValueDescription *&();
-      
-      // in, inout, out, _retn 
-      const ExtFullValueDescription &in (void) const;
-      ExtFullValueDescription &inout (void);
-      ExtFullValueDescription *&out (void);
-      ExtFullValueDescription *_retn (void);
-      ExtFullValueDescription *ptr (void) const;
-    
-    private:
-      ExtFullValueDescription *ptr_;
-    };
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-    
-    class TAO_IFR_Client_Export ExtFullValueDescription_out
-    {
-    public:
-      ExtFullValueDescription_out (ExtFullValueDescription *&);
-      ExtFullValueDescription_out (ExtFullValueDescription_var &);
-      ExtFullValueDescription_out (const ExtFullValueDescription_out &);
-      ExtFullValueDescription_out &operator= (const ExtFullValueDescription_out &);
-      ExtFullValueDescription_out &operator= (ExtFullValueDescription *);
-      operator ExtFullValueDescription *&();
-      ExtFullValueDescription *&ptr (void);
-      ExtFullValueDescription *operator-> (void);
-      
-    private:
-      ExtFullValueDescription *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const ExtFullValueDescription_var &);
-    };
-    
-    // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
     
     static ::CORBA::TypeCode_ptr _tc_ExtFullValueDescription;
@@ -2583,7 +2148,7 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -2846,90 +2411,53 @@ TAO_NAMESPACE  CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExtValueDef;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
-#define _CORBA_VALUEBOXDEF___PTR_CH_
+#if !defined (_CORBA_VALUEBOXDEF__ODDS_N_ENDS_CH_)
+#define _CORBA_VALUEBOXDEF__ODDS_N_ENDS_CH_
   
   class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
-#define _CORBA_VALUEBOXDEF___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IFR_Client_Export ValueBoxDef_var : public TAO_Base_var
+  struct tao_ValueBoxDef_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ValueBoxDef,
+        tao_ValueBoxDef_life
+      >
+    ValueBoxDef_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ValueBoxDef,
+        tao_ValueBoxDef_life
+      >
+    ValueBoxDef_out;
+  
+  struct TAO_IFR_Client_Export tao_ValueBoxDef_life
   {
-  public:
-    ValueBoxDef_var (void); // default constructor
-    ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {} 
-    ValueBoxDef_var (const ValueBoxDef_var &); // copy constructor
-    ~ValueBoxDef_var (void); // destructor
-    
-    ValueBoxDef_var &operator= (ValueBoxDef_ptr);
-    ValueBoxDef_var &operator= (const ValueBoxDef_var &);
-    ValueBoxDef_ptr operator-> (void) const;
-    
-    operator const ValueBoxDef_ptr &() const;
-    operator ValueBoxDef_ptr &();
-    // in, inout, out, _retn 
-    ValueBoxDef_ptr in (void) const;
-    ValueBoxDef_ptr &inout (void);
-    ValueBoxDef_ptr &out (void);
-    ValueBoxDef_ptr _retn (void);
-    ValueBoxDef_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ValueBoxDef_ptr tao_duplicate (ValueBoxDef_ptr);
     static void tao_release (ValueBoxDef_ptr);
     static ValueBoxDef_ptr tao_nil (void);
-    static ValueBoxDef_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ValueBoxDef_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ValueBoxDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ValueBoxDef_var (const TAO_Base_var &rhs);
-    ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
-#define _CORBA_VALUEBOXDEF___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_IFR_Client_Export ValueBoxDef_out
+  struct TAO_IFR_Client_Export tao_ValueBoxDef_cast
   {
-  public:
-    ValueBoxDef_out (ValueBoxDef_ptr &);
-    ValueBoxDef_out (ValueBoxDef_var &);
-    ValueBoxDef_out (const ValueBoxDef_out &);
-    ValueBoxDef_out &operator= (const ValueBoxDef_out &);
-    ValueBoxDef_out &operator= (const ValueBoxDef_var &);
-    ValueBoxDef_out &operator= (ValueBoxDef_ptr);
-    operator ValueBoxDef_ptr &();
-    ValueBoxDef_ptr &ptr (void);
-    ValueBoxDef_ptr operator-> (void);
-  
-  private:
-    ValueBoxDef_ptr &ptr_;
+    static ValueBoxDef_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_VALUEBOXDEF_CH_)
 #define _CORBA_VALUEBOXDEF_CH_
@@ -2989,7 +2517,7 @@ TAO_NAMESPACE  CORBA
       ));
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -3391,7 +2919,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ExtendedC.i"
@@ -3408,4 +2936,3 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox
 #include "ace/post.h"
 #endif /* ifndef */
 
-
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.i b/TAO/tao/IFR_Client/IFR_ExtendedC.i
index 166759e9887..96ebe3cd695 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.i
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.i
@@ -37,698 +37,7 @@ CORBA::FixedDef::FixedDef (
   this->CORBA_FixedDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::FixedDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::FixedDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMember_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMember_var::ValueMember_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueMember_var::ValueMember_var (ValueMember *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueMember_var::ValueMember_var (const ::CORBA::ValueMember_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ValueMember (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ValueMember_var::~ValueMember_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMember_var &
-CORBA::ValueMember_var::operator= (ValueMember *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ValueMember_var &
-CORBA::ValueMember_var::operator= (const ::CORBA::ValueMember_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ValueMember *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ValueMember (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ValueMember *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ValueMember *
-CORBA::ValueMember_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueMember *
-CORBA::ValueMember_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMember_var::operator const ::CORBA::ValueMember &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMember_var::operator ::CORBA::ValueMember &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMember_var::operator ::CORBA::ValueMember &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ValueMember_var::operator ::CORBA::ValueMember *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ValueMember &
-CORBA::ValueMember_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueMember &
-CORBA::ValueMember_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ValueMember *&
-CORBA::ValueMember_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueMember *
-CORBA::ValueMember_var::_retn (void)
-{
-  ::CORBA::ValueMember *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ValueMember *
-CORBA::ValueMember_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMember_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMember_out::ValueMember_out (::CORBA::ValueMember *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMember_out::ValueMember_out (ValueMember_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMember_out::ValueMember_out (const ::CORBA::ValueMember_out &p)
-  : ptr_ (ACE_const_cast (ValueMember_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ValueMember_out &
-CORBA::ValueMember_out::operator= (const ::CORBA::ValueMember_out &p)
-{
-  this->ptr_ = ACE_const_cast (ValueMember_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ValueMember_out &
-CORBA::ValueMember_out::operator= (ValueMember *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueMember_out::operator ::CORBA::ValueMember *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueMember *&
-CORBA::ValueMember_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueMember *
-CORBA::ValueMember_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:98
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CI_
-
-ACE_INLINE
-CORBA::ValueMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ValueMember *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ValueMember[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (CORBA::ValueMember *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ValueMember *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (
-    const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ValueMember *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->maximum_);
-      CORBA::ValueMember * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ValueMember * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ValueMember *tmp =
-            ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ValueMember *tmp1 =
-    ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
-  CORBA::ValueMember * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ValueMember * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ValueMember &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ValueMember* tmp =
-    ACE_reinterpret_cast (CORBA::ValueMember*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ValueMember &
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ValueMember * const tmp =
-    ACE_reinterpret_cast (CORBA::ValueMember* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ValueMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ValueMember *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ValueMember*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ValueMember*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ValueMember *
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ValueMember * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ValueMember *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ValueMember *tmp =
-        ACE_reinterpret_cast (CORBA::ValueMember*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEMEMBERSEQ_CI_)
-#define _CORBA_VALUEMEMBERSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMemberSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::ValueMemberSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::ValueMemberSeq_var (ValueMemberSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::ValueMemberSeq_var (const ::CORBA::ValueMemberSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ValueMemberSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::~ValueMemberSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var &
-CORBA::ValueMemberSeq_var::operator= (ValueMemberSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq_var &
-CORBA::ValueMemberSeq_var::operator= (const ::CORBA::ValueMemberSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ValueMemberSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ValueMemberSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ValueMemberSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::operator const ::CORBA::ValueMemberSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::operator ::CORBA::ValueMemberSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_var::operator ::CORBA::ValueMemberSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ValueMemberSeq_var::operator ::CORBA::ValueMemberSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMember &
-CORBA::ValueMemberSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::ValueMember &
-CORBA::ValueMemberSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::ValueMember &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::ValueMemberSeq &
-CORBA::ValueMemberSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq &
-CORBA::ValueMemberSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq *&
-CORBA::ValueMemberSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_var::_retn (void)
-{
-  ::CORBA::ValueMemberSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ValueMemberSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueMemberSeq_out::ValueMemberSeq_out (ValueMemberSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_out::ValueMemberSeq_out (ValueMemberSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_out::ValueMemberSeq_out (const ::CORBA::ValueMemberSeq_out &p)
-  : ptr_ (ACE_const_cast (ValueMemberSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq_out &
-CORBA::ValueMemberSeq_out::operator= (const ::CORBA::ValueMemberSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ValueMemberSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq_out &
-CORBA::ValueMemberSeq_out::operator= (ValueMemberSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ValueMemberSeq_out::operator ::CORBA::ValueMemberSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq *&
-CORBA::ValueMemberSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ValueMemberSeq *
-CORBA::ValueMemberSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueMember &
-CORBA::ValueMemberSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
+#endif /**/
 #if !defined (_CORBA_VALUEMEMBERDEF___CI_)
 #define _CORBA_VALUEMEMBERDEF___CI_
 
@@ -743,238 +52,9 @@ CORBA::ValueMemberDef::ValueMemberDef (
   this->CORBA_ValueMemberDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<CORBA::ValueMemberDef>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDef::FullValueDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (FullValueDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (const ::CORBA::ValueDef::FullValueDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ValueDef::FullValueDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::~FullValueDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var &
-CORBA::ValueDef::FullValueDescription_var::operator= (FullValueDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ValueDef::FullValueDescription_var &
-CORBA::ValueDef::FullValueDescription_var::operator= (const ::CORBA::ValueDef::FullValueDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          FullValueDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              FullValueDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              FullValueDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::operator const ::CORBA::ValueDef::FullValueDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::operator ::CORBA::ValueDef::FullValueDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::operator ::CORBA::ValueDef::FullValueDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::operator ::CORBA::ValueDef::FullValueDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ValueDef::FullValueDescription &
-CORBA::ValueDef::FullValueDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription &
-CORBA::ValueDef::FullValueDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *&
-CORBA::ValueDef::FullValueDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::_retn (void)
-{
-  ::CORBA::ValueDef::FullValueDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDef::FullValueDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (::CORBA::ValueDef::FullValueDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (FullValueDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (const ::CORBA::ValueDef::FullValueDescription_out &p)
-  : ptr_ (ACE_const_cast (FullValueDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out &
-CORBA::ValueDef::FullValueDescription_out::operator= (const ::CORBA::ValueDef::FullValueDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (FullValueDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out &
-CORBA::ValueDef::FullValueDescription_out::operator= (FullValueDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueDef::FullValueDescription_out::operator ::CORBA::ValueDef::FullValueDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *&
-CORBA::ValueDef::FullValueDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_VALUEDEF___CI_)
@@ -991,13 +71,6 @@ CORBA::ValueDef::ValueDef (
   this->CORBA_ValueDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ValueDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1008,432 +81,9 @@ TAO::Any_Impl_T<CORBA::ValueDef>::to_object (
   _tao_elem = CORBA::Object::_duplicate (this->value_);
   return 1;
 }
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDescription_var::ValueDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ValueDescription_var::ValueDescription_var (ValueDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ValueDescription_var::ValueDescription_var (const ::CORBA::ValueDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ValueDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ValueDescription_var::~ValueDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_var &
-CORBA::ValueDescription_var::operator= (ValueDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ValueDescription_var &
-CORBA::ValueDescription_var::operator= (const ::CORBA::ValueDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ValueDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ValueDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ValueDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ValueDescription *
-CORBA::ValueDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDescription *
-CORBA::ValueDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_var::operator const ::CORBA::ValueDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_var::operator ::CORBA::ValueDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_var::operator ::CORBA::ValueDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ValueDescription_var::operator ::CORBA::ValueDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ValueDescription &
-CORBA::ValueDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDescription &
-CORBA::ValueDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ValueDescription *&
-CORBA::ValueDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDescription *
-CORBA::ValueDescription_var::_retn (void)
-{
-  ::CORBA::ValueDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ValueDescription *
-CORBA::ValueDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ValueDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueDescription_out::ValueDescription_out (::CORBA::ValueDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_out::ValueDescription_out (ValueDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_out::ValueDescription_out (const ::CORBA::ValueDescription_out &p)
-  : ptr_ (ACE_const_cast (ValueDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ValueDescription_out &
-CORBA::ValueDescription_out::operator= (const ::CORBA::ValueDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ValueDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ValueDescription_out &
-CORBA::ValueDescription_out::operator= (ValueDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ValueDescription_out::operator ::CORBA::ValueDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDescription *&
-CORBA::ValueDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ValueDescription *
-CORBA::ValueDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ExtValueDef::ExtFullValueDescription_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var::ExtFullValueDescription_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var::ExtFullValueDescription_var (ExtFullValueDescription *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var::ExtFullValueDescription_var (const ::CORBA::ExtValueDef::ExtFullValueDescription_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ExtValueDef::ExtFullValueDescription (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var::~ExtFullValueDescription_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var &
-CORBA::ExtValueDef::ExtFullValueDescription_var::operator= (ExtFullValueDescription *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ExtValueDef::ExtFullValueDescription_var &
-CORBA::ExtValueDef::ExtFullValueDescription_var::operator= (const ::CORBA::ExtValueDef::ExtFullValueDescription_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ExtFullValueDescription *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ExtFullValueDescription (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ExtFullValueDescription *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ExtValueDef::ExtFullValueDescription *
-CORBA::ExtValueDef::ExtFullValueDescription_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *
-CORBA::ExtValueDef::ExtFullValueDescription_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var::operator const ::CORBA::ExtValueDef::ExtFullValueDescription &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var::operator ::CORBA::ExtValueDef::ExtFullValueDescription &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var::operator ::CORBA::ExtValueDef::ExtFullValueDescription &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_var::operator ::CORBA::ExtValueDef::ExtFullValueDescription *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ExtValueDef::ExtFullValueDescription &
-CORBA::ExtValueDef::ExtFullValueDescription_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription &
-CORBA::ExtValueDef::ExtFullValueDescription_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *&
-CORBA::ExtValueDef::ExtFullValueDescription_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *
-CORBA::ExtValueDef::ExtFullValueDescription_var::_retn (void)
-{
-  ::CORBA::ExtValueDef::ExtFullValueDescription *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *
-CORBA::ExtValueDef::ExtFullValueDescription_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ExtValueDef::ExtFullValueDescription_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_out::ExtFullValueDescription_out (::CORBA::ExtValueDef::ExtFullValueDescription *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_out::ExtFullValueDescription_out (ExtFullValueDescription_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_out::ExtFullValueDescription_out (const ::CORBA::ExtValueDef::ExtFullValueDescription_out &p)
-  : ptr_ (ACE_const_cast (ExtFullValueDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_out &
-CORBA::ExtValueDef::ExtFullValueDescription_out::operator= (const ::CORBA::ExtValueDef::ExtFullValueDescription_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExtFullValueDescription_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ExtValueDef::ExtFullValueDescription_out &
-CORBA::ExtValueDef::ExtFullValueDescription_out::operator= (ExtFullValueDescription *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ExtValueDef::ExtFullValueDescription_out::operator ::CORBA::ExtValueDef::ExtFullValueDescription *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *&
-CORBA::ExtValueDef::ExtFullValueDescription_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription *
-CORBA::ExtValueDef::ExtFullValueDescription_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_CORBA_EXTVALUEDEF___CI_)
@@ -1450,13 +100,6 @@ CORBA::ExtValueDef::ExtValueDef (
   this->CORBA_ExtValueDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1487,13 +130,6 @@ CORBA::ValueBoxDef::ValueBoxDef (
   this->CORBA_ValueBoxDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::ValueBoxDef::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1504,7 +140,6 @@ TAO::Any_Impl_T<CORBA::ValueBoxDef>::to_object (
   _tao_elem = CORBA::Object::_duplicate (this->value_);
   return 1;
 }
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -1521,7 +156,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1616,7 +251,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1683,7 +318,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1753,7 +388,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1831,5 +466,3 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CORBA::ValueBoxDef_ptr &
   );
-
-
diff --git a/TAO/tao/IFR_Client/TAO_IFR_Client.dsp b/TAO/tao/IFR_Client/TAO_IFR_Client.dsp
index af095ac548c..0af4143bfdd 100644
--- a/TAO/tao/IFR_Client/TAO_IFR_Client.dsp
+++ b/TAO/tao/IFR_Client/TAO_IFR_Client.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IFR_BASIC_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IFR_BASIC_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -100,7 +100,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -128,7 +128,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IFR_CLIENT_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index a574459cdc0..0d2bfb94925 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -42,27 +42,27 @@ static const CORBA::Long _oc_IIOP_ListenPoint[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x2f4c6973), 
-  ACE_NTOHL (0x74656e50), 
-  ACE_NTOHL (0x6f696e74), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49494f50),
+  ACE_NTOHL (0x2f4c6973),
+  ACE_NTOHL (0x74656e50),
+  ACE_NTOHL (0x6f696e74),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
     12,
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x656e506f), 
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x656e506f),
   ACE_NTOHL (0x696e7400),  // name = ListenPoint
   2, // member count
     5,
-  ACE_NTOHL (0x686f7374), 
+  ACE_NTOHL (0x686f7374),
   ACE_NTOHL (0x0),  // name = host
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
   5,
-  ACE_NTOHL (0x706f7274), 
+  ACE_NTOHL (0x706f7274),
   ACE_NTOHL (0x0),  // name = port
     CORBA::tk_ushort,
 
@@ -85,8 +85,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void IIOP::ListenPoint::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -94,85 +94,48 @@ void IIOP::ListenPoint::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_
+template class
+  TAO_Var_Var_T<
+      ListenPoint
+    >;
 
-void
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_allocate_buffer (CORBA::ULong length)
-{
-  IIOP::ListenPoint* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      IIOP::ListenPoint *old =
-        ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Out_T<
+      ListenPoint,
+      ListenPoint_var
+    >;
 
-void
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  IIOP::ListenPoint *tmp =
-    ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ListenPoint \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      ListenPoint, \
+      ListenPoint_var \
+    >
 
-#if !defined (_IIOP_LISTENPOINTLIST_CS_)
-#define _IIOP_LISTENPOINTLIST_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// IIOP::ListenPointList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 IIOP::ListenPointList::ListenPointList (void)
 {}
 
 IIOP::ListenPointList::ListenPointList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IIOP_ListenPointList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IIOP::ListenPoint>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        IIOP::ListenPoint
+      >
+    (max)
 {}
 
 IIOP::ListenPointList::ListenPointList (
@@ -181,30 +144,20 @@ IIOP::ListenPointList::ListenPointList (
     IIOP::ListenPoint *buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IIOP_ListenPointList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IIOP::ListenPoint>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        IIOP::ListenPoint
+      >
+    (max, length, buffer, release)
 {}
 
 IIOP::ListenPointList::ListenPointList (const ListenPointList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_IIOP_ListenPointList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<IIOP::ListenPoint>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        IIOP::ListenPoint
+      >
+    (seq)
 {}
 
-IIOP::ListenPointList::~ListenPointList (void) // dtor
+IIOP::ListenPointList::~ListenPointList (void)
 {}
 
 void IIOP::ListenPointList::_tao_any_destructor (void *_tao_void_pointer)
@@ -213,7 +166,37 @@ void IIOP::ListenPointList::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      ListenPointList,
+      IIOP::ListenPoint
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ListenPointList,
+      ListenPointList_var,
+      IIOP::ListenPoint
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ListenPointList, \
+      IIOP::ListenPoint \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ListenPointList, \
+      ListenPointList_var, \
+      IIOP::ListenPoint \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -222,20 +205,20 @@ static const CORBA::Long _oc_IIOP_ListenPointList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x2f4c6973), 
-  ACE_NTOHL (0x74656e50), 
-  ACE_NTOHL (0x6f696e74), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49494f50),
+  ACE_NTOHL (0x2f4c6973),
+  ACE_NTOHL (0x74656e50),
+  ACE_NTOHL (0x6f696e74),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
     16,
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x656e506f), 
-  ACE_NTOHL (0x696e744c), 
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x656e506f),
+  ACE_NTOHL (0x696e744c),
   ACE_NTOHL (0x69737400),  // name = ListenPointList
     CORBA::tk_sequence, // typecode kind
   116, // encapsulation length
@@ -244,27 +227,27 @@ static const CORBA::Long _oc_IIOP_ListenPointList[] =
     100, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x49494f50), 
-      ACE_NTOHL (0x2f4c6973), 
-      ACE_NTOHL (0x74656e50), 
-      ACE_NTOHL (0x6f696e74), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x49494f50),
+      ACE_NTOHL (0x2f4c6973),
+      ACE_NTOHL (0x74656e50),
+      ACE_NTOHL (0x6f696e74),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
             12,
-      ACE_NTOHL (0x4c697374), 
-      ACE_NTOHL (0x656e506f), 
+      ACE_NTOHL (0x4c697374),
+      ACE_NTOHL (0x656e506f),
       ACE_NTOHL (0x696e7400),  // name = ListenPoint
       2, // member count
             5,
-      ACE_NTOHL (0x686f7374), 
+      ACE_NTOHL (0x686f7374),
       ACE_NTOHL (0x0),  // name = host
-            CORBA::tk_string, 
+            CORBA::tk_string,
       0U, // string length
       5,
-      ACE_NTOHL (0x706f7274), 
+      ACE_NTOHL (0x706f7274),
       ACE_NTOHL (0x0),  // name = port
             CORBA::tk_ushort,
 
@@ -297,49 +280,49 @@ static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49494f50), 
-  ACE_NTOHL (0x2f426944), 
-  ACE_NTOHL (0x69724949), 
-  ACE_NTOHL (0x4f505365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x65436f6e), 
-  ACE_NTOHL (0x74657874), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x49494f50),
+  ACE_NTOHL (0x2f426944),
+  ACE_NTOHL (0x69724949),
+  ACE_NTOHL (0x4f505365),
+  ACE_NTOHL (0x72766963),
+  ACE_NTOHL (0x65436f6e),
+  ACE_NTOHL (0x74657874),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0
     24,
-  ACE_NTOHL (0x42694469), 
-  ACE_NTOHL (0x7249494f), 
-  ACE_NTOHL (0x50536572), 
-  ACE_NTOHL (0x76696365), 
-  ACE_NTOHL (0x436f6e74), 
+  ACE_NTOHL (0x42694469),
+  ACE_NTOHL (0x7249494f),
+  ACE_NTOHL (0x50536572),
+  ACE_NTOHL (0x76696365),
+  ACE_NTOHL (0x436f6e74),
   ACE_NTOHL (0x65787400),  // name = BiDirIIOPServiceContext
   1, // member count
     14,
-  ACE_NTOHL (0x6c697374), 
-  ACE_NTOHL (0x656e5f70), 
-  ACE_NTOHL (0x6f696e74), 
+  ACE_NTOHL (0x6c697374),
+  ACE_NTOHL (0x656e5f70),
+  ACE_NTOHL (0x6f696e74),
   ACE_NTOHL (0x73000000),  // name = listen_points
     CORBA::tk_alias, // typecode kind for typedefs
   192, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x49494f50), 
-    ACE_NTOHL (0x2f4c6973), 
-    ACE_NTOHL (0x74656e50), 
-    ACE_NTOHL (0x6f696e74), 
-    ACE_NTOHL (0x4c697374), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x49494f50),
+    ACE_NTOHL (0x2f4c6973),
+    ACE_NTOHL (0x74656e50),
+    ACE_NTOHL (0x6f696e74),
+    ACE_NTOHL (0x4c697374),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0
         16,
-    ACE_NTOHL (0x4c697374), 
-    ACE_NTOHL (0x656e506f), 
-    ACE_NTOHL (0x696e744c), 
+    ACE_NTOHL (0x4c697374),
+    ACE_NTOHL (0x656e506f),
+    ACE_NTOHL (0x696e744c),
     ACE_NTOHL (0x69737400),  // name = ListenPointList
         CORBA::tk_sequence, // typecode kind
     116, // encapsulation length
@@ -348,27 +331,27 @@ static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
       100, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x49494f50), 
-        ACE_NTOHL (0x2f4c6973), 
-        ACE_NTOHL (0x74656e50), 
-        ACE_NTOHL (0x6f696e74), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x49494f50),
+        ACE_NTOHL (0x2f4c6973),
+        ACE_NTOHL (0x74656e50),
+        ACE_NTOHL (0x6f696e74),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0
                 12,
-        ACE_NTOHL (0x4c697374), 
-        ACE_NTOHL (0x656e506f), 
+        ACE_NTOHL (0x4c697374),
+        ACE_NTOHL (0x656e506f),
         ACE_NTOHL (0x696e7400),  // name = ListenPoint
         2, // member count
                 5,
-        ACE_NTOHL (0x686f7374), 
+        ACE_NTOHL (0x686f7374),
         ACE_NTOHL (0x0),  // name = host
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
         5,
-        ACE_NTOHL (0x706f7274), 
+        ACE_NTOHL (0x706f7274),
         ACE_NTOHL (0x0),  // name = port
                 CORBA::tk_ushort,
 
@@ -395,8 +378,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -404,7 +387,38 @@ void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *_tao_void_pointer
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      BiDirIIOPServiceContext
+    >;
+
+template class
+  TAO_Out_T<
+      BiDirIIOPServiceContext,
+      BiDirIIOPServiceContext_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      BiDirIIOPServiceContext \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      BiDirIIOPServiceContext, \
+      BiDirIIOPServiceContext_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -469,7 +483,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<IIOP::ListenPoint>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -534,7 +548,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<IIOP::ListenPointList>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -600,7 +614,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -608,20 +622,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -631,7 +645,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -641,27 +655,26 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
-
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index a8ca954fe85..2f50b3add22 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -26,17 +26,16 @@
 #define _TAO_IDL_ORIG_IIOPC_H_
 
 #include "ace/pre.h"
-#include "tao/TAO_Export.h"
-
+#include "tao/Sequence_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corbafwd.h"
-#include "tao/Managed_Types.h"
-#include "tao/Sequence_T.h"
-#include "tao/CDR.h"
+#include "CDR.h"
+#include "tao/VarOut_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/Seq_Var_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -66,327 +65,122 @@
 
 TAO_NAMESPACE  IIOP
 {
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct ListenPoint;
+
+  typedef
+    TAO_Var_Var_T<
+        ListenPoint
+      >
+    ListenPoint_var;
+
+  typedef
+    TAO_Out_T<
+        ListenPoint,
+        ListenPoint_var
+      >
+    ListenPoint_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ListenPoint_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_Export ListenPoint
   {
     typedef ListenPoint_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager host;
     CORBA::UShort port;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export ListenPoint_var
-  {
-  public:
-    ListenPoint_var (void);
-    ListenPoint_var (ListenPoint *);
-    ListenPoint_var (const ListenPoint_var &);
-    ~ListenPoint_var (void);
-    
-    ListenPoint_var &operator= (ListenPoint *);
-    ListenPoint_var &operator= (const ListenPoint_var &);
-    ListenPoint *operator-> (void);
-    const ListenPoint *operator-> (void) const;
-    
-    operator const ListenPoint &() const;
-    operator ListenPoint &();
-    operator ListenPoint &() const;
-    
-    // Variable-size types only.
-    operator ListenPoint *&();
-    
-    // in, inout, out, _retn 
-    const ListenPoint &in (void) const;
-    ListenPoint &inout (void);
-    ListenPoint *&out (void);
-    ListenPoint *_retn (void);
-    ListenPoint *ptr (void) const;
-  
-  private:
-    ListenPoint *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_Export ListenPoint_out
-  {
-  public:
-    ListenPoint_out (ListenPoint *&);
-    ListenPoint_out (ListenPoint_var &);
-    ListenPoint_out (const ListenPoint_out &);
-    ListenPoint_out &operator= (const ListenPoint_out &);
-    ListenPoint_out &operator= (ListenPoint *);
-    operator ListenPoint *&();
-    ListenPoint *&ptr (void);
-    ListenPoint *operator-> (void);
-    
-  private:
-    ListenPoint *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ListenPoint_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Sequence_IIOP_ListenPointList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList (void);
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ListenPoint *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList (
-        const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
-      );
-    _TAO_Unbounded_Sequence_IIOP_ListenPointList &operator= (
-        const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void);
-    
-    // = Accessors.
-    ListenPoint &operator[] (CORBA::ULong i);
-    const ListenPoint &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ListenPoint *allocbuf (CORBA::ULong size);
-    static void freebuf (ListenPoint *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ListenPoint *get_buffer (CORBA::Boolean orphan = 0);
-    const ListenPoint *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ListenPoint *data,
-        CORBA::Boolean release
-      );
-  };
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint;
 
-#if !defined (_IIOP_LISTENPOINTLIST_CH_)
-#define _IIOP_LISTENPOINTLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ListenPointList;
-  class ListenPointList_var;
-  
-  // *************************************************************
-  // IIOP::ListenPointList
-  // *************************************************************
-  
-  class TAO_Export ListenPointList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IIOP_ListenPointList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ListenPoint>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_VarSeq_Var_T<
+        ListenPointList,
+        IIOP::ListenPoint
+      >
+    ListenPointList_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        ListenPointList,
+        ListenPointList_var,
+        IIOP::ListenPoint
+      >
+    ListenPointList_out;
+
+  class TAO_Export ListenPointList
+    : public
+        TAO_Unbounded_Sequence<
+            IIOP::ListenPoint
+          >
   {
   public:
     ListenPointList (void);
     ListenPointList (CORBA::ULong max);
     ListenPointList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ListenPoint *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ListenPoint *buffer,
         CORBA::Boolean release = 0
       );
     ListenPointList (const ListenPointList &);
     ~ListenPointList (void);
-    
-    static void _tao_any_destructor (void*);
-    
+
+    static void _tao_any_destructor (void *);
+
     typedef ListenPointList_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_IIOP_LISTENPOINTLIST___VAR_CH_)
-#define _IIOP_LISTENPOINTLIST___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class IIOP::ListenPointList_var
-  // *************************************************************
-  
-  class TAO_Export ListenPointList_var
-  {
-  public:
-    ListenPointList_var (void);
-    ListenPointList_var (ListenPointList *);
-    ListenPointList_var (const ListenPointList_var &);
-    ~ListenPointList_var (void);
-    
-    ListenPointList_var &operator= (ListenPointList *);
-    ListenPointList_var &operator= (const ListenPointList_var &);
-    ListenPointList *operator-> (void);
-    const ListenPointList *operator-> (void) const;
-    
-    operator const ListenPointList &() const;
-    operator ListenPointList &();
-    operator ListenPointList &() const;
-    
-    // Variable-size base types only.
-    operator ListenPointList *&();
-    
-    ListenPoint & operator[] (CORBA::ULong index);
-    const ListenPoint & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ListenPointList &in (void) const;
-    ListenPointList &inout (void);
-    ListenPointList *&out (void);
-    ListenPointList *_retn (void);
-    ListenPointList *ptr (void) const;
-  
-  private:
-    ListenPointList *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
 
-#if !defined (_IIOP_LISTENPOINTLIST___OUT_CH_)
-#define _IIOP_LISTENPOINTLIST___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export ListenPointList_out
-  {
-  public:
-    ListenPointList_out (ListenPointList *&);
-    ListenPointList_out (ListenPointList_var &);
-    ListenPointList_out (const ListenPointList_out &);
-    ListenPointList_out &operator= (const ListenPointList_out &);
-    ListenPointList_out &operator= (ListenPointList *);
-    operator ListenPointList *&();
-    ListenPointList *&ptr (void);
-    ListenPointList *operator-> (void);
-    ListenPoint & operator[] (CORBA::ULong index);
-  
-  private:
-    ListenPointList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ListenPointList_var &);
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct BiDirIIOPServiceContext;
+
+  typedef
+    TAO_Var_Var_T<
+        BiDirIIOPServiceContext
+      >
+    BiDirIIOPServiceContext_var;
+
+  typedef
+    TAO_Out_T<
+        BiDirIIOPServiceContext,
+        BiDirIIOPServiceContext_var
+      >
+    BiDirIIOPServiceContext_out;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class BiDirIIOPServiceContext_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_Export BiDirIIOPServiceContext
   {
     typedef BiDirIIOPServiceContext_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IIOP::ListenPointList listen_points;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export BiDirIIOPServiceContext_var
-  {
-  public:
-    BiDirIIOPServiceContext_var (void);
-    BiDirIIOPServiceContext_var (BiDirIIOPServiceContext *);
-    BiDirIIOPServiceContext_var (const BiDirIIOPServiceContext_var &);
-    ~BiDirIIOPServiceContext_var (void);
-    
-    BiDirIIOPServiceContext_var &operator= (BiDirIIOPServiceContext *);
-    BiDirIIOPServiceContext_var &operator= (const BiDirIIOPServiceContext_var &);
-    BiDirIIOPServiceContext *operator-> (void);
-    const BiDirIIOPServiceContext *operator-> (void) const;
-    
-    operator const BiDirIIOPServiceContext &() const;
-    operator BiDirIIOPServiceContext &();
-    operator BiDirIIOPServiceContext &() const;
-    
-    // Variable-size types only.
-    operator BiDirIIOPServiceContext *&();
-    
-    // in, inout, out, _retn 
-    const BiDirIIOPServiceContext &in (void) const;
-    BiDirIIOPServiceContext &inout (void);
-    BiDirIIOPServiceContext *&out (void);
-    BiDirIIOPServiceContext *_retn (void);
-    BiDirIIOPServiceContext *ptr (void) const;
-  
-  private:
-    BiDirIIOPServiceContext *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_Export BiDirIIOPServiceContext_out
-  {
-  public:
-    BiDirIIOPServiceContext_out (BiDirIIOPServiceContext *&);
-    BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &);
-    BiDirIIOPServiceContext_out (const BiDirIIOPServiceContext_out &);
-    BiDirIIOPServiceContext_out &operator= (const BiDirIIOPServiceContext_out &);
-    BiDirIIOPServiceContext_out &operator= (BiDirIIOPServiceContext *);
-    operator BiDirIIOPServiceContext *&();
-    BiDirIIOPServiceContext *&ptr (void);
-    BiDirIIOPServiceContext *operator-> (void);
-    
-  private:
-    BiDirIIOPServiceContext *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const BiDirIIOPServiceContext_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
 
 // TAO_IDL - Generated from
@@ -459,7 +253,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IIOPC.i"
@@ -475,4 +269,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/IIOPC.i b/TAO/tao/IIOPC.i
index bd3a849fa93..b03a811ff87 100644
--- a/TAO/tao/IIOPC.i
+++ b/TAO/tao/IIOPC.i
@@ -21,887 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class IIOP::ListenPoint_var
-// *************************************************************
-
-ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (ListenPoint *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IIOP::ListenPoint_var::ListenPoint_var (const ::IIOP::ListenPoint_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IIOP::ListenPoint (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var::~ListenPoint_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var &
-IIOP::ListenPoint_var::operator= (ListenPoint *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::IIOP::ListenPoint_var &
-IIOP::ListenPoint_var::operator= (const ::IIOP::ListenPoint_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ListenPoint *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ListenPoint (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ListenPoint *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IIOP::ListenPoint *
-IIOP::ListenPoint_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *
-IIOP::ListenPoint_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var::operator const ::IIOP::ListenPoint &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var::operator ::IIOP::ListenPoint &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_var::operator ::IIOP::ListenPoint &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IIOP::ListenPoint_var::operator ::IIOP::ListenPoint *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::IIOP::ListenPoint &
-IIOP::ListenPoint_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint &
-IIOP::ListenPoint_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::IIOP::ListenPoint *&
-IIOP::ListenPoint_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *
-IIOP::ListenPoint_var::_retn (void)
-{
-  ::IIOP::ListenPoint *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *
-IIOP::ListenPoint_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class IIOP::ListenPoint_out
-// *************************************************************
-
-ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (::IIOP::ListenPoint *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_out::ListenPoint_out (const ::IIOP::ListenPoint_out &p)
-  : ptr_ (ACE_const_cast (ListenPoint_out&, p).ptr_)
-{}
-
-ACE_INLINE
-IIOP::ListenPoint_out &
-IIOP::ListenPoint_out::operator= (const ::IIOP::ListenPoint_out &p)
-{
-  this->ptr_ = ACE_const_cast (ListenPoint_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-IIOP::ListenPoint_out &
-IIOP::ListenPoint_out::operator= (ListenPoint *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-IIOP::ListenPoint_out::operator ::IIOP::ListenPoint *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *&
-IIOP::ListenPoint_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::ListenPoint *
-IIOP::ListenPoint_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CI_
-
-ACE_INLINE
-IIOP::ListenPoint *
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (CORBA::ULong size)
-{
-  IIOP::ListenPoint *retval = 0;
-  ACE_NEW_RETURN (retval, IIOP::ListenPoint[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (IIOP::ListenPoint *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (void)
-{
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    IIOP::ListenPoint *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (
-    const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      IIOP::ListenPoint *tmp1 =
-        _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->maximum_);
-      IIOP::ListenPoint * const tmp2 =
-        ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList &
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator= (
-    const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          IIOP::ListenPoint *tmp =
-            ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  IIOP::ListenPoint *tmp1 =
-    ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_);
-  IIOP::ListenPoint * const tmp2 =
-    ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-IIOP::ListenPoint &
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  IIOP::ListenPoint* tmp =
-    ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const IIOP::ListenPoint &
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  IIOP::ListenPoint * const tmp =
-    ACE_reinterpret_cast (IIOP::ListenPoint* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-IIOP::ListenPoint *
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (CORBA::Boolean orphan)
-{
-  IIOP::ListenPoint *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const IIOP::ListenPoint *
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const IIOP::ListenPoint * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    IIOP::ListenPoint *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      IIOP::ListenPoint *tmp =
-        ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_);
-      _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IIOP_LISTENPOINTLIST_CI_)
-#define _IIOP_LISTENPOINTLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class IIOP::ListenPointList_var
-// *************************************************************
-
-ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (ListenPointList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IIOP::ListenPointList_var::ListenPointList_var (const ::IIOP::ListenPointList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IIOP::ListenPointList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var::~ListenPointList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var &
-IIOP::ListenPointList_var::operator= (ListenPointList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList_var &
-IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ListenPointList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ListenPointList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ListenPointList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::IIOP::ListenPointList *
-IIOP::ListenPointList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *
-IIOP::ListenPointList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var::operator const ::IIOP::ListenPointList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IIOP::ListenPointList_var::operator ::IIOP::ListenPointList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint &
-IIOP::ListenPointList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const IIOP::ListenPoint &
-IIOP::ListenPointList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const IIOP::ListenPoint &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::IIOP::ListenPointList &
-IIOP::ListenPointList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList &
-IIOP::ListenPointList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *&
-IIOP::ListenPointList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *
-IIOP::ListenPointList_var::_retn (void)
-{
-  ::IIOP::ListenPointList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *
-IIOP::ListenPointList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class IIOP::ListenPointList_out
-// *************************************************************
-
-ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (ListenPointList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_out::ListenPointList_out (const ::IIOP::ListenPointList_out &p)
-  : ptr_ (ACE_const_cast (ListenPointList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::IIOP::ListenPointList_out &
-IIOP::ListenPointList_out::operator= (const ::IIOP::ListenPointList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ListenPointList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList_out &
-IIOP::ListenPointList_out::operator= (ListenPointList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IIOP::ListenPointList_out::operator ::IIOP::ListenPointList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *&
-IIOP::ListenPointList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::IIOP::ListenPointList *
-IIOP::ListenPointList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::ListenPoint &
-IIOP::ListenPointList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class IIOP::BiDirIIOPServiceContext_var
-// *************************************************************
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (BiDirIIOPServiceContext *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (const ::IIOP::BiDirIIOPServiceContext_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::~BiDirIIOPServiceContext_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var &
-IIOP::BiDirIIOPServiceContext_var::operator= (BiDirIIOPServiceContext *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::IIOP::BiDirIIOPServiceContext_var &
-IIOP::BiDirIIOPServiceContext_var::operator= (const ::IIOP::BiDirIIOPServiceContext_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          BiDirIIOPServiceContext *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              BiDirIIOPServiceContext (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              BiDirIIOPServiceContext *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::operator const ::IIOP::BiDirIIOPServiceContext &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::IIOP::BiDirIIOPServiceContext &
-IIOP::BiDirIIOPServiceContext_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext &
-IIOP::BiDirIIOPServiceContext_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *&
-IIOP::BiDirIIOPServiceContext_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_var::_retn (void)
-{
-  ::IIOP::BiDirIIOPServiceContext *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class IIOP::BiDirIIOPServiceContext_out
-// *************************************************************
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (::IIOP::BiDirIIOPServiceContext *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (const ::IIOP::BiDirIIOPServiceContext_out &p)
-  : ptr_ (ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_)
-{}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out &
-IIOP::BiDirIIOPServiceContext_out::operator= (const ::IIOP::BiDirIIOPServiceContext_out &p)
-{
-  this->ptr_ = ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-IIOP::BiDirIIOPServiceContext_out &
-IIOP::BiDirIIOPServiceContext_out::operator= (BiDirIIOPServiceContext *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-IIOP::BiDirIIOPServiceContext_out::operator ::IIOP::BiDirIIOPServiceContext *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *&
-IIOP::BiDirIIOPServiceContext_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IIOP::BiDirIIOPServiceContext *
-IIOP::BiDirIIOPServiceContext_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -960,7 +80,7 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 4c018e43109..befdc3f9ef7 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -34,7 +34,6 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -42,4 +41,3 @@
 #if !defined (__ACE_INLINE__)
 #include "IOPC.i"
 #endif /* !defined INLINE */
-
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 9d4e79b9ff6..11bd39b63a2 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -24,7 +24,6 @@
 
 #ifndef _TAO_IDL_ORIG_IOPC_H_
 #define _TAO_IDL_ORIG_IOPC_H_
-
 #include "ace/pre.h"
 
 #include "tao/corbafwd.h"
@@ -33,10 +32,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+#include "tao/IOP_IORC.h"
+#include "tao/IOP_CodecC.h"
+#include "tao/Any_T.h"
+#include "tao/VarOut_T.h"
 
-#include "TAO_Export.h"
-#include "IOP_IORC.h"
-#include "IOP_CodecC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -64,15 +65,7 @@
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
 
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1018
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IOPC.i"
@@ -88,4 +81,3 @@
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
index e86a7e25a26..95f0b8ea192 100644
--- a/TAO/tao/IOPC.i
+++ b/TAO/tao/IOPC.i
@@ -18,5 +18,3 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index 2a01d8d4461..f16bc80a0b9 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -23,7 +23,7 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
-#include "IORManipulation.h"
+#include "IORManip_Loader.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -34,8 +34,6 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -44,7 +42,7 @@
 #include "IORC.i"
 #endif /* !defined INLINE */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
@@ -126,7 +124,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -139,7 +137,7 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -156,20 +154,20 @@ static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456d7074), 
-  ACE_NTOHL (0x7950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
     17,
-  ACE_NTOHL (0x456d7074), 
-  ACE_NTOHL (0x7950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = EmptyProfileList
   0, // member count
   };
@@ -191,7 +189,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::NotFound::NotFound (void)
@@ -273,7 +271,7 @@ void TAO_IOP::NotFound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -286,7 +284,7 @@ void TAO_IOP::NotFound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -303,16 +301,16 @@ static const CORBA::Long _oc_TAO_IOP_NotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   25,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
     9,
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
   };
@@ -334,7 +332,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Duplicate::Duplicate (void)
@@ -416,7 +414,7 @@ void TAO_IOP::Duplicate::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -429,7 +427,7 @@ void TAO_IOP::Duplicate::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -446,16 +444,16 @@ static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
     10,
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
   ACE_NTOHL (0x65000000),  // name = Duplicate
   0, // member count
   };
@@ -477,7 +475,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
@@ -559,7 +557,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -572,7 +570,7 @@ void TAO_IOP::Invalid_IOR::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -589,16 +587,16 @@ static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69645f), 
-  ACE_NTOHL (0x494f523a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69645f),
+  ACE_NTOHL (0x494f523a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
     12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69645f),
   ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
   0, // member count
   };
@@ -620,7 +618,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::MultiProfileList::MultiProfileList (void)
@@ -702,7 +700,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -715,7 +713,7 @@ void TAO_IOP::MultiProfileList::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -732,20 +730,20 @@ static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x6950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x6950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
     17,
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x6950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x6950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = MultiProfileList
   0, // member count
   };
@@ -773,7 +771,7 @@ TAO_NAMESPACE_END
 int TAO_IOP::TAO_IOR_Property::_tao_class_id = 0;
 
 TAO_IOP::TAO_IOR_Property_ptr
-tao_TAO_IOP_TAO_IOR_Property_duplicate (
+TAO_IOP::tao_TAO_IOR_Property_life::tao_duplicate (
     TAO_IOP::TAO_IOR_Property_ptr p
   )
 {
@@ -781,7 +779,7 @@ tao_TAO_IOP_TAO_IOR_Property_duplicate (
 }
 
 void
-tao_TAO_IOP_TAO_IOR_Property_release (
+TAO_IOP::tao_TAO_IOR_Property_life::tao_release (
     TAO_IOP::TAO_IOR_Property_ptr p
   )
 {
@@ -789,15 +787,24 @@ tao_TAO_IOP_TAO_IOR_Property_release (
 }
 
 TAO_IOP::TAO_IOR_Property_ptr
-tao_TAO_IOP_TAO_IOR_Property_nil (
+TAO_IOP::tao_TAO_IOR_Property_life::tao_nil (
     void
   )
 {
   return TAO_IOP::TAO_IOR_Property::_nil ();
 }
 
+CORBA::Boolean
+TAO_IOP::tao_TAO_IOR_Property_life::tao_marshal (
+    TAO_IOP::TAO_IOR_Property_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 TAO_IOP::TAO_IOR_Property_ptr
-tao_TAO_IOP_TAO_IOR_Property_narrow (
+TAO_IOP::tao_TAO_IOR_Property_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -806,7 +813,7 @@ tao_TAO_IOP_TAO_IOR_Property_narrow (
 }
 
 CORBA::Object *
-tao_TAO_IOP_TAO_IOR_Property_upcast (
+TAO_IOP::tao_TAO_IOR_Property_cast::tao_upcast (
     void *src
   )
 {
@@ -815,205 +822,32 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_TAO_IOP_TAO_IOR_Property_marshal (
-    TAO_IOP::TAO_IOR_Property_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Property_var
-// *************************************************************
-
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void)
-  : ptr_ (TAO_IOR_Property::_nil ())
-{}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p)
-  : TAO_Base_var (),
-    ptr_ (TAO_IOR_Property::_duplicate (p.ptr ()))
-{}
-
-TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-TAO_IOP::TAO_IOR_Property_var &
-TAO_IOP::TAO_IOR_Property_var::operator= (TAO_IOR_Property_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_var &
-TAO_IOP::TAO_IOR_Property_var::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_var::operator const ::TAO_IOP::TAO_IOR_Property_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_IOP::TAO_IOR_Property_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-  return val;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::tao_duplicate (TAO_IOR_Property_ptr p)
-{
-  return ::TAO_IOP::TAO_IOR_Property::_duplicate (p);
-}
-
-void
-TAO_IOP::TAO_IOR_Property_var::tao_release (TAO_IOR_Property_ptr p)
-{
-  CORBA::release (p);
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::tao_nil (void)
-{
-  return ::TAO_IOP::TAO_IOR_Property::_nil ();
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-TAO_IOP::TAO_IOR_Property_var::tao_upcast (void *src)
-{
-  TAO_IOR_Property **tmp =
-    ACE_static_cast (TAO_IOR_Property **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        TAO_IOP::TAO_IOR_Property,
+        TAO_IOP::tao_TAO_IOR_Property_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        TAO_IOP::TAO_IOR_Property,
+        TAO_IOP::tao_TAO_IOR_Property_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        TAO_IOP::TAO_IOR_Property, \
+        TAO_IOP::tao_TAO_IOR_Property_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        TAO_IOP::TAO_IOR_Property, \
+        TAO_IOP::tao_TAO_IOR_Property_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Property_out
-// *************************************************************
-
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-}
-
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-}
-
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (const ::TAO_IOP::TAO_IOR_Property_out &p)
-  : ptr_ (ACE_const_cast (TAO_IOR_Property_out &, p).ptr_)
-{}
-
-::TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOR_Property_out&, p).ptr_;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (TAO_IOR_Property_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Property_out::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 {}
@@ -1021,7 +855,7 @@ TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
-void 
+void
 TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer)
 {
   TAO_IOR_Property *tmp = ACE_static_cast (TAO_IOR_Property *, _tao_void_pointer);
@@ -1037,7 +871,7 @@ TAO_IOP::TAO_IOR_Property::_narrow (
   return TAO_IOR_Property::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_IOP::TAO_IOR_Property_ptr 
+TAO_IOP::TAO_IOR_Property_ptr
 TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1047,7 +881,7 @@ TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     {
       return TAO_IOR_Property::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           TAO_IOR_Property_ptr,
@@ -1067,14 +901,14 @@ TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Property)::_tao_class_id)
@@ -1093,12 +927,12 @@ void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1107,6 +941,12 @@ const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Property:1.0";
 }
 
+CORBA::Boolean
+TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1114,20 +954,20 @@ static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Property[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f525f), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727479), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727479),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Property:1.0
     17,
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f525f), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727479), 
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727479),
   ACE_NTOHL (0x0),  // name = TAO_IOR_Property
   };
 
@@ -1154,7 +994,7 @@ TAO_NAMESPACE_END
 int TAO_IOP::TAO_IOR_Manipulation::_tao_class_id = 0;
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
-tao_TAO_IOP_TAO_IOR_Manipulation_duplicate (
+TAO_IOP::tao_TAO_IOR_Manipulation_life::tao_duplicate (
     TAO_IOP::TAO_IOR_Manipulation_ptr p
   )
 {
@@ -1162,7 +1002,7 @@ tao_TAO_IOP_TAO_IOR_Manipulation_duplicate (
 }
 
 void
-tao_TAO_IOP_TAO_IOR_Manipulation_release (
+TAO_IOP::tao_TAO_IOR_Manipulation_life::tao_release (
     TAO_IOP::TAO_IOR_Manipulation_ptr p
   )
 {
@@ -1170,15 +1010,24 @@ tao_TAO_IOP_TAO_IOR_Manipulation_release (
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
-tao_TAO_IOP_TAO_IOR_Manipulation_nil (
+TAO_IOP::tao_TAO_IOR_Manipulation_life::tao_nil (
     void
   )
 {
   return TAO_IOP::TAO_IOR_Manipulation::_nil ();
 }
 
+CORBA::Boolean
+TAO_IOP::tao_TAO_IOR_Manipulation_life::tao_marshal (
+    TAO_IOP::TAO_IOR_Manipulation_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 TAO_IOP::TAO_IOR_Manipulation_ptr
-tao_TAO_IOP_TAO_IOR_Manipulation_narrow (
+TAO_IOP::tao_TAO_IOR_Manipulation_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1187,7 +1036,7 @@ tao_TAO_IOP_TAO_IOR_Manipulation_narrow (
 }
 
 CORBA::Object *
-tao_TAO_IOP_TAO_IOR_Manipulation_upcast (
+TAO_IOP::tao_TAO_IOR_Manipulation_cast::tao_upcast (
     void *src
   )
 {
@@ -1196,205 +1045,32 @@ tao_TAO_IOP_TAO_IOR_Manipulation_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_TAO_IOP_TAO_IOR_Manipulation_marshal (
-    TAO_IOP::TAO_IOR_Manipulation_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Manipulation_var
-// *************************************************************
-
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void)
-  : ptr_ (TAO_IOR_Manipulation::_nil ())
-{}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
-  : TAO_Base_var (),
-    ptr_ (TAO_IOR_Manipulation::_duplicate (p.ptr ()))
-{}
-
-TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (TAO_IOR_Manipulation_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var::operator const ::TAO_IOP::TAO_IOR_Manipulation_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_IOP::TAO_IOR_Manipulation_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return val;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::tao_duplicate (TAO_IOR_Manipulation_ptr p)
-{
-  return ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p);
-}
-
-void
-TAO_IOP::TAO_IOR_Manipulation_var::tao_release (TAO_IOR_Manipulation_ptr p)
-{
-  CORBA::release (p);
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::tao_nil (void)
-{
-  return ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-TAO_IOP::TAO_IOR_Manipulation_var::tao_upcast (void *src)
-{
-  TAO_IOR_Manipulation **tmp =
-    ACE_static_cast (TAO_IOR_Manipulation **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        TAO_IOP::TAO_IOR_Manipulation,
+        TAO_IOP::tao_TAO_IOR_Manipulation_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        TAO_IOP::TAO_IOR_Manipulation,
+        TAO_IOP::tao_TAO_IOR_Manipulation_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        TAO_IOP::TAO_IOR_Manipulation, \
+        TAO_IOP::tao_TAO_IOR_Manipulation_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        TAO_IOP::TAO_IOR_Manipulation, \
+        TAO_IOP::tao_TAO_IOR_Manipulation_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Manipulation_out
-// *************************************************************
-
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const ::TAO_IOP::TAO_IOR_Manipulation_out &p)
-  : ptr_ (ACE_const_cast (TAO_IOR_Manipulation_out &, p).ptr_)
-{}
-
-::TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOR_Manipulation_out&, p).ptr_;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (TAO_IOR_Manipulation_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_IOP::TAO_IOR_Manipulation_out::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 {}
@@ -1402,7 +1078,7 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
-void 
+void
 TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *_tao_void_pointer)
 {
   TAO_IOR_Manipulation *tmp = ACE_static_cast (TAO_IOR_Manipulation *, _tao_void_pointer);
@@ -1418,7 +1094,7 @@ TAO_IOP::TAO_IOR_Manipulation::_narrow (
   return TAO_IOR_Manipulation::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_IOP::TAO_IOR_Manipulation_ptr 
+TAO_IOP::TAO_IOR_Manipulation_ptr
 TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1428,7 +1104,7 @@ TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     {
       return TAO_IOR_Manipulation::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           TAO_IOR_Manipulation_ptr,
@@ -1448,14 +1124,14 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Manipulation)::_tao_class_id)
@@ -1474,12 +1150,12 @@ void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1488,161 +1164,48 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Object **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = CORBA::Object::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Object::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Object::_nil ();
-    }
-}
-
-void 
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
+CORBA::Boolean
+TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
 {
-  CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, target);
-  *tmp = CORBA::Object::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  return 0;
 }
 
-CORBA::Object*
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_upcast (void *src) const
-{
-  CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// TAO_IOP::TAO_IOR_Manipulation::IORList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
 {}
 
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Pseudo_Sequence<
+        CORBA::Object,
+        CORBA::Object_var
+      >
+    (max)
 {}
 
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::Object_ptr *buffer,
+    CORBA::Object_ptr* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Pseudo_Sequence<
+        CORBA::Object,
+        CORBA::Object_var
+      >
+    (max, length, buffer, release)
 {}
 
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Pseudo_Sequence<
+        CORBA::Object,
+        CORBA::Object_var
+      >
+    (seq)
 {}
 
-TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
+TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void)
 {}
 
 void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *_tao_void_pointer)
@@ -1651,7 +1214,49 @@ void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *_tao_voi
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      TAO_IOP::TAO_IOR_Manipulation::IORList,
+      TAO_Pseudo_Object_Manager<
+          CORBA::Object,
+          CORBA::Object_var
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      TAO_IOP::TAO_IOR_Manipulation::IORList,
+      TAO_IOP::TAO_IOR_Manipulation::IORList_var,
+      TAO_Pseudo_Object_Manager<
+          CORBA::Object,
+          CORBA::Object_var
+        >
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_MngSeq_Var_T< \
+      TAO_IOP::TAO_IOR_Manipulation::IORList, \
+      TAO_Pseudo_Object_Manager< \
+          CORBA::Object, \
+          CORBA::Object_var \
+        > \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      TAO_IOP::TAO_IOR_Manipulation::IORList, \
+      TAO_IOP::TAO_IOR_Manipulation::IORList_var, \
+      TAO_Pseudo_Object_Manager< \
+          CORBA::Object, \
+          CORBA::Object_var \
+        > \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -1660,25 +1265,41 @@ static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_IORList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f525f), 
-  ACE_NTOHL (0x4d616e69), 
-  ACE_NTOHL (0x70756c61), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x2f494f52), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x4d616e69),
+  ACE_NTOHL (0x70756c61),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x2f494f52),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0
     8,
-  ACE_NTOHL (0x494f524c), 
+  ACE_NTOHL (0x494f524c),
   ACE_NTOHL (0x69737400),  // name = IORList
     CORBA::tk_sequence, // typecode kind
-  60, // encapsulation length
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-        0U,
+    CORBA::tk_objref,
+    52, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      29,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f4f62),
+      ACE_NTOHL (0x6a656374),
+      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
+            7,
+      ACE_NTOHL (0x4f626a65),
+      ACE_NTOHL (0x63740000),  // name = Object
+
+    0U,
 
 };
 
@@ -1700,22 +1321,22 @@ static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f525f), 
-  ACE_NTOHL (0x4d616e69), 
-  ACE_NTOHL (0x70756c61), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x4d616e69),
+  ACE_NTOHL (0x70756c61),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/TAO_IOR_Manipulation:1.0
     21,
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f525f), 
-  ACE_NTOHL (0x4d616e69), 
-  ACE_NTOHL (0x70756c61), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f525f),
+  ACE_NTOHL (0x4d616e69),
+  ACE_NTOHL (0x70756c61),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = TAO_IOR_Manipulation
   };
 
@@ -1736,7 +1357,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1798,10 +1419,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1863,10 +1484,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::NotFound \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1928,10 +1549,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1993,10 +1614,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2058,7 +1679,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -2168,4 +1789,3 @@ operator>>= (
 # pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation, TAO_IOP::TAO_IOR_Manipulation_var>
 # pragma instantiate TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 23fd74a2366..da743c0d3d4 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -26,7 +26,7 @@
 #define _TAO_IDL_ORIG_IORC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/Exception.h"
 
 #ifndef TAO_IORMANIP_SAFE_INCLUDE
 #error "You should not include IORC.h directly, use IORManip_Loader.h"
@@ -37,7 +37,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ior_manip_export.h"
-#include "tao/Exception.h"
 #include "tao/Object.h"
 #include "tao/Sequence.h"
 #include "tao/Any_T.h"
@@ -70,25 +69,25 @@
 
 TAO_NAMESPACE  TAO_IOP
 {
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_)
 #define _TAO_IOP_EMPTYPROFILELIST_CH_
-  
+
   class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException
   {
   public:
-    
+
     EmptyProfileList (void);
     EmptyProfileList (const EmptyProfileList &);
     ~EmptyProfileList (void);
 
     EmptyProfileList &operator= (const EmptyProfileList &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static EmptyProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -100,43 +99,43 @@ TAO_NAMESPACE  TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EmptyProfileList;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_NOTFOUND_CH_)
 #define _TAO_IOP_NOTFOUND_CH_
-  
+
   class TAO_IORManip_Export NotFound : public CORBA::UserException
   {
   public:
-    
+
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -148,43 +147,43 @@ TAO_NAMESPACE  TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_DUPLICATE_CH_)
 #define _TAO_IOP_DUPLICATE_CH_
-  
+
   class TAO_IORManip_Export Duplicate : public CORBA::UserException
   {
   public:
-    
+
     Duplicate (void);
     Duplicate (const Duplicate &);
     ~Duplicate (void);
 
     Duplicate &operator= (const Duplicate &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static Duplicate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -196,43 +195,43 @@ TAO_NAMESPACE  TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Duplicate;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_INVALID_IOR_CH_)
 #define _TAO_IOP_INVALID_IOR_CH_
-  
+
   class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
   {
   public:
-    
+
     Invalid_IOR (void);
     Invalid_IOR (const Invalid_IOR &);
     ~Invalid_IOR (void);
 
     Invalid_IOR &operator= (const Invalid_IOR &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static Invalid_IOR *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -244,43 +243,43 @@ TAO_NAMESPACE  TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Invalid_IOR;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
 #define _TAO_IOP_MULTIPROFILELIST_CH_
-  
+
   class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
   {
   public:
-    
+
     MultiProfileList (void);
     MultiProfileList (const MultiProfileList &);
     ~MultiProfileList (void);
 
     MultiProfileList &operator= (const MultiProfileList &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static MultiProfileList *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -292,114 +291,77 @@ TAO_NAMESPACE  TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_TAO_IOP_TAO_IOR_PROPERTY__ODDS_N_ENDS_CH_)
+#define _TAO_IOP_TAO_IOR_PROPERTY__ODDS_N_ENDS_CH_
 
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_PROPERTY___PTR_CH_
-  
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY___VAR_CH_)
-#define _TAO_IOP_TAO_IOR_PROPERTY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IORManip_Export TAO_IOR_Property_var : public TAO_Base_var
+  struct tao_TAO_IOR_Property_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        TAO_IOR_Property,
+        tao_TAO_IOR_Property_life
+      >
+    TAO_IOR_Property_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        TAO_IOR_Property,
+        tao_TAO_IOR_Property_life
+      >
+    TAO_IOR_Property_out;
+
+  struct TAO_IORManip_Export tao_TAO_IOR_Property_life
   {
-  public:
-    TAO_IOR_Property_var (void); // default constructor
-    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {} 
-    TAO_IOR_Property_var (const TAO_IOR_Property_var &); // copy constructor
-    ~TAO_IOR_Property_var (void); // destructor
-    
-    TAO_IOR_Property_var &operator= (TAO_IOR_Property_ptr);
-    TAO_IOR_Property_var &operator= (const TAO_IOR_Property_var &);
-    TAO_IOR_Property_ptr operator-> (void) const;
-    
-    operator const TAO_IOR_Property_ptr &() const;
-    operator TAO_IOR_Property_ptr &();
-    // in, inout, out, _retn 
-    TAO_IOR_Property_ptr in (void) const;
-    TAO_IOR_Property_ptr &inout (void);
-    TAO_IOR_Property_ptr &out (void);
-    TAO_IOR_Property_ptr _retn (void);
-    TAO_IOR_Property_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static TAO_IOR_Property_ptr tao_duplicate (TAO_IOR_Property_ptr);
     static void tao_release (TAO_IOR_Property_ptr);
     static TAO_IOR_Property_ptr tao_nil (void);
-    static TAO_IOR_Property_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        TAO_IOR_Property_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    TAO_IOR_Property_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    TAO_IOR_Property_var (const TAO_Base_var &rhs);
-    TAO_IOR_Property_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY___OUT_CH_)
-#define _TAO_IOP_TAO_IOR_PROPERTY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IORManip_Export TAO_IOR_Property_out
+  struct TAO_IORManip_Export tao_TAO_IOR_Property_cast
   {
-  public:
-    TAO_IOR_Property_out (TAO_IOR_Property_ptr &);
-    TAO_IOR_Property_out (TAO_IOR_Property_var &);
-    TAO_IOR_Property_out (const TAO_IOR_Property_out &);
-    TAO_IOR_Property_out &operator= (const TAO_IOR_Property_out &);
-    TAO_IOR_Property_out &operator= (const TAO_IOR_Property_var &);
-    TAO_IOR_Property_out &operator= (TAO_IOR_Property_ptr);
-    operator TAO_IOR_Property_ptr &();
-    TAO_IOR_Property_ptr &ptr (void);
-    TAO_IOR_Property_ptr operator-> (void);
-  
-  private:
-    TAO_IOR_Property_ptr &ptr_;
+    static TAO_IOR_Property_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
-  
+
   class TAO_IORManip_Export TAO_IOR_Property
     : public virtual CORBA::Object
   {
@@ -407,30 +369,30 @@ TAO_NAMESPACE  TAO_IOP
     typedef TAO_IOR_Property_ptr _ptr_type;
     typedef TAO_IOR_Property_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-    
+
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TAO_IOR_Property_ptr _nil (void)
       {
         return (TAO_IOR_Property_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_property (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -439,10 +401,10 @@ TAO_NAMESPACE  TAO_IOP
         CORBA::SystemException
         , TAO_IOP::Invalid_IOR
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_primary (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -453,10 +415,10 @@ TAO_NAMESPACE  TAO_IOP
         , TAO_IOP::Duplicate
         , TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr get_primary (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -465,10 +427,10 @@ TAO_NAMESPACE  TAO_IOP
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_primary_set (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -476,124 +438,83 @@ TAO_NAMESPACE  TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     TAO_IOR_Property (void);
     virtual ~TAO_IOR_Property (void);
-    
-    friend class _TAO_TAO_IOR_Property_Remote_Proxy_Impl;
-    friend class _TAO_TAO_IOR_Property_ThruPOA_Proxy_Impl;
-    friend class _TAO_TAO_IOR_Property_Direct_Proxy_Impl;
-  
+
   private:
     TAO_IOR_Property (const TAO_IOR_Property &);
     void operator= (const TAO_IOR_Property &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Property;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__ODDS_N_ENDS_CH_)
+#define _TAO_IOP_TAO_IOR_MANIPULATION__ODDS_N_ENDS_CH_
 
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_
-  
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IORManip_Export TAO_IOR_Manipulation_var : public TAO_Base_var
+  struct tao_TAO_IOR_Manipulation_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        TAO_IOR_Manipulation,
+        tao_TAO_IOR_Manipulation_life
+      >
+    TAO_IOR_Manipulation_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        TAO_IOR_Manipulation,
+        tao_TAO_IOR_Manipulation_life
+      >
+    TAO_IOR_Manipulation_out;
+
+  struct TAO_IORManip_Export tao_TAO_IOR_Manipulation_life
   {
-  public:
-    TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {} 
-    TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
-    ~TAO_IOR_Manipulation_var (void); // destructor
-    
-    TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
-    TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_ptr operator-> (void) const;
-    
-    operator const TAO_IOR_Manipulation_ptr &() const;
-    operator TAO_IOR_Manipulation_ptr &();
-    // in, inout, out, _retn 
-    TAO_IOR_Manipulation_ptr in (void) const;
-    TAO_IOR_Manipulation_ptr &inout (void);
-    TAO_IOR_Manipulation_ptr &out (void);
-    TAO_IOR_Manipulation_ptr _retn (void);
-    TAO_IOR_Manipulation_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static TAO_IOR_Manipulation_ptr tao_duplicate (TAO_IOR_Manipulation_ptr);
     static void tao_release (TAO_IOR_Manipulation_ptr);
     static TAO_IOR_Manipulation_ptr tao_nil (void);
-    static TAO_IOR_Manipulation_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        TAO_IOR_Manipulation_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    TAO_IOR_Manipulation_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    TAO_IOR_Manipulation_var (const TAO_Base_var &rhs);
-    TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IORManip_Export TAO_IOR_Manipulation_out
+  struct TAO_IORManip_Export tao_TAO_IOR_Manipulation_cast
   {
-  public:
-    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &);
-    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_out (const TAO_IOR_Manipulation_out &);
-    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_out &);
-    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_var &);
-    TAO_IOR_Manipulation_out &operator= (TAO_IOR_Manipulation_ptr);
-    operator TAO_IOR_Manipulation_ptr &();
-    TAO_IOR_Manipulation_ptr &ptr (void);
-    TAO_IOR_Manipulation_ptr operator-> (void);
-  
-  private:
-    TAO_IOR_Manipulation_ptr &ptr_;
+    static TAO_IOR_Manipulation_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-  
+
   class TAO_IORManip_Export TAO_IOR_Manipulation
     : public virtual CORBA::Object
   {
@@ -601,208 +522,85 @@ TAO_NAMESPACE  TAO_IOP
     typedef TAO_IOR_Manipulation_ptr _ptr_type;
     typedef TAO_IOR_Manipulation_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-    
+
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TAO_IOR_Manipulation_ptr _nil (void)
       {
         return (TAO_IOR_Manipulation_ptr)0;
       }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-    
-    class TAO_IORManip_Export _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          CORBA::Object* *value,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
-          const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
-        );
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &operator= (
-          const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
-        );
-      virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-      
-      // = Accessors.
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const;
-      
-      // = Static operations.
-      static CORBA::Object **allocbuf (CORBA::ULong nelems);
-      static void freebuf (CORBA::Object **buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA::Object* *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::Object* *get_buffer (void) const;
-      virtual void _shrink_buffer (
-          CORBA::ULong nl,
-          CORBA::ULong ol
-        );
-      
-      virtual void _downcast (
-          void* target,
-          CORBA::Object *src
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        );
-      virtual CORBA::Object* _upcast (void *src) const;
-    };
-
-#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    static void _tao_any_destructor (void *);
 
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
     class IORList;
-    class IORList_var;
-    
-    // *************************************************************
-    // TAO_IOP::TAO_IOR_Manipulation::IORList
-    // *************************************************************
-    
-    class TAO_IORManip_Export IORList : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+    typedef
+      TAO_MngSeq_Var_T<
+          IORList,
+          TAO_Pseudo_Object_Manager<
+              CORBA::Object,
+              CORBA::Object
+            >
+        >
+      IORList_var;
+
+    typedef
+      TAO_MngSeq_Out_T<
+          IORList,
+          IORList_var,
+          TAO_Pseudo_Object_Manager<
+              CORBA::Object,
+              CORBA::Object
+            >
+        >
+      IORList_out;
+
+    class TAO_IORManip_Export IORList
+      : public
+          TAO_Unbounded_Pseudo_Sequence<
+              CORBA::Object,
+              CORBA::Object_var
+            >
     {
     public:
       IORList (void);
       IORList (CORBA::ULong max);
       IORList (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          CORBA::Object_ptr *buffer, 
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA::Object_ptr* buffer,
           CORBA::Boolean release = 0
         );
       IORList (const IORList &);
       ~IORList (void);
-      
-      static void _tao_any_destructor (void*);
-      
-      typedef IORList_var _var_type;
-    };
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-    
-    // *************************************************************
-    // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-    // *************************************************************
-    
-    class TAO_IORManip_Export IORList_var
-    {
-    public:
-      IORList_var (void);
-      IORList_var (IORList *);
-      IORList_var (const IORList_var &);
-      ~IORList_var (void);
-      
-      IORList_var &operator= (IORList *);
-      IORList_var &operator= (const IORList_var &);
-      IORList *operator-> (void);
-      const IORList *operator-> (void) const;
-      
-      operator const IORList &() const;
-      operator IORList &();
-      operator IORList &() const;
-      
-      // Variable-size base types only.
-      operator IORList *&();
-      
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-      
-      // in, inout, out, _retn 
-      const IORList &in (void) const;
-      IORList &inout (void);
-      IORList *&out (void);
-      IORList *_retn (void);
-      IORList *ptr (void) const;
-    
-    private:
-      IORList *ptr_;
-    };
 
-#endif /* end #if !defined */
+      static void _tao_any_destructor (void *);
 
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-    
-    class TAO_IORManip_Export IORList_out
-    {
-    public:
-      IORList_out (IORList *&);
-      IORList_out (IORList_var &);
-      IORList_out (const IORList_out &);
-      IORList_out &operator= (const IORList_out &);
-      IORList_out &operator= (IORList *);
-      operator IORList *&();
-      IORList *&ptr (void);
-      IORList *operator-> (void);
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-    
-    private:
-      IORList *&ptr_;
-      // Assignment from T_var not allowed.
-      void operator= (const IORList_var &);
+      typedef IORList_var _var_type;
     };
 
-#endif /* end #if !defined */
-    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_IORList;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr merge_iors (
         const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -813,10 +611,10 @@ TAO_NAMESPACE  TAO_IOP
         , TAO_IOP::Duplicate
         , TAO_IOP::Invalid_IOR
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr add_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -828,10 +626,10 @@ TAO_NAMESPACE  TAO_IOP
         , TAO_IOP::Duplicate
         , TAO_IOP::Invalid_IOR
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr remove_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -843,10 +641,10 @@ TAO_NAMESPACE  TAO_IOP
         , TAO_IOP::EmptyProfileList
         , TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_property (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -857,10 +655,10 @@ TAO_NAMESPACE  TAO_IOP
         , TAO_IOP::Invalid_IOR
         , TAO_IOP::Duplicate
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior1,
@@ -874,10 +672,10 @@ TAO_NAMESPACE  TAO_IOP
         , TAO_IOP::MultiProfileList
         , TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr get_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -887,10 +685,10 @@ TAO_NAMESPACE  TAO_IOP
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean is_primary_set (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
@@ -899,10 +697,10 @@ TAO_NAMESPACE  TAO_IOP
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong is_in_ior (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
@@ -912,10 +710,10 @@ TAO_NAMESPACE  TAO_IOP
         CORBA::SystemException
         , TAO_IOP::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_profile_count (
         CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -924,33 +722,29 @@ TAO_NAMESPACE  TAO_IOP
         CORBA::SystemException
         , TAO_IOP::EmptyProfileList
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     TAO_IOR_Manipulation (void);
     virtual ~TAO_IOR_Manipulation (void);
-    
-    friend class _TAO_TAO_IOR_Manipulation_Remote_Proxy_Impl;
-    friend class _TAO_TAO_IOR_Manipulation_ThruPOA_Proxy_Impl;
-    friend class _TAO_TAO_IOR_Manipulation_Direct_Proxy_Impl;
-  
+
   private:
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
     void operator= (const TAO_IOR_Manipulation &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation;
 
 // TAO_IDL - Generated from
@@ -1062,7 +856,7 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IORC.i"
@@ -1078,4 +872,3 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index d9ffd5b1525..1b26f72c621 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -26,13 +26,6 @@
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___CI_)
 #define _TAO_IOP_TAO_IOR_PROPERTY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-TAO_IOP::TAO_IOR_Property::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -62,451 +55,12 @@ TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
-
-ACE_INLINE
-CORBA::Object **
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::Object **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::Object*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = CORBA::Object::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (CORBA::Object **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void)
-{
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Object* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(
-    const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::Object **tmp1 =
-        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
-      CORBA::Object ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator= (
-    const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::Object **tmp =
-        ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = CORBA::Object::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::Object **tmp1 =
-    ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
-  
-  CORBA::Object ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::Object ** const tmp =
-    ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::Object,CORBA::Object_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::Object* *
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Object **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::Object**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::Object* *
-TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Object ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (IORList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::IORList_var (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::~IORList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (IORList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          IORList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              IORList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              IORList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator const ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::TAO_IOP::TAO_IOR_Manipulation::IORList &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList *&
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::_retn (void)
-{
-  ::TAO_IOP::TAO_IOR_Manipulation::IORList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation::IORList_out
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (IORList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::IORList_out (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &p)
-  : ptr_ (ACE_const_cast (IORList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_out &p)
-{
-  this->ptr_ = ACE_const_cast (IORList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList_out &
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (IORList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList *&
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::TAO_IOP::TAO_IOR_Manipulation::IORList *
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
-TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___CI_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___CI_
 
-ACE_INLINE
-CORBA::Boolean
-TAO_IOP::TAO_IOR_Manipulation::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -537,7 +91,7 @@ TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -566,7 +120,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -595,7 +149,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -624,7 +178,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -653,7 +207,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -680,4 +234,3 @@ CORBA::Boolean operator>> (
 {
   return 1;
 }
-
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index 79c6d54b828..10d75a0b896 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -120,7 +119,7 @@ void IORTable::AlreadyBound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -133,7 +132,7 @@ void IORTable::AlreadyBound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -215,7 +214,7 @@ void IORTable::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -228,7 +227,7 @@ void IORTable::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -240,7 +239,7 @@ void IORTable::NotFound::_tao_decode (
 int IORTable::Table::_tao_class_id = 0;
 
 IORTable::Table_ptr
-tao_IORTable_Table_duplicate (
+IORTable::tao_Table_life::tao_duplicate (
     IORTable::Table_ptr p
   )
 {
@@ -248,7 +247,7 @@ tao_IORTable_Table_duplicate (
 }
 
 void
-tao_IORTable_Table_release (
+IORTable::tao_Table_life::tao_release (
     IORTable::Table_ptr p
   )
 {
@@ -256,231 +255,67 @@ tao_IORTable_Table_release (
 }
 
 IORTable::Table_ptr
-tao_IORTable_Table_nil (
+IORTable::tao_Table_life::tao_nil (
     void
   )
 {
   return IORTable::Table::_nil ();
 }
 
-IORTable::Table_ptr
-tao_IORTable_Table_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_IORTable_Table_upcast (
-    void *src
-  )
-{
-  IORTable::Table **tmp =
-    ACE_static_cast (IORTable::Table **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_IORTable_Table_marshal (
+IORTable::tao_Table_life::tao_marshal (
     IORTable::Table_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// IORTable::Table_var
-// *************************************************************
-
-IORTable::Table_var::Table_var (void)
-  : ptr_ (Table::_nil ())
-{}
-
-::IORTable::Table_ptr
-IORTable::Table_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-IORTable::Table_var::Table_var (const ::IORTable::Table_var &p)
-  : TAO_Base_var (),
-    ptr_ (Table::_duplicate (p.ptr ()))
-{}
-
-IORTable::Table_var::~Table_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-IORTable::Table_var &
-IORTable::Table_var::operator= (Table_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-IORTable::Table_var &
-IORTable::Table_var::operator= (const ::IORTable::Table_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IORTable::Table::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-IORTable::Table_var::operator const ::IORTable::Table_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-IORTable::Table_var::operator ::IORTable::Table_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::IORTable::Table_ptr
-IORTable::Table_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::IORTable::Table_ptr
-IORTable::Table_var::in (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::IORTable::Table_ptr &
-IORTable::Table_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::IORTable::Table_ptr &
-IORTable::Table_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IORTable::Table::_nil ();
-  return this->ptr_;
-}
-
-::IORTable::Table_ptr
-IORTable::Table_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IORTable::Table_ptr val = this->ptr_;
-  this->ptr_ = ::IORTable::Table::_nil ();
-  return val;
-}
-
-::IORTable::Table_ptr
-IORTable::Table_var::tao_duplicate (Table_ptr p)
-{
-  return ::IORTable::Table::_duplicate (p);
-}
-
-void
-IORTable::Table_var::tao_release (Table_ptr p)
-{
-  CORBA::release (p);
-}
-
-::IORTable::Table_ptr
-IORTable::Table_var::tao_nil (void)
-{
-  return ::IORTable::Table::_nil ();
-}
-
-::IORTable::Table_ptr
-IORTable::Table_var::tao_narrow (
+IORTable::Table_ptr
+IORTable::tao_Table_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IORTable::Table_var::tao_upcast (void *src)
+IORTable::tao_Table_cast::tao_upcast (
+    void *src
+  )
 {
-  Table **tmp =
-    ACE_static_cast (Table **, src);
+  IORTable::Table **tmp =
+    ACE_static_cast (IORTable::Table **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// IORTable::Table_out
-// *************************************************************
-
-IORTable::Table_out::Table_out (Table_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IORTable::Table::_nil ();
-}
-
-IORTable::Table_out::Table_out (Table_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IORTable::Table::_nil ();
-}
-
-IORTable::Table_out::Table_out (const ::IORTable::Table_out &p)
-  : ptr_ (ACE_const_cast (Table_out &, p).ptr_)
-{}
-
-::IORTable::Table_out &
-IORTable::Table_out::operator= (const ::IORTable::Table_out &p)
-{
-  this->ptr_ = ACE_const_cast (Table_out&, p).ptr_;
-  return *this;
-}
-
-IORTable::Table_out &
-IORTable::Table_out::operator= (const ::IORTable::Table_var &p)
-{
-  this->ptr_ = ::IORTable::Table::_duplicate (p.ptr ());
-  return *this;
-}
-
-IORTable::Table_out &
-IORTable::Table_out::operator= (Table_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-IORTable::Table_out::operator ::IORTable::Table_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::IORTable::Table_ptr &
-IORTable::Table_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::IORTable::Table_ptr
-IORTable::Table_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        IORTable::Table,
+        IORTable::tao_Table_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        IORTable::Table,
+        IORTable::tao_Table_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        IORTable::Table, \
+        IORTable::tao_Table_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        IORTable::Table, \
+        IORTable::tao_Table_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 IORTable::Table::Table (void)
 {}
@@ -497,7 +332,7 @@ IORTable::Table::_narrow (
   return Table::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IORTable::Table_ptr
+IORTable::Table_ptr 
 IORTable::Table::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -567,13 +402,19 @@ const char* IORTable::Table::_interface_repository_id (void) const
   return "IDL:IORTable/Table:1.0";
 }
 
+CORBA::Boolean
+IORTable::Table::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int IORTable::Locator::_tao_class_id = 0;
 
 IORTable::Locator_ptr
-tao_IORTable_Locator_duplicate (
+IORTable::tao_Locator_life::tao_duplicate (
     IORTable::Locator_ptr p
   )
 {
@@ -581,7 +422,7 @@ tao_IORTable_Locator_duplicate (
 }
 
 void
-tao_IORTable_Locator_release (
+IORTable::tao_Locator_life::tao_release (
     IORTable::Locator_ptr p
   )
 {
@@ -589,231 +430,68 @@ tao_IORTable_Locator_release (
 }
 
 IORTable::Locator_ptr
-tao_IORTable_Locator_nil (
+IORTable::tao_Locator_life::tao_nil (
     void
   )
 {
   return IORTable::Locator::_nil ();
 }
 
-IORTable::Locator_ptr
-tao_IORTable_Locator_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_IORTable_Locator_upcast (
-    void *src
-  )
-{
-  IORTable::Locator **tmp =
-    ACE_static_cast (IORTable::Locator **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_IORTable_Locator_marshal (
+IORTable::tao_Locator_life::tao_marshal (
     IORTable::Locator_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// IORTable::Locator_var
-// *************************************************************
-
-IORTable::Locator_var::Locator_var (void)
-  : ptr_ (Locator::_nil ())
-{}
-
-::IORTable::Locator_ptr
-IORTable::Locator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-IORTable::Locator_var::Locator_var (const ::IORTable::Locator_var &p)
-  : TAO_Base_var (),
-    ptr_ (Locator::_duplicate (p.ptr ()))
-{}
-
-IORTable::Locator_var::~Locator_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-IORTable::Locator_var &
-IORTable::Locator_var::operator= (Locator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-IORTable::Locator_var &
-IORTable::Locator_var::operator= (const ::IORTable::Locator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IORTable::Locator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-IORTable::Locator_var::operator const ::IORTable::Locator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-IORTable::Locator_var::operator ::IORTable::Locator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::IORTable::Locator_ptr
-IORTable::Locator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::IORTable::Locator_ptr
-IORTable::Locator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::IORTable::Locator_ptr &
-IORTable::Locator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::IORTable::Locator_ptr &
-IORTable::Locator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IORTable::Locator::_nil ();
-  return this->ptr_;
-}
-
-::IORTable::Locator_ptr
-IORTable::Locator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IORTable::Locator_ptr val = this->ptr_;
-  this->ptr_ = ::IORTable::Locator::_nil ();
-  return val;
-}
-
-::IORTable::Locator_ptr
-IORTable::Locator_var::tao_duplicate (Locator_ptr p)
-{
-  return ::IORTable::Locator::_duplicate (p);
-}
-
-void
-IORTable::Locator_var::tao_release (Locator_ptr p)
-{
-  CORBA::release (p);
-}
-
-::IORTable::Locator_ptr
-IORTable::Locator_var::tao_nil (void)
-{
-  return ::IORTable::Locator::_nil ();
+  return p->marshal (cdr);
 }
 
-::IORTable::Locator_ptr
-IORTable::Locator_var::tao_narrow (
+IORTable::Locator_ptr
+IORTable::tao_Locator_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-IORTable::Locator_var::tao_upcast (void *src)
+IORTable::tao_Locator_cast::tao_upcast (
+    void *src
+  )
 {
-  Locator **tmp =
-    ACE_static_cast (Locator **, src);
+  IORTable::Locator **tmp =
+    ACE_static_cast (IORTable::Locator **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// IORTable::Locator_out
-// *************************************************************
-
-IORTable::Locator_out::Locator_out (Locator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IORTable::Locator::_nil ();
-}
-
-IORTable::Locator_out::Locator_out (Locator_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IORTable::Locator::_nil ();
-}
-
-IORTable::Locator_out::Locator_out (const ::IORTable::Locator_out &p)
-  : ptr_ (ACE_const_cast (Locator_out &, p).ptr_)
-{}
-
-::IORTable::Locator_out &
-IORTable::Locator_out::operator= (const ::IORTable::Locator_out &p)
-{
-  this->ptr_ = ACE_const_cast (Locator_out&, p).ptr_;
-  return *this;
-}
-
-IORTable::Locator_out &
-IORTable::Locator_out::operator= (const ::IORTable::Locator_var &p)
-{
-  this->ptr_ = ::IORTable::Locator::_duplicate (p.ptr ());
-  return *this;
-}
-
-IORTable::Locator_out &
-IORTable::Locator_out::operator= (Locator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-IORTable::Locator_out::operator ::IORTable::Locator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::IORTable::Locator_ptr &
-IORTable::Locator_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::IORTable::Locator_ptr
-IORTable::Locator_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        IORTable::Locator,
+        IORTable::tao_Locator_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        IORTable::Locator,
+        IORTable::tao_Locator_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        IORTable::Locator, \
+        IORTable::tao_Locator_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        IORTable::Locator, \
+        IORTable::tao_Locator_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+
 IORTable::Locator::Locator (void)
 {}
 
@@ -829,7 +507,7 @@ IORTable::Locator::_narrow (
   return Locator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-IORTable::Locator_ptr
+IORTable::Locator_ptr 
 IORTable::Locator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -898,3 +576,10 @@ const char* IORTable::Locator::_interface_repository_id (void) const
 {
   return "IDL:IORTable/Locator:1.0";
 }
+
+CORBA::Boolean
+IORTable::Locator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index cfa2f2f6967..fff8e045caa 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -26,12 +26,14 @@
 #define _TAO_IDL_ORIG_IORTABLEC_H_
 
 #include "ace/pre.h"
+
 #include "tao/corba.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
 #include "iortable_export.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -64,85 +66,47 @@ TAO_NAMESPACE  IORTable
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class Locator;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_IORTABLE_LOCATOR___PTR_CH_)
-#define _IORTABLE_LOCATOR___PTR_CH_
+#if !defined (_IORTABLE_LOCATOR__ODDS_N_ENDS_CH_)
+#define _IORTABLE_LOCATOR__ODDS_N_ENDS_CH_
   
+  class Locator;
   typedef Locator *Locator_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IORTABLE_LOCATOR___VAR_CH_)
-#define _IORTABLE_LOCATOR___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IORTable_Export Locator_var : public TAO_Base_var
+  struct tao_Locator_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        Locator,
+        tao_Locator_life
+      >
+    Locator_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        Locator,
+        tao_Locator_life
+      >
+    Locator_out;
+  
+  struct TAO_IORTable_Export tao_Locator_life
   {
-  public:
-    Locator_var (void); // default constructor
-    Locator_var (Locator_ptr p) : ptr_ (p) {} 
-    Locator_var (const Locator_var &); // copy constructor
-    ~Locator_var (void); // destructor
-    
-    Locator_var &operator= (Locator_ptr);
-    Locator_var &operator= (const Locator_var &);
-    Locator_ptr operator-> (void) const;
-    
-    operator const Locator_ptr &() const;
-    operator Locator_ptr &();
-    // in, inout, out, _retn 
-    Locator_ptr in (void) const;
-    Locator_ptr &inout (void);
-    Locator_ptr &out (void);
-    Locator_ptr _retn (void);
-    Locator_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Locator_ptr tao_duplicate (Locator_ptr);
     static void tao_release (Locator_ptr);
     static Locator_ptr tao_nil (void);
-    static Locator_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Locator_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Locator_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Locator_var (const TAO_Base_var &rhs);
-    Locator_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_IORTABLE_LOCATOR___OUT_CH_)
-#define _IORTABLE_LOCATOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_IORTable_Export Locator_out
+  struct TAO_IORTable_Export tao_Locator_cast
   {
-  public:
-    Locator_out (Locator_ptr &);
-    Locator_out (Locator_var &);
-    Locator_out (const Locator_out &);
-    Locator_out &operator= (const Locator_out &);
-    Locator_out &operator= (const Locator_var &);
-    Locator_out &operator= (Locator_ptr);
-    operator Locator_ptr &();
-    Locator_ptr &ptr (void);
-    Locator_ptr operator-> (void);
-  
-  private:
-    Locator_ptr &ptr_;
+    static Locator_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
@@ -226,90 +190,53 @@ TAO_NAMESPACE  IORTable
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_IORTABLE_TABLE___PTR_CH_)
-#define _IORTABLE_TABLE___PTR_CH_
+#if !defined (_IORTABLE_TABLE__ODDS_N_ENDS_CH_)
+#define _IORTABLE_TABLE__ODDS_N_ENDS_CH_
   
   class Table;
   typedef Table *Table_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IORTABLE_TABLE___VAR_CH_)
-#define _IORTABLE_TABLE___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IORTable_Export Table_var : public TAO_Base_var
+  struct tao_Table_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        Table,
+        tao_Table_life
+      >
+    Table_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        Table,
+        tao_Table_life
+      >
+    Table_out;
+  
+  struct TAO_IORTable_Export tao_Table_life
   {
-  public:
-    Table_var (void); // default constructor
-    Table_var (Table_ptr p) : ptr_ (p) {} 
-    Table_var (const Table_var &); // copy constructor
-    ~Table_var (void); // destructor
-    
-    Table_var &operator= (Table_ptr);
-    Table_var &operator= (const Table_var &);
-    Table_ptr operator-> (void) const;
-    
-    operator const Table_ptr &() const;
-    operator Table_ptr &();
-    // in, inout, out, _retn 
-    Table_ptr in (void) const;
-    Table_ptr &inout (void);
-    Table_ptr &out (void);
-    Table_ptr _retn (void);
-    Table_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Table_ptr tao_duplicate (Table_ptr);
     static void tao_release (Table_ptr);
     static Table_ptr tao_nil (void);
-    static Table_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Table_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Table_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Table_var (const TAO_Base_var &rhs);
-    Table_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_IORTABLE_TABLE___OUT_CH_)
-#define _IORTABLE_TABLE___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_IORTable_Export Table_out
+  struct TAO_IORTable_Export tao_Table_cast
   {
-  public:
-    Table_out (Table_ptr &);
-    Table_out (Table_var &);
-    Table_out (const Table_out &);
-    Table_out &operator= (const Table_out &);
-    Table_out &operator= (const Table_var &);
-    Table_out &operator= (Table_ptr);
-    operator Table_ptr &();
-    Table_ptr &ptr (void);
-    Table_ptr operator-> (void);
-  
-  private:
-    Table_ptr &ptr_;
+    static Table_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IORTABLE_TABLE_CH_)
 #define _IORTABLE_TABLE_CH_
@@ -391,7 +318,7 @@ TAO_NAMESPACE  IORTable
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -401,10 +328,6 @@ TAO_NAMESPACE  IORTable
   protected:
     Table (void);
     virtual ~Table (void);
-    
-    friend class _TAO_Table_Remote_Proxy_Impl;
-    friend class _TAO_Table_ThruPOA_Proxy_Impl;
-    friend class _TAO_Table_Direct_Proxy_Impl;
   
   private:
     Table (const Table &);
@@ -414,90 +337,7 @@ TAO_NAMESPACE  IORTable
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IORTABLE_LOCATOR___PTR_CH_)
-#define _IORTABLE_LOCATOR___PTR_CH_
-  
-  class Locator;
-  typedef Locator *Locator_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_IORTABLE_LOCATOR___VAR_CH_)
-#define _IORTABLE_LOCATOR___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_IORTable_Export Locator_var : public TAO_Base_var
-  {
-  public:
-    Locator_var (void); // default constructor
-    Locator_var (Locator_ptr p) : ptr_ (p) {} 
-    Locator_var (const Locator_var &); // copy constructor
-    ~Locator_var (void); // destructor
-    
-    Locator_var &operator= (Locator_ptr);
-    Locator_var &operator= (const Locator_var &);
-    Locator_ptr operator-> (void) const;
-    
-    operator const Locator_ptr &() const;
-    operator Locator_ptr &();
-    // in, inout, out, _retn 
-    Locator_ptr in (void) const;
-    Locator_ptr &inout (void);
-    Locator_ptr &out (void);
-    Locator_ptr _retn (void);
-    Locator_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static Locator_ptr tao_duplicate (Locator_ptr);
-    static void tao_release (Locator_ptr);
-    static Locator_ptr tao_nil (void);
-    static Locator_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Locator_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Locator_var (const TAO_Base_var &rhs);
-    Locator_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IORTABLE_LOCATOR___OUT_CH_)
-#define _IORTABLE_LOCATOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_IORTable_Export Locator_out
-  {
-  public:
-    Locator_out (Locator_ptr &);
-    Locator_out (Locator_var &);
-    Locator_out (const Locator_out &);
-    Locator_out &operator= (const Locator_out &);
-    Locator_out &operator= (const Locator_var &);
-    Locator_out &operator= (Locator_ptr);
-    operator Locator_ptr &();
-    Locator_ptr &ptr (void);
-    Locator_ptr operator-> (void);
-  
-  private:
-    Locator_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IORTABLE_LOCATOR_CH_)
 #define _IORTABLE_LOCATOR_CH_
@@ -543,7 +383,7 @@ TAO_NAMESPACE  IORTable
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -553,10 +393,6 @@ TAO_NAMESPACE  IORTable
   protected:
     Locator (void);
     virtual ~Locator (void);
-    
-    friend class _TAO_Locator_Remote_Proxy_Impl;
-    friend class _TAO_Locator_ThruPOA_Proxy_Impl;
-    friend class _TAO_Locator_Direct_Proxy_Impl;
   
   private:
     Locator (const Locator &);
@@ -594,7 +430,7 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "IORTableC.i"
diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i
index cea503f3318..7a2f18d9921 100644
--- a/TAO/tao/IORTable/IORTableC.i
+++ b/TAO/tao/IORTable/IORTableC.i
@@ -26,13 +26,6 @@
 #if !defined (_IORTABLE_TABLE___CI_)
 #define _IORTABLE_TABLE___CI_
 
-ACE_INLINE
-CORBA::Boolean
-IORTable::Table::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -41,17 +34,10 @@ IORTable::Table::marshal (TAO_OutputCDR &)
 #if !defined (_IORTABLE_LOCATOR___CI_)
 #define _IORTABLE_LOCATOR___CI_
 
-ACE_INLINE
-CORBA::Boolean
-IORTable::Locator::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -80,7 +66,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 28eccdf3206..f7ce24aa71f 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -236,3 +236,16 @@ TAO_Local_RefCounted_Object::_remove_ref (void)
 
   delete this;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Var_T<CORBA::LocalObject>;
+  template class TAO_Pseudo_Out_T<CORBA::LocalObject, CORBA::LocalObject_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::LocalObject>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::LocalObject, CORBA::LocalObject_var>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index 04062892a86..88bd7eb520b 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -32,6 +32,10 @@
 
 namespace CORBA
 {
+  class LocalObject;
+  typedef TAO_Pseudo_Var_T<LocalObject> LocalObject_var;
+  typedef TAO_Pseudo_Out_T<LocalObject, LocalObject_var> LocalObject_out;
+
   /**
    * @class LocalObject
    *
@@ -62,47 +66,53 @@ namespace CORBA
                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /// No-op it is just here to simplify some templates.
-    static LocalObject_ptr _unchecked_narrow (CORBA::Object_ptr obj
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    static LocalObject_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     /// Always returns false.
     virtual CORBA::Boolean _non_existent (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
 
     /// Throws CORBA::NO_IMPLEMENT.
     virtual CORBA::ImplementationDef_ptr _get_implementation (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
 
     /// Gets info about object from the Interface Repository.
     virtual CORBA::InterfaceDef_ptr _get_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
 
     /// Throws NO_IMPLEMENT.
     virtual CORBA::Object_ptr _get_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
 
     virtual void _create_request (CORBA::Context_ptr ctx,
-                                  const char *operation,
+                                  const char * operation,
                                   CORBA::NVList_ptr arg_list,
                                   CORBA::NamedValue_ptr result,
-                                  CORBA::Request_ptr &request,
+                                  CORBA::Request_ptr & request,
                                   CORBA::Flags req_flags
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual void _create_request (CORBA::Context_ptr ctx,
-                                  const char *operation,
+                                  const char * operation,
                                   CORBA::NVList_ptr arg_list,
                                   CORBA::NamedValue_ptr result,
                                   CORBA::ExceptionList_ptr exclist,
                                   CORBA::ContextList_ptr ctxtlist,
-                                  CORBA::Request_ptr &request,
+                                  CORBA::Request_ptr & request,
                                   CORBA::Flags req_flags
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /// Throws NO_IMPLEMENT.
-    virtual CORBA::Request_ptr _request (const char *operation
+    virtual CORBA::Request_ptr _request (const char * operation
                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -119,19 +129,22 @@ namespace CORBA
 
     /// Throws CORBA::NO_IMPLEMENT.
     CORBA::Object_ptr _set_policy_overrides (
-      const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        const CORBA::PolicyList & policies,
+        CORBA::SetOverrideType set_add
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
     /// Throws CORBA::NO_IMPLEMENT.
     CORBA::PolicyList * _get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        const CORBA::PolicyTypeSeq & types
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
     /// Throws CORBA::NO_IMPLEMENT.
     CORBA::Boolean _validate_connection (
-      CORBA::PolicyList_out inconsistent_policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        CORBA::PolicyList_out inconsistent_policies
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -164,13 +177,11 @@ namespace CORBA
     // = TAO extensions
 
     /// Throws CORBA::NO_IMPLEMENT.
-    virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
+    virtual TAO::ObjectKey * _key (ACE_ENV_SINGLE_ARG_DECL);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     /// Useful for template programming.
     typedef LocalObject_ptr _ptr_type;
     typedef LocalObject_var _var_type;
-#endif /* __GNUC__ */
 
   protected:
 
@@ -187,52 +198,10 @@ namespace CORBA
      */
     //@{
     LocalObject (const LocalObject &);
-    LocalObject &operator = (const LocalObject &);
+    LocalObject & operator = (const LocalObject &);
     //@}
 
   };
-
-  class TAO_Export LocalObject_var
-  {
-  public:
-    LocalObject_var (void); // default constructor
-    LocalObject_var (LocalObject_ptr);
-    LocalObject_var (const LocalObject_var &); // copy constructor
-    ~LocalObject_var (void); // destructor
-
-    LocalObject_var &operator= (LocalObject_ptr);
-    LocalObject_var &operator= (const LocalObject_var &);
-    LocalObject_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const LocalObject_ptr &() const;
-    operator LocalObject_ptr &();
-    LocalObject_ptr in (void) const;
-    LocalObject_ptr &inout (void);
-    LocalObject_ptr &out (void);
-    LocalObject_ptr _retn (void);
-    LocalObject_ptr ptr (void) const;
-
-  private:
-    LocalObject_ptr ptr_;
-  };
-
-  class TAO_Export LocalObject_out
-  {
-  public:
-    LocalObject_out (LocalObject_ptr &);
-    LocalObject_out (LocalObject_var &);
-    LocalObject_out (const LocalObject_out &);
-    LocalObject_out &operator= (const LocalObject_out &);
-    LocalObject_out &operator= (const LocalObject_var &);
-    LocalObject_out &operator= (LocalObject_ptr);
-    operator LocalObject_ptr &();
-    LocalObject_ptr &ptr (void);
-    LocalObject_ptr operator-> (void);
-
-  private:
-    LocalObject_ptr &ptr_;
-  };
 }   // End CORBA namespace
 
 /**
@@ -270,7 +239,9 @@ private:
    */
   //@{
   TAO_Local_RefCounted_Object (const TAO_Local_RefCounted_Object &);
-  TAO_Local_RefCounted_Object &operator = (const TAO_Local_RefCounted_Object &);
+  TAO_Local_RefCounted_Object & operator = (
+      const TAO_Local_RefCounted_Object &
+    );
   //@}
 
 protected:
@@ -280,7 +251,6 @@ protected:
 
   /// Number of outstanding references to this object.
   CORBA::ULong refcount_;
-
 };
 
 
diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i
index 6e0ac9a0b18..1e877211c03 100644
--- a/TAO/tao/LocalObject.i
+++ b/TAO/tao/LocalObject.i
@@ -2,50 +2,65 @@
 //
 // $Id$
 
-// ****************************************************************
-
-ACE_INLINE CORBA::LocalObject_ptr
+ACE_INLINE
+CORBA::LocalObject_ptr
 CORBA::LocalObject::_duplicate (CORBA::LocalObject_ptr obj)
 {
   if (obj)
-    obj->_add_ref ();
+    {
+      obj->_add_ref ();
+    }
+
   return obj;
 }
 
-// Null pointers represent nil objects.
-
-ACE_INLINE CORBA::LocalObject_ptr
+ACE_INLINE
+CORBA::LocalObject_ptr
 CORBA::LocalObject::_nil (void)
 {
   return 0;
 }
 
-ACE_INLINE CORBA::LocalObject_ptr
+ACE_INLINE
+CORBA::LocalObject_ptr
 CORBA::LocalObject::_narrow (CORBA::Object_ptr obj
                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (obj->_is_local () != 0)
-    return
-      ACE_reinterpret_cast (
-        CORBA::LocalObject_ptr,
-        obj->_tao_QueryInterface (
-          ACE_reinterpret_cast (ptr_arith_t,
-                                &CORBA::LocalObject::_narrow)));
+    {
+      return
+        ACE_reinterpret_cast (
+            CORBA::LocalObject_ptr,
+            obj->_tao_QueryInterface (
+                ACE_reinterpret_cast (
+                    ptr_arith_t,
+                    &CORBA::LocalObject::_narrow
+                  )
+              )
+          );
+    }
 
   return 0;
 }
 
-ACE_INLINE CORBA::LocalObject_ptr
+ACE_INLINE
+CORBA::LocalObject_ptr
 CORBA::LocalObject::_unchecked_narrow (CORBA::Object_ptr obj
                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (obj->_is_local () != 0)
-    return
-      ACE_reinterpret_cast (
-        CORBA::LocalObject_ptr,
-        obj->_tao_QueryInterface (
-          ACE_reinterpret_cast (ptr_arith_t,
-                                &CORBA::LocalObject::_narrow)));
+    {
+      return
+         ACE_reinterpret_cast (
+             CORBA::LocalObject_ptr,
+             obj->_tao_QueryInterface (
+                 ACE_reinterpret_cast (
+                     ptr_arith_t,
+                     &CORBA::LocalObject::_narrow
+                   )
+               )
+           );
+    }
 
   return 0;
 }
@@ -56,171 +71,7 @@ CORBA::LocalObject::LocalObject (void)
 {
 }
 
-// *************************************************************
-// Inline operations for class CORBA::LocalObject_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::LocalObject_var::LocalObject_var (void)
-  : ptr_ (CORBA::LocalObject::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::LocalObject_var::LocalObject_var (CORBA::LocalObject_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::LocalObject_var::~LocalObject_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::LocalObject_ptr
-CORBA::LocalObject_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::LocalObject_var::LocalObject_var (const CORBA::LocalObject_var &p)
-  : ptr_ (CORBA::LocalObject::_duplicate (p.ptr ()))
-{
-}
-
-ACE_INLINE CORBA::LocalObject_var &
-CORBA::LocalObject_var::operator= (CORBA::LocalObject_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::LocalObject_var &
-CORBA::LocalObject_var::operator= (const CORBA::LocalObject_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = CORBA::LocalObject::_duplicate (p.ptr ());
-    }
-
-  return *this;
-}
-
-ACE_INLINE
-CORBA::LocalObject_var::operator const CORBA::LocalObject_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::LocalObject_var::operator CORBA::LocalObject_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::LocalObject_ptr
-CORBA::LocalObject_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::LocalObject_ptr
-CORBA::LocalObject_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::LocalObject_ptr &
-CORBA::LocalObject_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::LocalObject_ptr &
-CORBA::LocalObject_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::LocalObject::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::LocalObject_ptr
-CORBA::LocalObject_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::LocalObject_ptr val = this->ptr_;
-  this->ptr_ = CORBA::LocalObject::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::LocalObject_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::LocalObject_out::LocalObject_out (CORBA::LocalObject_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::LocalObject::_nil ();
-}
-
-ACE_INLINE
-CORBA::LocalObject_out::LocalObject_out (CORBA::LocalObject_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::LocalObject::_nil ();
-}
-
-ACE_INLINE
-CORBA::LocalObject_out::LocalObject_out (const CORBA::LocalObject_out &p)
-  : ptr_ (p.ptr_)
-{
-}
-
-ACE_INLINE CORBA::LocalObject_out &
-CORBA::LocalObject_out::operator= (const CORBA::LocalObject_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::LocalObject_out &
-CORBA::LocalObject_out::operator= (const CORBA::LocalObject_var &p)
-{
-  this->ptr_ = CORBA::LocalObject::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::LocalObject_out &
-CORBA::LocalObject_out::operator= (CORBA::LocalObject_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::LocalObject_out::operator CORBA::LocalObject_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::LocalObject_ptr &
-CORBA::LocalObject_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::LocalObject_ptr
-CORBA::LocalObject_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// ------------------------------------------------------------------
+// =================================================================
 
 ACE_INLINE
 TAO_Local_RefCounted_Object::TAO_Local_RefCounted_Object (void)
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index f18952a7d44..5b579469081 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -51,65 +50,65 @@ static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4578), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x696f6e48), 
-  ACE_NTOHL (0x6f6c6465), 
-  ACE_NTOHL (0x723a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f4578),
+  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x696f6e48),
+  ACE_NTOHL (0x6f6c6465),
+  ACE_NTOHL (0x723a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
     16,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e486f6c), 
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e486f6c),
   ACE_NTOHL (0x64657200),  // name = ExceptionHolder
     0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
 3, // member count
     20,
-  ACE_NTOHL (0x69735f73), 
-  ACE_NTOHL (0x79737465), 
-  ACE_NTOHL (0x6d5f6578), 
-  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x69735f73),
+  ACE_NTOHL (0x79737465),
+  ACE_NTOHL (0x6d5f6578),
+  ACE_NTOHL (0x63657074),
   ACE_NTOHL (0x696f6e00),  // name = is_system_exception
     CORBA::tk_boolean,
 
   1, // data member visibility marker
 
   11,
-  ACE_NTOHL (0x62797465), 
-  ACE_NTOHL (0x5f6f7264), 
+  ACE_NTOHL (0x62797465),
+  ACE_NTOHL (0x5f6f7264),
   ACE_NTOHL (0x65720000),  // name = byte_order
     CORBA::tk_boolean,
 
   1, // data member visibility marker
 
   20,
-  ACE_NTOHL (0x6d617273), 
-  ACE_NTOHL (0x68616c65), 
-  ACE_NTOHL (0x645f6578), 
-  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x6d617273),
+  ACE_NTOHL (0x68616c65),
+  ACE_NTOHL (0x645f6578),
+  ACE_NTOHL (0x63657074),
   ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
     CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f63),
+    ACE_NTOHL (0x74657453),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
         9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
+    ACE_NTOHL (0x4f637465),
+    ACE_NTOHL (0x74536571),
     ACE_NTOHL (0x0),  // name = OctetSeq
         CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
@@ -141,211 +140,47 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:94
 
 void
-tao_Messaging_ExceptionHolder_add_ref (
-    Messaging::ExceptionHolder *p
+Messaging::tao_ExceptionHolder_life::tao_add_ref (
+    Messaging::ExceptionHolder * p
   )
 {
   CORBA::add_ref (p);
 }
 
 void
-tao_Messaging_ExceptionHolder_remove_ref (
-    Messaging::ExceptionHolder *p
+Messaging::tao_ExceptionHolder_life::tao_remove_ref (
+    Messaging::ExceptionHolder * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
-
-// *************************************************************
-// Operations for class Messaging::ExceptionHolder_var
-// *************************************************************
-
-Messaging::ExceptionHolder_var::ExceptionHolder_var (void)
-  : ptr_ (0)
-{}
-
-Messaging::ExceptionHolder_var::ExceptionHolder_var (ExceptionHolder* p)
-  : ptr_ (p)
-{}
-
-Messaging::ExceptionHolder_var::ExceptionHolder_var (const ExceptionHolder* p)
-  : ptr_ (ACE_const_cast (ExceptionHolder *, p))
-{}
-
-Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder_var::ExceptionHolder_var (const ExceptionHolder_var &p)
-{
-  CORBA::add_ref (p.ptr ());
-  this->ptr_ = p.ptr ();
-}
-
-Messaging::ExceptionHolder_var::~ExceptionHolder_var (void) // destructor
-{
-  CORBA::remove_ref (this->ptr_);
-}
-
-Messaging::ExceptionHolder_var &
-Messaging::ExceptionHolder_var::operator= (ExceptionHolder *p)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ExceptionHolder_var &
-Messaging::ExceptionHolder_var::operator= (const ExceptionHolder_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::remove_ref (this->ptr_);
-    ExceptionHolder *tmp = p.ptr ();
-    CORBA::add_ref (tmp);
-    this->ptr_ = tmp;
-  }
-  
-  return *this;
-}
-
-Messaging::ExceptionHolder_var::operator const Messaging::ExceptionHolder* () const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder*& () // cast 
-{
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::in (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder *&
-Messaging::ExceptionHolder_var::inout (void)
-{
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder *&
-Messaging::ExceptionHolder_var::out (void)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ExceptionHolder* tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-void
-Messaging::ExceptionHolder_var::tao_add_ref (
-    ExceptionHolder *p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-Messaging::ExceptionHolder_var::tao_remove_ref (
-    ExceptionHolder *p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
-
-// *************************************************************
-// Operations for class Messaging::ExceptionHolder_out
-// *************************************************************
-
-Messaging::ExceptionHolder_out::ExceptionHolder_out (ExceptionHolder *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-Messaging::ExceptionHolder_out::ExceptionHolder_out (ExceptionHolder_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-}
-
-Messaging::ExceptionHolder_out::ExceptionHolder_out (const ExceptionHolder_out &p)
-  : ptr_ (ACE_const_cast (ExceptionHolder_out&, p).ptr_)
-{}
-
-Messaging::ExceptionHolder_out &
-Messaging::ExceptionHolder_out::operator= (const ExceptionHolder_out &p)
-{
-  this->ptr_ = ACE_const_cast (ExceptionHolder_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::ExceptionHolder_out &
-Messaging::ExceptionHolder_out::operator= (const ExceptionHolder_var &p)
-{
-  ExceptionHolder *tmp = p.ptr ();
-  CORBA::add_ref (tmp);
-  this->ptr_ = tmp;
-  return *this;
-}
-
-Messaging::ExceptionHolder_out &
-Messaging::ExceptionHolder_out::operator= (ExceptionHolder *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ExceptionHolder_out::operator Messaging::ExceptionHolder*& () // cast
-{
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder *&
-Messaging::ExceptionHolder_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Value_Var_T<
+        Messaging::ExceptionHolder,
+        Messaging::tao_ExceptionHolder_life
+      >;
+  template class
+    TAO_Value_Out_T<
+        Messaging::ExceptionHolder,
+        Messaging::tao_ExceptionHolder_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Value_Var_T< \
+        Messaging::ExceptionHolder, \
+        Messaging::tao_ExceptionHolder_life \
+      >
+# pragma instantiate \
+    TAO_Value_Out_T< \
+        Messaging::ExceptionHolder, \
+        Messaging::tao_ExceptionHolder_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 Messaging::ExceptionHolder *
 Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
@@ -354,7 +189,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return (ExceptionHolder *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
@@ -375,9 +210,9 @@ Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id)
     {
       return this;
     }
-  
+
   void *rval = 0;
-  
+
   return rval;
 }
 
@@ -424,29 +259,29 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
         base,
         ExceptionHolder::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ExceptionHolder::_downcast (base);
@@ -464,7 +299,7 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
 {
 }
 
-const char* 
+const char*
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
@@ -488,7 +323,7 @@ Messaging::ExceptionHolder_init::create_for_unmarshal (void)
 int Messaging::ReplyHandler::_tao_class_id = 0;
 
 Messaging::ReplyHandler_ptr
-tao_Messaging_ReplyHandler_duplicate (
+Messaging::tao_ReplyHandler_life::tao_duplicate (
     Messaging::ReplyHandler_ptr p
   )
 {
@@ -496,7 +331,7 @@ tao_Messaging_ReplyHandler_duplicate (
 }
 
 void
-tao_Messaging_ReplyHandler_release (
+Messaging::tao_ReplyHandler_life::tao_release (
     Messaging::ReplyHandler_ptr p
   )
 {
@@ -504,228 +339,64 @@ tao_Messaging_ReplyHandler_release (
 }
 
 Messaging::ReplyHandler_ptr
-tao_Messaging_ReplyHandler_nil (
+Messaging::tao_ReplyHandler_life::tao_nil (
     void
   )
 {
   return Messaging::ReplyHandler::_nil ();
 }
 
-Messaging::ReplyHandler_ptr
-tao_Messaging_ReplyHandler_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return Messaging::ReplyHandler::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_Messaging_ReplyHandler_upcast (
-    void *src
-  )
-{
-  Messaging::ReplyHandler **tmp =
-    ACE_static_cast (Messaging::ReplyHandler **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_Messaging_ReplyHandler_marshal (
+Messaging::tao_ReplyHandler_life::tao_marshal (
     Messaging::ReplyHandler_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::ReplyHandler_var
-// *************************************************************
-
-Messaging::ReplyHandler_var::ReplyHandler_var (void)
-  : ptr_ (ReplyHandler::_nil ())
-{}
-
-::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::ReplyHandler_var::ReplyHandler_var (const ::Messaging::ReplyHandler_var &p)
-  : TAO_Base_var (),
-    ptr_ (ReplyHandler::_duplicate (p.ptr ()))
-{}
-
-Messaging::ReplyHandler_var::~ReplyHandler_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::ReplyHandler_var &
-Messaging::ReplyHandler_var::operator= (ReplyHandler_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ReplyHandler_var &
-Messaging::ReplyHandler_var::operator= (const ::Messaging::ReplyHandler_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::ReplyHandler::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::ReplyHandler_var::operator const ::Messaging::ReplyHandler_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::ReplyHandler_var::operator ::Messaging::ReplyHandler_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::ReplyHandler_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
-  return val;
-}
-
-::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::tao_duplicate (ReplyHandler_ptr p)
-{
-  return ::Messaging::ReplyHandler::_duplicate (p);
+  return p->marshal (cdr);
 }
 
-void
-Messaging::ReplyHandler_var::tao_release (ReplyHandler_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::tao_nil (void)
-{
-  return ::Messaging::ReplyHandler::_nil ();
-}
-
-::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::tao_narrow (
+Messaging::ReplyHandler_ptr
+Messaging::tao_ReplyHandler_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyHandler::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return Messaging::ReplyHandler::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-Messaging::ReplyHandler_var::tao_upcast (void *src)
+Messaging::tao_ReplyHandler_cast::tao_upcast (
+    void *src
+  )
 {
-  ReplyHandler **tmp =
-    ACE_static_cast (ReplyHandler **, src);
+  Messaging::ReplyHandler **tmp =
+    ACE_static_cast (Messaging::ReplyHandler **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::ReplyHandler_out
-// *************************************************************
-
-Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
-}
-
-Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
-}
-
-Messaging::ReplyHandler_out::ReplyHandler_out (const ::Messaging::ReplyHandler_out &p)
-  : ptr_ (ACE_const_cast (ReplyHandler_out &, p).ptr_)
-{}
-
-::Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (const ::Messaging::ReplyHandler_out &p)
-{
-  this->ptr_ = ACE_const_cast (ReplyHandler_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (const ::Messaging::ReplyHandler_var &p)
-{
-  this->ptr_ = ::Messaging::ReplyHandler::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (ReplyHandler_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ReplyHandler_out::operator ::Messaging::ReplyHandler_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::ReplyHandler,
+        Messaging::tao_ReplyHandler_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::ReplyHandler,
+        Messaging::tao_ReplyHandler_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::ReplyHandler, \
+        Messaging::tao_ReplyHandler_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::ReplyHandler, \
+        Messaging::tao_ReplyHandler_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -738,7 +409,7 @@ Messaging::ReplyHandler_out::operator-> (void)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 Messaging::_TAO_ReplyHandler_Proxy_Impl::_TAO_ReplyHandler_Proxy_Impl (void)
@@ -750,7 +421,7 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Impl::_TAO_ReplyHandler_Remote_Proxy_I
 // Remote Implementation of the IDL interface methods
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -801,8 +472,8 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::ReplyHandler::ReplyHandler (int collocated)
 {
@@ -823,7 +494,7 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation (int collocate
 Messaging::ReplyHandler::~ReplyHandler (void)
 {}
 
-void 
+void
 Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyHandler *tmp = ACE_static_cast (ReplyHandler *, _tao_void_pointer);
@@ -840,7 +511,7 @@ Messaging::ReplyHandler::_narrow (
     {
       return ReplyHandler::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -849,17 +520,17 @@ Messaging::ReplyHandler::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ReplyHandler::_nil ());
-      
+
       if (is_a == 0)
         {
           return ReplyHandler::_nil ();
         }
     }
-  
+
   return ReplyHandler::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::ReplyHandler_ptr 
+Messaging::ReplyHandler_ptr
 Messaging::ReplyHandler::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -869,18 +540,18 @@ Messaging::ReplyHandler::_unchecked_narrow (
     {
       return ReplyHandler::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ReplyHandler_ptr default_proxy = ReplyHandler::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -898,7 +569,7 @@ Messaging::ReplyHandler::_unchecked_narrow (
               ReplyHandler::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -911,10 +582,10 @@ Messaging::ReplyHandler::_unchecked_narrow (
               ReplyHandler::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ReplyHandler_ptr,
@@ -934,7 +605,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -969,7 +640,7 @@ Messaging::ReplyHandler::_is_a (
 void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, ReplyHandler)::_tao_class_id)
@@ -988,12 +659,12 @@ void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1002,6 +673,12 @@ const char* Messaging::ReplyHandler::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/ReplyHandler:1.0";
 }
 
+CORBA::Boolean
+Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1009,20 +686,20 @@ static const CORBA::Long _oc_Messaging_ReplyHandler[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7948), 
-  ACE_NTOHL (0x616e646c), 
-  ACE_NTOHL (0x65723a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x706c7948),
+  ACE_NTOHL (0x616e646c),
+  ACE_NTOHL (0x65723a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
     13,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x7948616e), 
-  ACE_NTOHL (0x646c6572), 
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x7948616e),
+  ACE_NTOHL (0x646c6572),
   ACE_NTOHL (0x0),  // name = ReplyHandler
   };
 
@@ -1062,7 +739,7 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_I
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:568
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:567
 
 // Accessor to set the member.
 void
@@ -1080,7 +757,7 @@ OBV_Messaging::ExceptionHolder::is_system_exception (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:568
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:567
 
 // Accessor to set the member.
 void
@@ -1098,7 +775,7 @@ OBV_Messaging::ExceptionHolder::byte_order (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:744
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_cs.cpp:742
 
 // Accessor to set the member.
 void
@@ -1229,7 +906,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:270
 
 void
 CORBA::add_ref (Messaging::ExceptionHolder * vt)
@@ -1316,7 +993,7 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1335,12 +1012,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       Messaging::ReplyHandler::_unchecked_narrow (
@@ -1357,5 +1034,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
-
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index c84f1bb5d77..1c5754c3651 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -26,7 +26,7 @@
 #define _TAO_IDL_ORIG_MESSAGINGC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "Messaging_SyncScope_PolicyC.h"
 
 #ifndef TAO_MESSAGING_SAFE_INCLUDE 
 #error "You should not include MessagingC.h directly, use Messaging.h"
@@ -38,13 +38,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
-#include "Messaging_SyncScope_PolicyC.h"
 #include "Messaging_RT_PolicyC.h"
 #include "Messaging_No_ImplC.h"
 #include "tao/OctetSeqC.h"
 #include "tao/ValueBase.h"
 #include "tao/ValueFactory.h"
-
+#include "tao/Value_VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -76,83 +75,33 @@ TAO_NAMESPACE  Messaging
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:307
   
   class ExceptionHolder;
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___PTR_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER___PTR_CH_
-  
-  typedef ExceptionHolder *ExceptionHolder_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___VAR_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
-  
-  class TAO_Messaging_Export ExceptionHolder_var
+  struct tao_ExceptionHolder_life;
+  
+  typedef
+    TAO_Value_Var_T<
+        ExceptionHolder,
+        tao_ExceptionHolder_life
+      >
+    ExceptionHolder_var;
+  
+  typedef
+    TAO_Value_Out_T<
+        ExceptionHolder,
+        tao_ExceptionHolder_life
+      >
+    ExceptionHolder_out;
+  
+  struct TAO_Messaging_Export tao_ExceptionHolder_life
   {
-  public:
-    ExceptionHolder_var (void);
-    ExceptionHolder_var (ExceptionHolder*);
-    ExceptionHolder_var (const ExceptionHolder*); // (TAO extension)
-    ExceptionHolder_var (const ExceptionHolder_var &);
-    ~ExceptionHolder_var (void);
-    
-    ExceptionHolder_var &operator= (ExceptionHolder*);
-    ExceptionHolder_var &operator= (const ExceptionHolder_var &);
-    ExceptionHolder* operator-> (void) const;
-    
-    operator const ExceptionHolder* () const;
-    operator ExceptionHolder*& ();
-    // in, inout, out, _retn 
-    ExceptionHolder* in (void) const;
-    ExceptionHolder*& inout (void);
-    ExceptionHolder*& out (void);
-    ExceptionHolder* _retn (void);
-    ExceptionHolder* ptr (void) const;
-    
-    // Hooks used by template sequence and valuetype manager classes
-    // for non-defined forward declared valuetypes.
     static void tao_add_ref (ExceptionHolder *);
     static void tao_remove_ref (ExceptionHolder *);
-  
-  private:
-    ExceptionHolder* ptr_;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___OUT_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER___OUT_CH_
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
-  
-  class TAO_Messaging_Export ExceptionHolder_out
-  {
-  public:
-    ExceptionHolder_out (ExceptionHolder* &);
-    ExceptionHolder_out (ExceptionHolder_var &);
-    ExceptionHolder_out (const ExceptionHolder_out &);
-    ExceptionHolder_out &operator= (const ExceptionHolder_out &);
-    ExceptionHolder_out &operator= (const ExceptionHolder_var &);
-    ExceptionHolder_out &operator= (ExceptionHolder*);
-    operator ExceptionHolder*& ();
-    ExceptionHolder*& ptr (void);
-    ExceptionHolder* operator-> (void);
-    
-  private:
-    ExceptionHolder* &ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_)
 #define _MESSAGING_EXCEPTIONHOLDER_CH_
@@ -176,13 +125,13 @@ TAO_NAMESPACE  Messaging
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:411
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:412
     
     virtual void is_system_exception (CORBA::Boolean) = 0;
     virtual CORBA::Boolean is_system_exception (void) const = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:411
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:412
     
     virtual void byte_order (CORBA::Boolean) = 0;
     virtual CORBA::Boolean byte_order (void) const = 0;virtual void marshaled_exception (const CORBA::OctetSeq &) = 0;
@@ -190,7 +139,7 @@ TAO_NAMESPACE  Messaging
     virtual CORBA::OctetSeq &marshaled_exception (void) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:272
   
   protected:
     ExceptionHolder (void);
@@ -226,6 +175,8 @@ TAO_NAMESPACE  Messaging
     ExceptionHolder_init (void);
     virtual ~ExceptionHolder_init (void);
     
+    
+    
     static ExceptionHolder_init* _downcast (CORBA::ValueFactoryBase* );
     
     virtual CORBA::ValueBase *create_for_unmarshal (void);
@@ -243,90 +194,53 @@ TAO_NAMESPACE  Messaging
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionHolder;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_MESSAGING_REPLYHANDLER___PTR_CH_)
-#define _MESSAGING_REPLYHANDLER___PTR_CH_
+#if !defined (_MESSAGING_REPLYHANDLER__ODDS_N_ENDS_CH_)
+#define _MESSAGING_REPLYHANDLER__ODDS_N_ENDS_CH_
   
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYHANDLER___VAR_CH_)
-#define _MESSAGING_REPLYHANDLER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export ReplyHandler_var : public TAO_Base_var
+  struct tao_ReplyHandler_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ReplyHandler,
+        tao_ReplyHandler_life
+      >
+    ReplyHandler_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ReplyHandler,
+        tao_ReplyHandler_life
+      >
+    ReplyHandler_out;
+  
+  struct TAO_Messaging_Export tao_ReplyHandler_life
   {
-  public:
-    ReplyHandler_var (void); // default constructor
-    ReplyHandler_var (ReplyHandler_ptr p) : ptr_ (p) {} 
-    ReplyHandler_var (const ReplyHandler_var &); // copy constructor
-    ~ReplyHandler_var (void); // destructor
-    
-    ReplyHandler_var &operator= (ReplyHandler_ptr);
-    ReplyHandler_var &operator= (const ReplyHandler_var &);
-    ReplyHandler_ptr operator-> (void) const;
-    
-    operator const ReplyHandler_ptr &() const;
-    operator ReplyHandler_ptr &();
-    // in, inout, out, _retn 
-    ReplyHandler_ptr in (void) const;
-    ReplyHandler_ptr &inout (void);
-    ReplyHandler_ptr &out (void);
-    ReplyHandler_ptr _retn (void);
-    ReplyHandler_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ReplyHandler_ptr tao_duplicate (ReplyHandler_ptr);
     static void tao_release (ReplyHandler_ptr);
     static ReplyHandler_ptr tao_nil (void);
-    static ReplyHandler_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ReplyHandler_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ReplyHandler_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ReplyHandler_var (const TAO_Base_var &rhs);
-    ReplyHandler_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYHANDLER___OUT_CH_)
-#define _MESSAGING_REPLYHANDLER___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export ReplyHandler_out
+  struct TAO_Messaging_Export tao_ReplyHandler_cast
   {
-  public:
-    ReplyHandler_out (ReplyHandler_ptr &);
-    ReplyHandler_out (ReplyHandler_var &);
-    ReplyHandler_out (const ReplyHandler_out &);
-    ReplyHandler_out &operator= (const ReplyHandler_out &);
-    ReplyHandler_out &operator= (const ReplyHandler_var &);
-    ReplyHandler_out &operator= (ReplyHandler_ptr);
-    operator ReplyHandler_ptr &();
-    ReplyHandler_ptr &ptr (void);
-    ReplyHandler_ptr operator-> (void);
-  
-  private:
-    ReplyHandler_ptr &ptr_;
+    static ReplyHandler_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REPLYHANDLER_CH_)
 #define _MESSAGING_REPLYHANDLER_CH_
@@ -365,7 +279,7 @@ TAO_NAMESPACE  Messaging
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -560,17 +474,16 @@ TAO_NAMESPACE  OBV_Messaging
     virtual ~ExceptionHolder (void);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:411
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:412
     
     virtual void is_system_exception (CORBA::Boolean);
     virtual CORBA::Boolean is_system_exception (void) const;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:411
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/field_ch.cpp:412
     
     virtual void byte_order (CORBA::Boolean);
-    virtual CORBA::Boolean byte_order (void) const;
-    virtual void marshaled_exception (const CORBA::OctetSeq &);
+    virtual CORBA::Boolean byte_order (void) const;virtual void marshaled_exception (const CORBA::OctetSeq &);
     virtual const CORBA::OctetSeq &marshaled_exception (void) const;
     virtual CORBA::OctetSeq &marshaled_exception (void);
     
@@ -613,7 +526,7 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:212
 
 TAO_NAMESPACE CORBA
 {
@@ -640,7 +553,7 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Reply
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "MessagingC.i"
@@ -657,4 +570,3 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Reply
 #include "ace/post.h"
 #endif /* ifndef */
 
-
diff --git a/TAO/tao/Messaging/MessagingC.i b/TAO/tao/Messaging/MessagingC.i
index b1966b08c23..5fa0bddcf2b 100644
--- a/TAO/tao/Messaging/MessagingC.i
+++ b/TAO/tao/Messaging/MessagingC.i
@@ -2,6 +2,7 @@
 //
 // $Id$
 
+
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
 //       Center for Distributed Object Computing
@@ -20,7 +21,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
@@ -31,7 +32,7 @@ ACE_INLINE
 Messaging::ExceptionHolder::~ExceptionHolder (void)
 {}
 
-ACE_INLINE const char* 
+ACE_INLINE const char*
 Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
@@ -66,13 +67,6 @@ Messaging::ReplyHandler::ReplyHandler (
   this->Messaging_ReplyHandler_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -87,7 +81,7 @@ TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:242
 
 #if defined (__ACE_INLINE__)
 
@@ -118,5 +112,3 @@ TAO_Messaging_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     Messaging::ReplyHandler_ptr &
   );
-
-
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
index f7ec820e56d..d130f844c39 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -24,17 +24,6 @@
 
 
 #include "Messaging_No_ImplC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -51,18 +40,18 @@ static const CORBA::Long _oc_Messaging_Priority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5072),
+  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x74793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
     9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
   ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -92,19 +81,19 @@ static const CORBA::Long _oc_Messaging_RebindMode[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x62696e64),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RebindMode:1.0
     11,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e644d6f), 
+  ACE_NTOHL (0x52656269),
+  ACE_NTOHL (0x6e644d6f),
   ACE_NTOHL (0x64650000),  // name = RebindMode
     CORBA::tk_short,
 
@@ -134,19 +123,19 @@ static const CORBA::Long _oc_Messaging_RoutingType[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f526f),
+  ACE_NTOHL (0x7574696e),
+  ACE_NTOHL (0x67547970),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
     12,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
+  ACE_NTOHL (0x526f7574),
+  ACE_NTOHL (0x696e6754),
   ACE_NTOHL (0x79706500),  // name = RoutingType
     CORBA::tk_short,
 
@@ -176,18 +165,18 @@ static const CORBA::Long _oc_Messaging_Ordering[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4f72), 
-  ACE_NTOHL (0x64657269), 
-  ACE_NTOHL (0x6e673a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f4f72),
+  ACE_NTOHL (0x64657269),
+  ACE_NTOHL (0x6e673a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Ordering:1.0
     9,
-  ACE_NTOHL (0x4f726465), 
-  ACE_NTOHL (0x72696e67), 
+  ACE_NTOHL (0x4f726465),
+  ACE_NTOHL (0x72696e67),
   ACE_NTOHL (0x0),  // name = Ordering
     CORBA::tk_ushort,
 
@@ -216,7 +205,7 @@ TAO_NAMESPACE_END
 int Messaging::RebindPolicy::_tao_class_id = 0;
 
 Messaging::RebindPolicy_ptr
-tao_Messaging_RebindPolicy_duplicate (
+Messaging::tao_RebindPolicy_life::tao_duplicate (
     Messaging::RebindPolicy_ptr p
   )
 {
@@ -224,7 +213,7 @@ tao_Messaging_RebindPolicy_duplicate (
 }
 
 void
-tao_Messaging_RebindPolicy_release (
+Messaging::tao_RebindPolicy_life::tao_release (
     Messaging::RebindPolicy_ptr p
   )
 {
@@ -232,15 +221,24 @@ tao_Messaging_RebindPolicy_release (
 }
 
 Messaging::RebindPolicy_ptr
-tao_Messaging_RebindPolicy_nil (
+Messaging::tao_RebindPolicy_life::tao_nil (
     void
   )
 {
   return Messaging::RebindPolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_RebindPolicy_life::tao_marshal (
+    Messaging::RebindPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::RebindPolicy_ptr
-tao_Messaging_RebindPolicy_narrow (
+Messaging::tao_RebindPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -249,7 +247,7 @@ tao_Messaging_RebindPolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_RebindPolicy_upcast (
+Messaging::tao_RebindPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -258,205 +256,32 @@ tao_Messaging_RebindPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_RebindPolicy_marshal (
-    Messaging::RebindPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::RebindPolicy_var
-// *************************************************************
-
-Messaging::RebindPolicy_var::RebindPolicy_var (void)
-  : ptr_ (RebindPolicy::_nil ())
-{}
-
-::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::RebindPolicy_var::RebindPolicy_var (const ::Messaging::RebindPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (RebindPolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::RebindPolicy_var::~RebindPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::RebindPolicy_var &
-Messaging::RebindPolicy_var::operator= (RebindPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RebindPolicy_var &
-Messaging::RebindPolicy_var::operator= (const ::Messaging::RebindPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RebindPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::RebindPolicy_var::operator const ::Messaging::RebindPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::RebindPolicy_var::operator ::Messaging::RebindPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RebindPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
-  return val;
-}
-
-::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::tao_duplicate (RebindPolicy_ptr p)
-{
-  return ::Messaging::RebindPolicy::_duplicate (p);
-}
-
-void
-Messaging::RebindPolicy_var::tao_release (RebindPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::tao_nil (void)
-{
-  return ::Messaging::RebindPolicy::_nil ();
-}
-
-::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::RebindPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::RebindPolicy_var::tao_upcast (void *src)
-{
-  RebindPolicy **tmp =
-    ACE_static_cast (RebindPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::RebindPolicy,
+        Messaging::tao_RebindPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::RebindPolicy,
+        Messaging::tao_RebindPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::RebindPolicy, \
+        Messaging::tao_RebindPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::RebindPolicy, \
+        Messaging::tao_RebindPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::RebindPolicy_out
-// *************************************************************
-
-Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
-}
-
-Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
-}
-
-Messaging::RebindPolicy_out::RebindPolicy_out (const ::Messaging::RebindPolicy_out &p)
-  : ptr_ (ACE_const_cast (RebindPolicy_out &, p).ptr_)
-{}
-
-::Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (const ::Messaging::RebindPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RebindPolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (const ::Messaging::RebindPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RebindPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (RebindPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RebindPolicy_out::operator ::Messaging::RebindPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::RebindPolicy::RebindPolicy (void)
 {}
@@ -464,7 +289,7 @@ Messaging::RebindPolicy::RebindPolicy (void)
 Messaging::RebindPolicy::~RebindPolicy (void)
 {}
 
-void 
+void
 Messaging::RebindPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RebindPolicy *tmp = ACE_static_cast (RebindPolicy *, _tao_void_pointer);
@@ -480,7 +305,7 @@ Messaging::RebindPolicy::_narrow (
   return RebindPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::RebindPolicy_ptr 
+Messaging::RebindPolicy_ptr
 Messaging::RebindPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -490,7 +315,7 @@ Messaging::RebindPolicy::_unchecked_narrow (
     {
       return RebindPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RebindPolicy_ptr,
@@ -510,14 +335,14 @@ Messaging::RebindPolicy::_duplicate (RebindPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::RebindPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, RebindPolicy)::_tao_class_id)
@@ -550,12 +375,12 @@ void *Messaging::RebindPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -564,6 +389,12 @@ const char* Messaging::RebindPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/RebindPolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::RebindPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -571,20 +402,20 @@ static const CORBA::Long _oc_Messaging_RebindPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x62696e64), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x62696e64),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RebindPolicy:1.0
     13,
-  ACE_NTOHL (0x52656269), 
-  ACE_NTOHL (0x6e64506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x52656269),
+  ACE_NTOHL (0x6e64506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = RebindPolicy
   };
 
@@ -612,20 +443,20 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74795261), 
-  ACE_NTOHL (0x6e67653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5072),
+  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x74795261),
+  ACE_NTOHL (0x6e67653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0
     14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x52616e67), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x52616e67),
   ACE_NTOHL (0x65000000),  // name = PriorityRange
   2, // member count
     4,
@@ -634,18 +465,18 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f5072), 
-    ACE_NTOHL (0x696f7269), 
-    ACE_NTOHL (0x74793a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x4d657373),
+    ACE_NTOHL (0x6167696e),
+    ACE_NTOHL (0x672f5072),
+    ACE_NTOHL (0x696f7269),
+    ACE_NTOHL (0x74793a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
@@ -673,8 +504,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void Messaging::PriorityRange::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -683,12 +514,31 @@ void Messaging::PriorityRange::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      PriorityRange
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      PriorityRange \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RequestPriorityPolicy::_tao_class_id = 0;
 
 Messaging::RequestPriorityPolicy_ptr
-tao_Messaging_RequestPriorityPolicy_duplicate (
+Messaging::tao_RequestPriorityPolicy_life::tao_duplicate (
     Messaging::RequestPriorityPolicy_ptr p
   )
 {
@@ -696,7 +546,7 @@ tao_Messaging_RequestPriorityPolicy_duplicate (
 }
 
 void
-tao_Messaging_RequestPriorityPolicy_release (
+Messaging::tao_RequestPriorityPolicy_life::tao_release (
     Messaging::RequestPriorityPolicy_ptr p
   )
 {
@@ -704,15 +554,24 @@ tao_Messaging_RequestPriorityPolicy_release (
 }
 
 Messaging::RequestPriorityPolicy_ptr
-tao_Messaging_RequestPriorityPolicy_nil (
+Messaging::tao_RequestPriorityPolicy_life::tao_nil (
     void
   )
 {
   return Messaging::RequestPriorityPolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_RequestPriorityPolicy_life::tao_marshal (
+    Messaging::RequestPriorityPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::RequestPriorityPolicy_ptr
-tao_Messaging_RequestPriorityPolicy_narrow (
+Messaging::tao_RequestPriorityPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -721,7 +580,7 @@ tao_Messaging_RequestPriorityPolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_RequestPriorityPolicy_upcast (
+Messaging::tao_RequestPriorityPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -730,205 +589,32 @@ tao_Messaging_RequestPriorityPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_RequestPriorityPolicy_marshal (
-    Messaging::RequestPriorityPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::RequestPriorityPolicy_var
-// *************************************************************
-
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (void)
-  : ptr_ (RequestPriorityPolicy::_nil ())
-{}
-
-::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const ::Messaging::RequestPriorityPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (RequestPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::RequestPriorityPolicy_var::~RequestPriorityPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::RequestPriorityPolicy_var &
-Messaging::RequestPriorityPolicy_var::operator= (RequestPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RequestPriorityPolicy_var &
-Messaging::RequestPriorityPolicy_var::operator= (const ::Messaging::RequestPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::RequestPriorityPolicy_var::operator const ::Messaging::RequestPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::RequestPriorityPolicy_var::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RequestPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
-  return val;
-}
-
-::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::tao_duplicate (RequestPriorityPolicy_ptr p)
-{
-  return ::Messaging::RequestPriorityPolicy::_duplicate (p);
-}
-
-void
-Messaging::RequestPriorityPolicy_var::tao_release (RequestPriorityPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::tao_nil (void)
-{
-  return ::Messaging::RequestPriorityPolicy::_nil ();
-}
-
-::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::RequestPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::RequestPriorityPolicy_var::tao_upcast (void *src)
-{
-  RequestPriorityPolicy **tmp =
-    ACE_static_cast (RequestPriorityPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::RequestPriorityPolicy,
+        Messaging::tao_RequestPriorityPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::RequestPriorityPolicy,
+        Messaging::tao_RequestPriorityPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::RequestPriorityPolicy, \
+        Messaging::tao_RequestPriorityPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::RequestPriorityPolicy, \
+        Messaging::tao_RequestPriorityPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::RequestPriorityPolicy_out
-// *************************************************************
-
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
-}
-
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
-}
-
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const ::Messaging::RequestPriorityPolicy_out &p)
-  : ptr_ (ACE_const_cast (RequestPriorityPolicy_out &, p).ptr_)
-{}
-
-::Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (const ::Messaging::RequestPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestPriorityPolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (const ::Messaging::RequestPriorityPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (RequestPriorityPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RequestPriorityPolicy_out::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
 {}
@@ -936,7 +622,7 @@ Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
 Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void)
 {}
 
-void 
+void
 Messaging::RequestPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestPriorityPolicy *tmp = ACE_static_cast (RequestPriorityPolicy *, _tao_void_pointer);
@@ -952,7 +638,7 @@ Messaging::RequestPriorityPolicy::_narrow (
   return RequestPriorityPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::RequestPriorityPolicy_ptr 
+Messaging::RequestPriorityPolicy_ptr
 Messaging::RequestPriorityPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -962,7 +648,7 @@ Messaging::RequestPriorityPolicy::_unchecked_narrow (
     {
       return RequestPriorityPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RequestPriorityPolicy_ptr,
@@ -982,14 +668,14 @@ Messaging::RequestPriorityPolicy::_duplicate (RequestPriorityPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::RequestPriorityPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, RequestPriorityPolicy)::_tao_class_id)
@@ -1022,12 +708,12 @@ void *Messaging::RequestPriorityPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1036,6 +722,12 @@ const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) co
   return "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::RequestPriorityPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1043,24 +735,24 @@ static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74507269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74507269),
+  ACE_NTOHL (0x6f726974),
+  ACE_NTOHL (0x79506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RequestPriorityPolicy:1.0
     22,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737450), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747950), 
-  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737450),
+  ACE_NTOHL (0x72696f72),
+  ACE_NTOHL (0x69747950),
+  ACE_NTOHL (0x6f6c6963),
   ACE_NTOHL (0x79000000),  // name = RequestPriorityPolicy
   };
 
@@ -1087,7 +779,7 @@ TAO_NAMESPACE_END
 int Messaging::ReplyPriorityPolicy::_tao_class_id = 0;
 
 Messaging::ReplyPriorityPolicy_ptr
-tao_Messaging_ReplyPriorityPolicy_duplicate (
+Messaging::tao_ReplyPriorityPolicy_life::tao_duplicate (
     Messaging::ReplyPriorityPolicy_ptr p
   )
 {
@@ -1095,7 +787,7 @@ tao_Messaging_ReplyPriorityPolicy_duplicate (
 }
 
 void
-tao_Messaging_ReplyPriorityPolicy_release (
+Messaging::tao_ReplyPriorityPolicy_life::tao_release (
     Messaging::ReplyPriorityPolicy_ptr p
   )
 {
@@ -1103,15 +795,24 @@ tao_Messaging_ReplyPriorityPolicy_release (
 }
 
 Messaging::ReplyPriorityPolicy_ptr
-tao_Messaging_ReplyPriorityPolicy_nil (
+Messaging::tao_ReplyPriorityPolicy_life::tao_nil (
     void
   )
 {
   return Messaging::ReplyPriorityPolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_ReplyPriorityPolicy_life::tao_marshal (
+    Messaging::ReplyPriorityPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::ReplyPriorityPolicy_ptr
-tao_Messaging_ReplyPriorityPolicy_narrow (
+Messaging::tao_ReplyPriorityPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1120,7 +821,7 @@ tao_Messaging_ReplyPriorityPolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_ReplyPriorityPolicy_upcast (
+Messaging::tao_ReplyPriorityPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -1129,205 +830,32 @@ tao_Messaging_ReplyPriorityPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_ReplyPriorityPolicy_marshal (
-    Messaging::ReplyPriorityPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::ReplyPriorityPolicy_var
-// *************************************************************
-
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (void)
-  : ptr_ (ReplyPriorityPolicy::_nil ())
-{}
-
-::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const ::Messaging::ReplyPriorityPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ReplyPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::ReplyPriorityPolicy_var::~ReplyPriorityPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::ReplyPriorityPolicy_var &
-Messaging::ReplyPriorityPolicy_var::operator= (ReplyPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ReplyPriorityPolicy_var &
-Messaging::ReplyPriorityPolicy_var::operator= (const ::Messaging::ReplyPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::ReplyPriorityPolicy_var::operator const ::Messaging::ReplyPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::ReplyPriorityPolicy_var::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::ReplyPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
-  return val;
-}
-
-::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::tao_duplicate (ReplyPriorityPolicy_ptr p)
-{
-  return ::Messaging::ReplyPriorityPolicy::_duplicate (p);
-}
-
-void
-Messaging::ReplyPriorityPolicy_var::tao_release (ReplyPriorityPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::tao_nil (void)
-{
-  return ::Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::ReplyPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::ReplyPriorityPolicy_var::tao_upcast (void *src)
-{
-  ReplyPriorityPolicy **tmp =
-    ACE_static_cast (ReplyPriorityPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::ReplyPriorityPolicy,
+        Messaging::tao_ReplyPriorityPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::ReplyPriorityPolicy,
+        Messaging::tao_ReplyPriorityPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::ReplyPriorityPolicy, \
+        Messaging::tao_ReplyPriorityPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::ReplyPriorityPolicy, \
+        Messaging::tao_ReplyPriorityPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::ReplyPriorityPolicy_out
-// *************************************************************
-
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const ::Messaging::ReplyPriorityPolicy_out &p)
-  : ptr_ (ACE_const_cast (ReplyPriorityPolicy_out &, p).ptr_)
-{}
-
-::Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (const ::Messaging::ReplyPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ReplyPriorityPolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (const ::Messaging::ReplyPriorityPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (ReplyPriorityPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ReplyPriorityPolicy_out::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
 {}
@@ -1335,7 +863,7 @@ Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
 Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void)
 {}
 
-void 
+void
 Messaging::ReplyPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyPriorityPolicy *tmp = ACE_static_cast (ReplyPriorityPolicy *, _tao_void_pointer);
@@ -1351,7 +879,7 @@ Messaging::ReplyPriorityPolicy::_narrow (
   return ReplyPriorityPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::ReplyPriorityPolicy_ptr 
+Messaging::ReplyPriorityPolicy_ptr
 Messaging::ReplyPriorityPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1361,7 +889,7 @@ Messaging::ReplyPriorityPolicy::_unchecked_narrow (
     {
       return ReplyPriorityPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ReplyPriorityPolicy_ptr,
@@ -1381,14 +909,14 @@ Messaging::ReplyPriorityPolicy::_duplicate (ReplyPriorityPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::ReplyPriorityPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, ReplyPriorityPolicy)::_tao_class_id)
@@ -1421,12 +949,12 @@ void *Messaging::ReplyPriorityPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1435,6 +963,12 @@ const char* Messaging::ReplyPriorityPolicy::_interface_repository_id (void) cons
   return "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::ReplyPriorityPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1442,23 +976,23 @@ static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7950), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747950), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x706c7950),
+  ACE_NTOHL (0x72696f72),
+  ACE_NTOHL (0x69747950),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0
     20,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79507269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79506f6c), 
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79507269),
+  ACE_NTOHL (0x6f726974),
+  ACE_NTOHL (0x79506f6c),
   ACE_NTOHL (0x69637900),  // name = ReplyPriorityPolicy
   };
 
@@ -1485,7 +1019,7 @@ TAO_NAMESPACE_END
 int Messaging::RequestStartTimePolicy::_tao_class_id = 0;
 
 Messaging::RequestStartTimePolicy_ptr
-tao_Messaging_RequestStartTimePolicy_duplicate (
+Messaging::tao_RequestStartTimePolicy_life::tao_duplicate (
     Messaging::RequestStartTimePolicy_ptr p
   )
 {
@@ -1493,7 +1027,7 @@ tao_Messaging_RequestStartTimePolicy_duplicate (
 }
 
 void
-tao_Messaging_RequestStartTimePolicy_release (
+Messaging::tao_RequestStartTimePolicy_life::tao_release (
     Messaging::RequestStartTimePolicy_ptr p
   )
 {
@@ -1501,15 +1035,24 @@ tao_Messaging_RequestStartTimePolicy_release (
 }
 
 Messaging::RequestStartTimePolicy_ptr
-tao_Messaging_RequestStartTimePolicy_nil (
+Messaging::tao_RequestStartTimePolicy_life::tao_nil (
     void
   )
 {
   return Messaging::RequestStartTimePolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_RequestStartTimePolicy_life::tao_marshal (
+    Messaging::RequestStartTimePolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::RequestStartTimePolicy_ptr
-tao_Messaging_RequestStartTimePolicy_narrow (
+Messaging::tao_RequestStartTimePolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1518,7 +1061,7 @@ tao_Messaging_RequestStartTimePolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_RequestStartTimePolicy_upcast (
+Messaging::tao_RequestStartTimePolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -1527,205 +1070,32 @@ tao_Messaging_RequestStartTimePolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_RequestStartTimePolicy_marshal (
-    Messaging::RequestStartTimePolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::RequestStartTimePolicy_var
-// *************************************************************
-
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void)
-  : ptr_ (RequestStartTimePolicy::_nil ())
-{}
-
-::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const ::Messaging::RequestStartTimePolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (RequestStartTimePolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::RequestStartTimePolicy_var::~RequestStartTimePolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::RequestStartTimePolicy_var &
-Messaging::RequestStartTimePolicy_var::operator= (RequestStartTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RequestStartTimePolicy_var &
-Messaging::RequestStartTimePolicy_var::operator= (const ::Messaging::RequestStartTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::RequestStartTimePolicy_var::operator const ::Messaging::RequestStartTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::RequestStartTimePolicy_var::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RequestStartTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
-  return val;
-}
-
-::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::tao_duplicate (RequestStartTimePolicy_ptr p)
-{
-  return ::Messaging::RequestStartTimePolicy::_duplicate (p);
-}
-
-void
-Messaging::RequestStartTimePolicy_var::tao_release (RequestStartTimePolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::tao_nil (void)
-{
-  return ::Messaging::RequestStartTimePolicy::_nil ();
-}
-
-::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::RequestStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::RequestStartTimePolicy_var::tao_upcast (void *src)
-{
-  RequestStartTimePolicy **tmp =
-    ACE_static_cast (RequestStartTimePolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::RequestStartTimePolicy,
+        Messaging::tao_RequestStartTimePolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::RequestStartTimePolicy,
+        Messaging::tao_RequestStartTimePolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::RequestStartTimePolicy, \
+        Messaging::tao_RequestStartTimePolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::RequestStartTimePolicy, \
+        Messaging::tao_RequestStartTimePolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::RequestStartTimePolicy_out
-// *************************************************************
-
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
-}
-
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
-}
-
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const ::Messaging::RequestStartTimePolicy_out &p)
-  : ptr_ (ACE_const_cast (RequestStartTimePolicy_out &, p).ptr_)
-{}
-
-::Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (const ::Messaging::RequestStartTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestStartTimePolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (const ::Messaging::RequestStartTimePolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (RequestStartTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RequestStartTimePolicy_out::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
 {}
@@ -1733,7 +1103,7 @@ Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
 Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void)
 {}
 
-void 
+void
 Messaging::RequestStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestStartTimePolicy *tmp = ACE_static_cast (RequestStartTimePolicy *, _tao_void_pointer);
@@ -1749,7 +1119,7 @@ Messaging::RequestStartTimePolicy::_narrow (
   return RequestStartTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::RequestStartTimePolicy_ptr 
+Messaging::RequestStartTimePolicy_ptr
 Messaging::RequestStartTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1759,7 +1129,7 @@ Messaging::RequestStartTimePolicy::_unchecked_narrow (
     {
       return RequestStartTimePolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RequestStartTimePolicy_ptr,
@@ -1779,14 +1149,14 @@ Messaging::RequestStartTimePolicy::_duplicate (RequestStartTimePolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::RequestStartTimePolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, RequestStartTimePolicy)::_tao_class_id)
@@ -1819,12 +1189,12 @@ void *Messaging::RequestStartTimePolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1833,6 +1203,12 @@ const char* Messaging::RequestStartTimePolicy::_interface_repository_id (void) c
   return "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::RequestStartTimePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1840,25 +1216,25 @@ static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74537461), 
-  ACE_NTOHL (0x72745469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74537461),
+  ACE_NTOHL (0x72745469),
+  ACE_NTOHL (0x6d65506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RequestStartTimePolicy:1.0
     23,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737453), 
-  ACE_NTOHL (0x74617274), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737453),
+  ACE_NTOHL (0x74617274),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = RequestStartTimePolicy
   };
 
@@ -1885,7 +1261,7 @@ TAO_NAMESPACE_END
 int Messaging::RequestEndTimePolicy::_tao_class_id = 0;
 
 Messaging::RequestEndTimePolicy_ptr
-tao_Messaging_RequestEndTimePolicy_duplicate (
+Messaging::tao_RequestEndTimePolicy_life::tao_duplicate (
     Messaging::RequestEndTimePolicy_ptr p
   )
 {
@@ -1893,7 +1269,7 @@ tao_Messaging_RequestEndTimePolicy_duplicate (
 }
 
 void
-tao_Messaging_RequestEndTimePolicy_release (
+Messaging::tao_RequestEndTimePolicy_life::tao_release (
     Messaging::RequestEndTimePolicy_ptr p
   )
 {
@@ -1901,15 +1277,24 @@ tao_Messaging_RequestEndTimePolicy_release (
 }
 
 Messaging::RequestEndTimePolicy_ptr
-tao_Messaging_RequestEndTimePolicy_nil (
+Messaging::tao_RequestEndTimePolicy_life::tao_nil (
     void
   )
 {
   return Messaging::RequestEndTimePolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_RequestEndTimePolicy_life::tao_marshal (
+    Messaging::RequestEndTimePolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::RequestEndTimePolicy_ptr
-tao_Messaging_RequestEndTimePolicy_narrow (
+Messaging::tao_RequestEndTimePolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1918,7 +1303,7 @@ tao_Messaging_RequestEndTimePolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_RequestEndTimePolicy_upcast (
+Messaging::tao_RequestEndTimePolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -1927,205 +1312,32 @@ tao_Messaging_RequestEndTimePolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_RequestEndTimePolicy_marshal (
-    Messaging::RequestEndTimePolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::RequestEndTimePolicy_var
-// *************************************************************
-
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (void)
-  : ptr_ (RequestEndTimePolicy::_nil ())
-{}
-
-::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const ::Messaging::RequestEndTimePolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (RequestEndTimePolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::RequestEndTimePolicy_var &
-Messaging::RequestEndTimePolicy_var::operator= (RequestEndTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RequestEndTimePolicy_var &
-Messaging::RequestEndTimePolicy_var::operator= (const ::Messaging::RequestEndTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::RequestEndTimePolicy_var::operator const ::Messaging::RequestEndTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::RequestEndTimePolicy_var::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RequestEndTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
-  return val;
-}
-
-::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::tao_duplicate (RequestEndTimePolicy_ptr p)
-{
-  return ::Messaging::RequestEndTimePolicy::_duplicate (p);
-}
-
-void
-Messaging::RequestEndTimePolicy_var::tao_release (RequestEndTimePolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::tao_nil (void)
-{
-  return ::Messaging::RequestEndTimePolicy::_nil ();
-}
-
-::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::RequestEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::RequestEndTimePolicy_var::tao_upcast (void *src)
-{
-  RequestEndTimePolicy **tmp =
-    ACE_static_cast (RequestEndTimePolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::RequestEndTimePolicy,
+        Messaging::tao_RequestEndTimePolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::RequestEndTimePolicy,
+        Messaging::tao_RequestEndTimePolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::RequestEndTimePolicy, \
+        Messaging::tao_RequestEndTimePolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::RequestEndTimePolicy, \
+        Messaging::tao_RequestEndTimePolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::RequestEndTimePolicy_out
-// *************************************************************
-
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
-}
-
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
-}
-
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const ::Messaging::RequestEndTimePolicy_out &p)
-  : ptr_ (ACE_const_cast (RequestEndTimePolicy_out &, p).ptr_)
-{}
-
-::Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (const ::Messaging::RequestEndTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestEndTimePolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (const ::Messaging::RequestEndTimePolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (RequestEndTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RequestEndTimePolicy_out::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
 {}
@@ -2133,7 +1345,7 @@ Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
 Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void)
 {}
 
-void 
+void
 Messaging::RequestEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestEndTimePolicy *tmp = ACE_static_cast (RequestEndTimePolicy *, _tao_void_pointer);
@@ -2149,7 +1361,7 @@ Messaging::RequestEndTimePolicy::_narrow (
   return RequestEndTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::RequestEndTimePolicy_ptr 
+Messaging::RequestEndTimePolicy_ptr
 Messaging::RequestEndTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2159,7 +1371,7 @@ Messaging::RequestEndTimePolicy::_unchecked_narrow (
     {
       return RequestEndTimePolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RequestEndTimePolicy_ptr,
@@ -2179,14 +1391,14 @@ Messaging::RequestEndTimePolicy::_duplicate (RequestEndTimePolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::RequestEndTimePolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, RequestEndTimePolicy)::_tao_class_id)
@@ -2219,12 +1431,12 @@ void *Messaging::RequestEndTimePolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2233,6 +1445,12 @@ const char* Messaging::RequestEndTimePolicy::_interface_repository_id (void) con
   return "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::RequestEndTimePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2240,24 +1458,24 @@ static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74456e64), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74456e64),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RequestEndTimePolicy:1.0
     21,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737445), 
-  ACE_NTOHL (0x6e645469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737445),
+  ACE_NTOHL (0x6e645469),
+  ACE_NTOHL (0x6d65506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = RequestEndTimePolicy
   };
 
@@ -2284,7 +1502,7 @@ TAO_NAMESPACE_END
 int Messaging::ReplyStartTimePolicy::_tao_class_id = 0;
 
 Messaging::ReplyStartTimePolicy_ptr
-tao_Messaging_ReplyStartTimePolicy_duplicate (
+Messaging::tao_ReplyStartTimePolicy_life::tao_duplicate (
     Messaging::ReplyStartTimePolicy_ptr p
   )
 {
@@ -2292,7 +1510,7 @@ tao_Messaging_ReplyStartTimePolicy_duplicate (
 }
 
 void
-tao_Messaging_ReplyStartTimePolicy_release (
+Messaging::tao_ReplyStartTimePolicy_life::tao_release (
     Messaging::ReplyStartTimePolicy_ptr p
   )
 {
@@ -2300,15 +1518,24 @@ tao_Messaging_ReplyStartTimePolicy_release (
 }
 
 Messaging::ReplyStartTimePolicy_ptr
-tao_Messaging_ReplyStartTimePolicy_nil (
+Messaging::tao_ReplyStartTimePolicy_life::tao_nil (
     void
   )
 {
   return Messaging::ReplyStartTimePolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_ReplyStartTimePolicy_life::tao_marshal (
+    Messaging::ReplyStartTimePolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::ReplyStartTimePolicy_ptr
-tao_Messaging_ReplyStartTimePolicy_narrow (
+Messaging::tao_ReplyStartTimePolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2317,7 +1544,7 @@ tao_Messaging_ReplyStartTimePolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_ReplyStartTimePolicy_upcast (
+Messaging::tao_ReplyStartTimePolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -2326,205 +1553,32 @@ tao_Messaging_ReplyStartTimePolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_ReplyStartTimePolicy_marshal (
-    Messaging::ReplyStartTimePolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::ReplyStartTimePolicy_var
-// *************************************************************
-
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (void)
-  : ptr_ (ReplyStartTimePolicy::_nil ())
-{}
-
-::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const ::Messaging::ReplyStartTimePolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ReplyStartTimePolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::ReplyStartTimePolicy_var &
-Messaging::ReplyStartTimePolicy_var::operator= (ReplyStartTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ReplyStartTimePolicy_var &
-Messaging::ReplyStartTimePolicy_var::operator= (const ::Messaging::ReplyStartTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::ReplyStartTimePolicy_var::operator const ::Messaging::ReplyStartTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::ReplyStartTimePolicy_var::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::ReplyStartTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
-  return val;
-}
-
-::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::tao_duplicate (ReplyStartTimePolicy_ptr p)
-{
-  return ::Messaging::ReplyStartTimePolicy::_duplicate (p);
-}
-
-void
-Messaging::ReplyStartTimePolicy_var::tao_release (ReplyStartTimePolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::tao_nil (void)
-{
-  return ::Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::ReplyStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::ReplyStartTimePolicy_var::tao_upcast (void *src)
-{
-  ReplyStartTimePolicy **tmp =
-    ACE_static_cast (ReplyStartTimePolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::ReplyStartTimePolicy,
+        Messaging::tao_ReplyStartTimePolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::ReplyStartTimePolicy,
+        Messaging::tao_ReplyStartTimePolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::ReplyStartTimePolicy, \
+        Messaging::tao_ReplyStartTimePolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::ReplyStartTimePolicy, \
+        Messaging::tao_ReplyStartTimePolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::ReplyStartTimePolicy_out
-// *************************************************************
-
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const ::Messaging::ReplyStartTimePolicy_out &p)
-  : ptr_ (ACE_const_cast (ReplyStartTimePolicy_out &, p).ptr_)
-{}
-
-::Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (const ::Messaging::ReplyStartTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ReplyStartTimePolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (const ::Messaging::ReplyStartTimePolicy_var &p)
-{
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (ReplyStartTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ReplyStartTimePolicy_out::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
 {}
@@ -2532,7 +1586,7 @@ Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
 Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void)
 {}
 
-void 
+void
 Messaging::ReplyStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyStartTimePolicy *tmp = ACE_static_cast (ReplyStartTimePolicy *, _tao_void_pointer);
@@ -2548,7 +1602,7 @@ Messaging::ReplyStartTimePolicy::_narrow (
   return ReplyStartTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::ReplyStartTimePolicy_ptr 
+Messaging::ReplyStartTimePolicy_ptr
 Messaging::ReplyStartTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2558,7 +1612,7 @@ Messaging::ReplyStartTimePolicy::_unchecked_narrow (
     {
       return ReplyStartTimePolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ReplyStartTimePolicy_ptr,
@@ -2578,14 +1632,14 @@ Messaging::ReplyStartTimePolicy::_duplicate (ReplyStartTimePolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::ReplyStartTimePolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, ReplyStartTimePolicy)::_tao_class_id)
@@ -2618,12 +1672,12 @@ void *Messaging::ReplyStartTimePolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2632,6 +1686,12 @@ const char* Messaging::ReplyStartTimePolicy::_interface_repository_id (void) con
   return "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::ReplyStartTimePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2639,24 +1699,24 @@ static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7953), 
-  ACE_NTOHL (0x74617274), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x706c7953),
+  ACE_NTOHL (0x74617274),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0
     21,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x72745469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
+  ACE_NTOHL (0x72745469),
+  ACE_NTOHL (0x6d65506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ReplyStartTimePolicy
   };
 
@@ -2683,7 +1743,7 @@ TAO_NAMESPACE_END
 int Messaging::ReplyEndTimePolicy::_tao_class_id = 0;
 
 Messaging::ReplyEndTimePolicy_ptr
-tao_Messaging_ReplyEndTimePolicy_duplicate (
+Messaging::tao_ReplyEndTimePolicy_life::tao_duplicate (
     Messaging::ReplyEndTimePolicy_ptr p
   )
 {
@@ -2691,7 +1751,7 @@ tao_Messaging_ReplyEndTimePolicy_duplicate (
 }
 
 void
-tao_Messaging_ReplyEndTimePolicy_release (
+Messaging::tao_ReplyEndTimePolicy_life::tao_release (
     Messaging::ReplyEndTimePolicy_ptr p
   )
 {
@@ -2699,15 +1759,24 @@ tao_Messaging_ReplyEndTimePolicy_release (
 }
 
 Messaging::ReplyEndTimePolicy_ptr
-tao_Messaging_ReplyEndTimePolicy_nil (
+Messaging::tao_ReplyEndTimePolicy_life::tao_nil (
     void
   )
 {
   return Messaging::ReplyEndTimePolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_ReplyEndTimePolicy_life::tao_marshal (
+    Messaging::ReplyEndTimePolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::ReplyEndTimePolicy_ptr
-tao_Messaging_ReplyEndTimePolicy_narrow (
+Messaging::tao_ReplyEndTimePolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2716,7 +1785,7 @@ tao_Messaging_ReplyEndTimePolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_ReplyEndTimePolicy_upcast (
+Messaging::tao_ReplyEndTimePolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -2725,205 +1794,32 @@ tao_Messaging_ReplyEndTimePolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_ReplyEndTimePolicy_marshal (
-    Messaging::ReplyEndTimePolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::ReplyEndTimePolicy_var
-// *************************************************************
-
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (void)
-  : ptr_ (ReplyEndTimePolicy::_nil ())
-{}
-
-::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const ::Messaging::ReplyEndTimePolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ReplyEndTimePolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::ReplyEndTimePolicy_var &
-Messaging::ReplyEndTimePolicy_var::operator= (ReplyEndTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ReplyEndTimePolicy_var &
-Messaging::ReplyEndTimePolicy_var::operator= (const ::Messaging::ReplyEndTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::ReplyEndTimePolicy_var::operator const ::Messaging::ReplyEndTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::ReplyEndTimePolicy_var::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::ReplyEndTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
-  return val;
-}
-
-::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::tao_duplicate (ReplyEndTimePolicy_ptr p)
-{
-  return ::Messaging::ReplyEndTimePolicy::_duplicate (p);
-}
-
-void
-Messaging::ReplyEndTimePolicy_var::tao_release (ReplyEndTimePolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::tao_nil (void)
-{
-  return ::Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::ReplyEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::ReplyEndTimePolicy_var::tao_upcast (void *src)
-{
-  ReplyEndTimePolicy **tmp =
-    ACE_static_cast (ReplyEndTimePolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::ReplyEndTimePolicy,
+        Messaging::tao_ReplyEndTimePolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::ReplyEndTimePolicy,
+        Messaging::tao_ReplyEndTimePolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::ReplyEndTimePolicy, \
+        Messaging::tao_ReplyEndTimePolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::ReplyEndTimePolicy, \
+        Messaging::tao_ReplyEndTimePolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::ReplyEndTimePolicy_out
-// *************************************************************
-
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const ::Messaging::ReplyEndTimePolicy_out &p)
-  : ptr_ (ACE_const_cast (ReplyEndTimePolicy_out &, p).ptr_)
-{}
-
-::Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (const ::Messaging::ReplyEndTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ReplyEndTimePolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (const ::Messaging::ReplyEndTimePolicy_var &p)
-{
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (ReplyEndTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::ReplyEndTimePolicy_out::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
 {}
@@ -2931,7 +1827,7 @@ Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
 Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void)
 {}
 
-void 
+void
 Messaging::ReplyEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyEndTimePolicy *tmp = ACE_static_cast (ReplyEndTimePolicy *, _tao_void_pointer);
@@ -2947,7 +1843,7 @@ Messaging::ReplyEndTimePolicy::_narrow (
   return ReplyEndTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::ReplyEndTimePolicy_ptr 
+Messaging::ReplyEndTimePolicy_ptr
 Messaging::ReplyEndTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2957,7 +1853,7 @@ Messaging::ReplyEndTimePolicy::_unchecked_narrow (
     {
       return ReplyEndTimePolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ReplyEndTimePolicy_ptr,
@@ -2977,14 +1873,14 @@ Messaging::ReplyEndTimePolicy::_duplicate (ReplyEndTimePolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::ReplyEndTimePolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, ReplyEndTimePolicy)::_tao_class_id)
@@ -3017,12 +1913,12 @@ void *Messaging::ReplyEndTimePolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3031,6 +1927,12 @@ const char* Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::ReplyEndTimePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3038,23 +1940,23 @@ static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x706c7945), 
-  ACE_NTOHL (0x6e645469), 
-  ACE_NTOHL (0x6d65506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x706c7945),
+  ACE_NTOHL (0x6e645469),
+  ACE_NTOHL (0x6d65506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0
     19,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79456e64), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79456e64),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = ReplyEndTimePolicy
   };
 
@@ -3081,7 +1983,7 @@ TAO_NAMESPACE_END
 int Messaging::RelativeRequestTimeoutPolicy::_tao_class_id = 0;
 
 Messaging::RelativeRequestTimeoutPolicy_ptr
-tao_Messaging_RelativeRequestTimeoutPolicy_duplicate (
+Messaging::tao_RelativeRequestTimeoutPolicy_life::tao_duplicate (
     Messaging::RelativeRequestTimeoutPolicy_ptr p
   )
 {
@@ -3089,7 +1991,7 @@ tao_Messaging_RelativeRequestTimeoutPolicy_duplicate (
 }
 
 void
-tao_Messaging_RelativeRequestTimeoutPolicy_release (
+Messaging::tao_RelativeRequestTimeoutPolicy_life::tao_release (
     Messaging::RelativeRequestTimeoutPolicy_ptr p
   )
 {
@@ -3097,15 +1999,24 @@ tao_Messaging_RelativeRequestTimeoutPolicy_release (
 }
 
 Messaging::RelativeRequestTimeoutPolicy_ptr
-tao_Messaging_RelativeRequestTimeoutPolicy_nil (
+Messaging::tao_RelativeRequestTimeoutPolicy_life::tao_nil (
     void
   )
 {
   return Messaging::RelativeRequestTimeoutPolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_RelativeRequestTimeoutPolicy_life::tao_marshal (
+    Messaging::RelativeRequestTimeoutPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::RelativeRequestTimeoutPolicy_ptr
-tao_Messaging_RelativeRequestTimeoutPolicy_narrow (
+Messaging::tao_RelativeRequestTimeoutPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3114,7 +2025,7 @@ tao_Messaging_RelativeRequestTimeoutPolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_RelativeRequestTimeoutPolicy_upcast (
+Messaging::tao_RelativeRequestTimeoutPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -3123,205 +2034,32 @@ tao_Messaging_RelativeRequestTimeoutPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_RelativeRequestTimeoutPolicy_marshal (
-    Messaging::RelativeRequestTimeoutPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::RelativeRequestTimeoutPolicy_var
-// *************************************************************
-
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (void)
-  : ptr_ (RelativeRequestTimeoutPolicy::_nil ())
-{}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const ::Messaging::RelativeRequestTimeoutPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::RelativeRequestTimeoutPolicy_var &
-Messaging::RelativeRequestTimeoutPolicy_var::operator= (RelativeRequestTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RelativeRequestTimeoutPolicy_var &
-Messaging::RelativeRequestTimeoutPolicy_var::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::RelativeRequestTimeoutPolicy_var::operator const ::Messaging::RelativeRequestTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::RelativeRequestTimeoutPolicy_var::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RelativeRequestTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return val;
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::tao_duplicate (RelativeRequestTimeoutPolicy_ptr p)
-{
-  return ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p);
-}
-
-void
-Messaging::RelativeRequestTimeoutPolicy_var::tao_release (RelativeRequestTimeoutPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::tao_nil (void)
-{
-  return ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::RelativeRequestTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::RelativeRequestTimeoutPolicy_var::tao_upcast (void *src)
-{
-  RelativeRequestTimeoutPolicy **tmp =
-    ACE_static_cast (RelativeRequestTimeoutPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::RelativeRequestTimeoutPolicy,
+        Messaging::tao_RelativeRequestTimeoutPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::RelativeRequestTimeoutPolicy,
+        Messaging::tao_RelativeRequestTimeoutPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::RelativeRequestTimeoutPolicy, \
+        Messaging::tao_RelativeRequestTimeoutPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::RelativeRequestTimeoutPolicy, \
+        Messaging::tao_RelativeRequestTimeoutPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::RelativeRequestTimeoutPolicy_out
-// *************************************************************
-
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const ::Messaging::RelativeRequestTimeoutPolicy_out &p)
-  : ptr_ (ACE_const_cast (RelativeRequestTimeoutPolicy_out &, p).ptr_)
-{}
-
-::Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RelativeRequestTimeoutPolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (RelativeRequestTimeoutPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RelativeRequestTimeoutPolicy_out::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
 {}
@@ -3329,7 +2067,7 @@ Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
 Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void)
 {}
 
-void 
+void
 Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RelativeRequestTimeoutPolicy *tmp = ACE_static_cast (RelativeRequestTimeoutPolicy *, _tao_void_pointer);
@@ -3345,7 +2083,7 @@ Messaging::RelativeRequestTimeoutPolicy::_narrow (
   return RelativeRequestTimeoutPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::RelativeRequestTimeoutPolicy_ptr 
+Messaging::RelativeRequestTimeoutPolicy_ptr
 Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3355,7 +2093,7 @@ Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
     {
       return RelativeRequestTimeoutPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RelativeRequestTimeoutPolicy_ptr,
@@ -3375,14 +2113,14 @@ Messaging::RelativeRequestTimeoutPolicy::_duplicate (RelativeRequestTimeoutPolic
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::RelativeRequestTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, RelativeRequestTimeoutPolicy)::_tao_class_id)
@@ -3415,12 +2153,12 @@ void *Messaging::RelativeRequestTimeoutPolicy::_tao_QueryInterface (ptr_arith_t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3429,6 +2167,12 @@ const char* Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (v
   return "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3436,28 +2180,28 @@ static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x6c617469), 
-  ACE_NTOHL (0x76655265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x7454696d), 
-  ACE_NTOHL (0x656f7574), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x6c617469),
+  ACE_NTOHL (0x76655265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x7454696d),
+  ACE_NTOHL (0x656f7574),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0
     29,
-  ACE_NTOHL (0x52656c61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737454), 
-  ACE_NTOHL (0x696d656f), 
-  ACE_NTOHL (0x7574506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x52656c61),
+  ACE_NTOHL (0x74697665),
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737454),
+  ACE_NTOHL (0x696d656f),
+  ACE_NTOHL (0x7574506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = RelativeRequestTimeoutPolicy
   };
 
@@ -3485,22 +2229,22 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67547970), 
-  ACE_NTOHL (0x6552616e), 
-  ACE_NTOHL (0x67653a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f526f),
+  ACE_NTOHL (0x7574696e),
+  ACE_NTOHL (0x67547970),
+  ACE_NTOHL (0x6552616e),
+  ACE_NTOHL (0x67653a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0
     17,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6754), 
-  ACE_NTOHL (0x79706552), 
-  ACE_NTOHL (0x616e6765), 
+  ACE_NTOHL (0x526f7574),
+  ACE_NTOHL (0x696e6754),
+  ACE_NTOHL (0x79706552),
+  ACE_NTOHL (0x616e6765),
   ACE_NTOHL (0x0),  // name = RoutingTypeRange
   2, // member count
     4,
@@ -3509,19 +2253,19 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4d657373), 
-    ACE_NTOHL (0x6167696e), 
-    ACE_NTOHL (0x672f526f), 
-    ACE_NTOHL (0x7574696e), 
-    ACE_NTOHL (0x67547970), 
-    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x4d657373),
+    ACE_NTOHL (0x6167696e),
+    ACE_NTOHL (0x672f526f),
+    ACE_NTOHL (0x7574696e),
+    ACE_NTOHL (0x67547970),
+    ACE_NTOHL (0x653a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
         12,
-    ACE_NTOHL (0x526f7574), 
-    ACE_NTOHL (0x696e6754), 
+    ACE_NTOHL (0x526f7574),
+    ACE_NTOHL (0x696e6754),
     ACE_NTOHL (0x79706500),  // name = RoutingType
         CORBA::tk_short,
 
@@ -3549,8 +2293,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void Messaging::RoutingTypeRange::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -3559,12 +2303,31 @@ void Messaging::RoutingTypeRange::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      RoutingTypeRange
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      RoutingTypeRange \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int Messaging::RoutingPolicy::_tao_class_id = 0;
 
 Messaging::RoutingPolicy_ptr
-tao_Messaging_RoutingPolicy_duplicate (
+Messaging::tao_RoutingPolicy_life::tao_duplicate (
     Messaging::RoutingPolicy_ptr p
   )
 {
@@ -3572,7 +2335,7 @@ tao_Messaging_RoutingPolicy_duplicate (
 }
 
 void
-tao_Messaging_RoutingPolicy_release (
+Messaging::tao_RoutingPolicy_life::tao_release (
     Messaging::RoutingPolicy_ptr p
   )
 {
@@ -3580,15 +2343,24 @@ tao_Messaging_RoutingPolicy_release (
 }
 
 Messaging::RoutingPolicy_ptr
-tao_Messaging_RoutingPolicy_nil (
+Messaging::tao_RoutingPolicy_life::tao_nil (
     void
   )
 {
   return Messaging::RoutingPolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_RoutingPolicy_life::tao_marshal (
+    Messaging::RoutingPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::RoutingPolicy_ptr
-tao_Messaging_RoutingPolicy_narrow (
+Messaging::tao_RoutingPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3597,7 +2369,7 @@ tao_Messaging_RoutingPolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_RoutingPolicy_upcast (
+Messaging::tao_RoutingPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -3606,205 +2378,32 @@ tao_Messaging_RoutingPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_RoutingPolicy_marshal (
-    Messaging::RoutingPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::RoutingPolicy_var
-// *************************************************************
-
-Messaging::RoutingPolicy_var::RoutingPolicy_var (void)
-  : ptr_ (RoutingPolicy::_nil ())
-{}
-
-::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::RoutingPolicy_var::RoutingPolicy_var (const ::Messaging::RoutingPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (RoutingPolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::RoutingPolicy_var::~RoutingPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::RoutingPolicy_var &
-Messaging::RoutingPolicy_var::operator= (RoutingPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RoutingPolicy_var &
-Messaging::RoutingPolicy_var::operator= (const ::Messaging::RoutingPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RoutingPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::RoutingPolicy_var::operator const ::Messaging::RoutingPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::RoutingPolicy_var::operator ::Messaging::RoutingPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RoutingPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
-  return val;
-}
-
-::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::tao_duplicate (RoutingPolicy_ptr p)
-{
-  return ::Messaging::RoutingPolicy::_duplicate (p);
-}
-
-void
-Messaging::RoutingPolicy_var::tao_release (RoutingPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::tao_nil (void)
-{
-  return ::Messaging::RoutingPolicy::_nil ();
-}
-
-::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::RoutingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::RoutingPolicy_var::tao_upcast (void *src)
-{
-  RoutingPolicy **tmp =
-    ACE_static_cast (RoutingPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::RoutingPolicy,
+        Messaging::tao_RoutingPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::RoutingPolicy,
+        Messaging::tao_RoutingPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::RoutingPolicy, \
+        Messaging::tao_RoutingPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::RoutingPolicy, \
+        Messaging::tao_RoutingPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::RoutingPolicy_out
-// *************************************************************
-
-Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
-}
-
-Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
-}
-
-Messaging::RoutingPolicy_out::RoutingPolicy_out (const ::Messaging::RoutingPolicy_out &p)
-  : ptr_ (ACE_const_cast (RoutingPolicy_out &, p).ptr_)
-{}
-
-::Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (const ::Messaging::RoutingPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RoutingPolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (const ::Messaging::RoutingPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RoutingPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (RoutingPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RoutingPolicy_out::operator ::Messaging::RoutingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::RoutingPolicy::RoutingPolicy (void)
 {}
@@ -3812,7 +2411,7 @@ Messaging::RoutingPolicy::RoutingPolicy (void)
 Messaging::RoutingPolicy::~RoutingPolicy (void)
 {}
 
-void 
+void
 Messaging::RoutingPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RoutingPolicy *tmp = ACE_static_cast (RoutingPolicy *, _tao_void_pointer);
@@ -3828,7 +2427,7 @@ Messaging::RoutingPolicy::_narrow (
   return RoutingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::RoutingPolicy_ptr 
+Messaging::RoutingPolicy_ptr
 Messaging::RoutingPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3838,7 +2437,7 @@ Messaging::RoutingPolicy::_unchecked_narrow (
     {
       return RoutingPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RoutingPolicy_ptr,
@@ -3858,14 +2457,14 @@ Messaging::RoutingPolicy::_duplicate (RoutingPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::RoutingPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, RoutingPolicy)::_tao_class_id)
@@ -3898,12 +2497,12 @@ void *Messaging::RoutingPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3912,6 +2511,12 @@ const char* Messaging::RoutingPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/RoutingPolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::RoutingPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3919,20 +2524,20 @@ static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f526f), 
-  ACE_NTOHL (0x7574696e), 
-  ACE_NTOHL (0x67506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f526f),
+  ACE_NTOHL (0x7574696e),
+  ACE_NTOHL (0x67506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/RoutingPolicy:1.0
     14,
-  ACE_NTOHL (0x526f7574), 
-  ACE_NTOHL (0x696e6750), 
-  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x526f7574),
+  ACE_NTOHL (0x696e6750),
+  ACE_NTOHL (0x6f6c6963),
   ACE_NTOHL (0x79000000),  // name = RoutingPolicy
   };
 
@@ -3959,7 +2564,7 @@ TAO_NAMESPACE_END
 int Messaging::MaxHopsPolicy::_tao_class_id = 0;
 
 Messaging::MaxHopsPolicy_ptr
-tao_Messaging_MaxHopsPolicy_duplicate (
+Messaging::tao_MaxHopsPolicy_life::tao_duplicate (
     Messaging::MaxHopsPolicy_ptr p
   )
 {
@@ -3967,7 +2572,7 @@ tao_Messaging_MaxHopsPolicy_duplicate (
 }
 
 void
-tao_Messaging_MaxHopsPolicy_release (
+Messaging::tao_MaxHopsPolicy_life::tao_release (
     Messaging::MaxHopsPolicy_ptr p
   )
 {
@@ -3975,15 +2580,24 @@ tao_Messaging_MaxHopsPolicy_release (
 }
 
 Messaging::MaxHopsPolicy_ptr
-tao_Messaging_MaxHopsPolicy_nil (
+Messaging::tao_MaxHopsPolicy_life::tao_nil (
     void
   )
 {
   return Messaging::MaxHopsPolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_MaxHopsPolicy_life::tao_marshal (
+    Messaging::MaxHopsPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::MaxHopsPolicy_ptr
-tao_Messaging_MaxHopsPolicy_narrow (
+Messaging::tao_MaxHopsPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3992,7 +2606,7 @@ tao_Messaging_MaxHopsPolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_MaxHopsPolicy_upcast (
+Messaging::tao_MaxHopsPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -4001,205 +2615,32 @@ tao_Messaging_MaxHopsPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_MaxHopsPolicy_marshal (
-    Messaging::MaxHopsPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::MaxHopsPolicy_var
-// *************************************************************
-
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (void)
-  : ptr_ (MaxHopsPolicy::_nil ())
-{}
-
-::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const ::Messaging::MaxHopsPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (MaxHopsPolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::MaxHopsPolicy_var &
-Messaging::MaxHopsPolicy_var::operator= (MaxHopsPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::MaxHopsPolicy_var &
-Messaging::MaxHopsPolicy_var::operator= (const ::Messaging::MaxHopsPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::MaxHopsPolicy_var::operator const ::Messaging::MaxHopsPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::MaxHopsPolicy_var::operator ::Messaging::MaxHopsPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::MaxHopsPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
-  return val;
-}
-
-::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::tao_duplicate (MaxHopsPolicy_ptr p)
-{
-  return ::Messaging::MaxHopsPolicy::_duplicate (p);
-}
-
-void
-Messaging::MaxHopsPolicy_var::tao_release (MaxHopsPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::tao_nil (void)
-{
-  return ::Messaging::MaxHopsPolicy::_nil ();
-}
-
-::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::MaxHopsPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::MaxHopsPolicy_var::tao_upcast (void *src)
-{
-  MaxHopsPolicy **tmp =
-    ACE_static_cast (MaxHopsPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::MaxHopsPolicy,
+        Messaging::tao_MaxHopsPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::MaxHopsPolicy,
+        Messaging::tao_MaxHopsPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::MaxHopsPolicy, \
+        Messaging::tao_MaxHopsPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::MaxHopsPolicy, \
+        Messaging::tao_MaxHopsPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::MaxHopsPolicy_out
-// *************************************************************
-
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
-}
-
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
-}
-
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const ::Messaging::MaxHopsPolicy_out &p)
-  : ptr_ (ACE_const_cast (MaxHopsPolicy_out &, p).ptr_)
-{}
-
-::Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (const ::Messaging::MaxHopsPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (MaxHopsPolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (const ::Messaging::MaxHopsPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (MaxHopsPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::MaxHopsPolicy_out::operator ::Messaging::MaxHopsPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
 {}
@@ -4207,7 +2648,7 @@ Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
 Messaging::MaxHopsPolicy::~MaxHopsPolicy (void)
 {}
 
-void 
+void
 Messaging::MaxHopsPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   MaxHopsPolicy *tmp = ACE_static_cast (MaxHopsPolicy *, _tao_void_pointer);
@@ -4223,7 +2664,7 @@ Messaging::MaxHopsPolicy::_narrow (
   return MaxHopsPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::MaxHopsPolicy_ptr 
+Messaging::MaxHopsPolicy_ptr
 Messaging::MaxHopsPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4233,7 +2674,7 @@ Messaging::MaxHopsPolicy::_unchecked_narrow (
     {
       return MaxHopsPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           MaxHopsPolicy_ptr,
@@ -4253,14 +2694,14 @@ Messaging::MaxHopsPolicy::_duplicate (MaxHopsPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::MaxHopsPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, MaxHopsPolicy)::_tao_class_id)
@@ -4293,12 +2734,12 @@ void *Messaging::MaxHopsPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4307,6 +2748,12 @@ const char* Messaging::MaxHopsPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/MaxHopsPolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::MaxHopsPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4314,20 +2761,20 @@ static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f4d61), 
-  ACE_NTOHL (0x78486f70), 
-  ACE_NTOHL (0x73506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f4d61),
+  ACE_NTOHL (0x78486f70),
+  ACE_NTOHL (0x73506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/MaxHopsPolicy:1.0
     14,
-  ACE_NTOHL (0x4d617848), 
-  ACE_NTOHL (0x6f707350), 
-  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x4d617848),
+  ACE_NTOHL (0x6f707350),
+  ACE_NTOHL (0x6f6c6963),
   ACE_NTOHL (0x79000000),  // name = MaxHopsPolicy
   };
 
@@ -4354,7 +2801,7 @@ TAO_NAMESPACE_END
 int Messaging::QueueOrderPolicy::_tao_class_id = 0;
 
 Messaging::QueueOrderPolicy_ptr
-tao_Messaging_QueueOrderPolicy_duplicate (
+Messaging::tao_QueueOrderPolicy_life::tao_duplicate (
     Messaging::QueueOrderPolicy_ptr p
   )
 {
@@ -4362,7 +2809,7 @@ tao_Messaging_QueueOrderPolicy_duplicate (
 }
 
 void
-tao_Messaging_QueueOrderPolicy_release (
+Messaging::tao_QueueOrderPolicy_life::tao_release (
     Messaging::QueueOrderPolicy_ptr p
   )
 {
@@ -4370,15 +2817,24 @@ tao_Messaging_QueueOrderPolicy_release (
 }
 
 Messaging::QueueOrderPolicy_ptr
-tao_Messaging_QueueOrderPolicy_nil (
+Messaging::tao_QueueOrderPolicy_life::tao_nil (
     void
   )
 {
   return Messaging::QueueOrderPolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_QueueOrderPolicy_life::tao_marshal (
+    Messaging::QueueOrderPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::QueueOrderPolicy_ptr
-tao_Messaging_QueueOrderPolicy_narrow (
+Messaging::tao_QueueOrderPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -4387,7 +2843,7 @@ tao_Messaging_QueueOrderPolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_QueueOrderPolicy_upcast (
+Messaging::tao_QueueOrderPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -4396,205 +2852,32 @@ tao_Messaging_QueueOrderPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_QueueOrderPolicy_marshal (
-    Messaging::QueueOrderPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::QueueOrderPolicy_var
-// *************************************************************
-
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (void)
-  : ptr_ (QueueOrderPolicy::_nil ())
-{}
-
-::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const ::Messaging::QueueOrderPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (QueueOrderPolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::QueueOrderPolicy_var::~QueueOrderPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::QueueOrderPolicy_var &
-Messaging::QueueOrderPolicy_var::operator= (QueueOrderPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::QueueOrderPolicy_var &
-Messaging::QueueOrderPolicy_var::operator= (const ::Messaging::QueueOrderPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::QueueOrderPolicy_var::operator const ::Messaging::QueueOrderPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::QueueOrderPolicy_var::operator ::Messaging::QueueOrderPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::QueueOrderPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
-  return val;
-}
-
-::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::tao_duplicate (QueueOrderPolicy_ptr p)
-{
-  return ::Messaging::QueueOrderPolicy::_duplicate (p);
-}
-
-void
-Messaging::QueueOrderPolicy_var::tao_release (QueueOrderPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::tao_nil (void)
-{
-  return ::Messaging::QueueOrderPolicy::_nil ();
-}
-
-::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::QueueOrderPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::QueueOrderPolicy_var::tao_upcast (void *src)
-{
-  QueueOrderPolicy **tmp =
-    ACE_static_cast (QueueOrderPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::QueueOrderPolicy,
+        Messaging::tao_QueueOrderPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::QueueOrderPolicy,
+        Messaging::tao_QueueOrderPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::QueueOrderPolicy, \
+        Messaging::tao_QueueOrderPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::QueueOrderPolicy, \
+        Messaging::tao_QueueOrderPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::QueueOrderPolicy_out
-// *************************************************************
-
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
-}
-
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
-}
-
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const ::Messaging::QueueOrderPolicy_out &p)
-  : ptr_ (ACE_const_cast (QueueOrderPolicy_out &, p).ptr_)
-{}
-
-::Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (const ::Messaging::QueueOrderPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (QueueOrderPolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (const ::Messaging::QueueOrderPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (QueueOrderPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::QueueOrderPolicy_out::operator ::Messaging::QueueOrderPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
 {}
@@ -4602,7 +2885,7 @@ Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
 Messaging::QueueOrderPolicy::~QueueOrderPolicy (void)
 {}
 
-void 
+void
 Messaging::QueueOrderPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   QueueOrderPolicy *tmp = ACE_static_cast (QueueOrderPolicy *, _tao_void_pointer);
@@ -4618,7 +2901,7 @@ Messaging::QueueOrderPolicy::_narrow (
   return QueueOrderPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::QueueOrderPolicy_ptr 
+Messaging::QueueOrderPolicy_ptr
 Messaging::QueueOrderPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4628,7 +2911,7 @@ Messaging::QueueOrderPolicy::_unchecked_narrow (
     {
       return QueueOrderPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           QueueOrderPolicy_ptr,
@@ -4648,14 +2931,14 @@ Messaging::QueueOrderPolicy::_duplicate (QueueOrderPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::QueueOrderPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, QueueOrderPolicy)::_tao_class_id)
@@ -4688,12 +2971,12 @@ void *Messaging::QueueOrderPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4702,6 +2985,12 @@ const char* Messaging::QueueOrderPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/QueueOrderPolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4709,22 +2998,22 @@ static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5175), 
-  ACE_NTOHL (0x6575654f), 
-  ACE_NTOHL (0x72646572), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5175),
+  ACE_NTOHL (0x6575654f),
+  ACE_NTOHL (0x72646572),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/QueueOrderPolicy:1.0
     17,
-  ACE_NTOHL (0x51756575), 
-  ACE_NTOHL (0x654f7264), 
-  ACE_NTOHL (0x6572506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x51756575),
+  ACE_NTOHL (0x654f7264),
+  ACE_NTOHL (0x6572506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = QueueOrderPolicy
   };
 
@@ -4799,7 +3088,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<Messaging::RebindPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5242,7 +3531,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5468,4 +3757,3 @@ operator>>= (
 # pragma instantiate TAO_Object_Manager<Messaging::QueueOrderPolicy, Messaging::QueueOrderPolicy_var>
 # pragma instantiate TAO::Any_Impl_T<Messaging::QueueOrderPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index e4c2b06aa18..d3c785c8bef 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -69,195 +69,158 @@
 
 TAO_NAMESPACE  Messaging
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::Short RebindMode;
   typedef CORBA::Short_out RebindMode_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RebindMode;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short TRANSPARENT = 0;
-  
+
+  const Messaging::RebindMode TRANSPARENT = 0;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short NO_REBIND = 1;
-  
+
+  const Messaging::RebindMode NO_REBIND = 1;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short NO_RECONNECT = 2;
-  
+
+  const Messaging::RebindMode NO_RECONNECT = 2;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::Short RoutingType;
   typedef CORBA::Short_out RoutingType_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingType;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short ROUTE_NONE = 0;
-  
+
+  const Messaging::RoutingType ROUTE_NONE = 0;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short ROUTE_FORWARD = 1;
-  
+
+  const Messaging::RoutingType ROUTE_FORWARD = 1;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short ROUTE_STORE_AND_FORWARD = 2;
-  
+
+  const Messaging::RoutingType ROUTE_STORE_AND_FORWARD = 2;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::UShort Ordering;
   typedef CORBA::UShort_out Ordering_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Ordering;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::UShort ORDER_ANY = 1U;
-  
+
+  const Messaging::Ordering ORDER_ANY = 1U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::UShort ORDER_TEMPORAL = 2U;
-  
+
+  const Messaging::Ordering ORDER_TEMPORAL = 2U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::UShort ORDER_PRIORITY = 4U;
-  
+
+  const Messaging::Ordering ORDER_PRIORITY = 4U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::UShort ORDER_DEADLINE = 8U;
-  
+
+  const Messaging::Ordering ORDER_DEADLINE = 8U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong REBIND_POLICY_TYPE = 23U;
-  
+
+  const CORBA::PolicyType REBIND_POLICY_TYPE = 23U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_REBINDPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_REBINDPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_REBINDPOLICY___PTR_CH_)
-#define _MESSAGING_REBINDPOLICY___PTR_CH_
-  
   class RebindPolicy;
   typedef RebindPolicy *RebindPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REBINDPOLICY___VAR_CH_)
-#define _MESSAGING_REBINDPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export RebindPolicy_var : public TAO_Base_var
+  struct tao_RebindPolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        RebindPolicy,
+        tao_RebindPolicy_life
+      >
+    RebindPolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        RebindPolicy,
+        tao_RebindPolicy_life
+      >
+    RebindPolicy_out;
+
+  struct TAO_Messaging_Export tao_RebindPolicy_life
   {
-  public:
-    RebindPolicy_var (void); // default constructor
-    RebindPolicy_var (RebindPolicy_ptr p) : ptr_ (p) {} 
-    RebindPolicy_var (const RebindPolicy_var &); // copy constructor
-    ~RebindPolicy_var (void); // destructor
-    
-    RebindPolicy_var &operator= (RebindPolicy_ptr);
-    RebindPolicy_var &operator= (const RebindPolicy_var &);
-    RebindPolicy_ptr operator-> (void) const;
-    
-    operator const RebindPolicy_ptr &() const;
-    operator RebindPolicy_ptr &();
-    // in, inout, out, _retn 
-    RebindPolicy_ptr in (void) const;
-    RebindPolicy_ptr &inout (void);
-    RebindPolicy_ptr &out (void);
-    RebindPolicy_ptr _retn (void);
-    RebindPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RebindPolicy_ptr tao_duplicate (RebindPolicy_ptr);
     static void tao_release (RebindPolicy_ptr);
     static RebindPolicy_ptr tao_nil (void);
-    static RebindPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RebindPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RebindPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RebindPolicy_var (const TAO_Base_var &rhs);
-    RebindPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REBINDPOLICY___OUT_CH_)
-#define _MESSAGING_REBINDPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export RebindPolicy_out
+  struct TAO_Messaging_Export tao_RebindPolicy_cast
   {
-  public:
-    RebindPolicy_out (RebindPolicy_ptr &);
-    RebindPolicy_out (RebindPolicy_var &);
-    RebindPolicy_out (const RebindPolicy_out &);
-    RebindPolicy_out &operator= (const RebindPolicy_out &);
-    RebindPolicy_out &operator= (const RebindPolicy_var &);
-    RebindPolicy_out &operator= (RebindPolicy_ptr);
-    operator RebindPolicy_ptr &();
-    RebindPolicy_ptr &ptr (void);
-    RebindPolicy_ptr operator-> (void);
-  
-  private:
-    RebindPolicy_ptr &ptr_;
+    static RebindPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REBINDPOLICY_CH_)
 #define _MESSAGING_REBINDPOLICY_CH_
-  
+
   class TAO_Messaging_Export RebindPolicy
     : public virtual CORBA::Policy
   {
@@ -265,220 +228,150 @@ TAO_NAMESPACE  Messaging
     typedef RebindPolicy_ptr _ptr_type;
     typedef RebindPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj);
-    
+
     static RebindPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RebindPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RebindPolicy_ptr _nil (void)
       {
         return (RebindPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual Messaging::RebindMode rebind_mode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     RebindPolicy (void);
     virtual ~RebindPolicy (void);
-    
-    friend class _TAO_RebindPolicy_Remote_Proxy_Impl;
-    friend class _TAO_RebindPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_RebindPolicy_Direct_Proxy_Impl;
-  
+
   private:
     RebindPolicy (const RebindPolicy &);
     void operator= (const RebindPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RebindPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong REQUEST_PRIORITY_POLICY_TYPE = 25U;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class PriorityRange_var;
-  
+
+  const CORBA::PolicyType REQUEST_PRIORITY_POLICY_TYPE = 25U;
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct PriorityRange;
+
+  typedef
+    TAO_Fixed_Var_T<
+        PriorityRange
+      >
+    PriorityRange_var;
+
+  typedef
+    PriorityRange &
+    PriorityRange_out;
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_Messaging_Export PriorityRange
   {
     typedef PriorityRange_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     Messaging::Priority min;
     Messaging::Priority max;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Messaging_Export PriorityRange_var
-  {
-  public:
-    PriorityRange_var (void);
-    PriorityRange_var (PriorityRange *);
-    PriorityRange_var (const PriorityRange_var &);
-    // Fixed-size types only.
-    PriorityRange_var (const PriorityRange &);
-    ~PriorityRange_var (void);
-    
-    PriorityRange_var &operator= (PriorityRange *);
-    PriorityRange_var &operator= (const PriorityRange_var &);
-    
-    // Fixed-size types only.
-    PriorityRange_var &operator= (const PriorityRange &);
-    
-    PriorityRange *operator-> (void);
-    const PriorityRange *operator-> (void) const;
-    
-    operator const PriorityRange &() const;
-    operator PriorityRange &();
-    operator PriorityRange &() const;
-    
-    // in, inout, out, _retn 
-    const PriorityRange &in (void) const;
-    PriorityRange &inout (void);
-    PriorityRange &out (void);
-    PriorityRange _retn (void);
-    PriorityRange *ptr (void) const;
-  
-  private:
-    PriorityRange *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
-  
-  typedef PriorityRange &PriorityRange_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityRange;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_REQUESTPRIORITYPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___PTR_CH_)
-#define _MESSAGING_REQUESTPRIORITYPOLICY___PTR_CH_
-  
   class RequestPriorityPolicy;
   typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___VAR_CH_)
-#define _MESSAGING_REQUESTPRIORITYPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export RequestPriorityPolicy_var : public TAO_Base_var
+  struct tao_RequestPriorityPolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        RequestPriorityPolicy,
+        tao_RequestPriorityPolicy_life
+      >
+    RequestPriorityPolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        RequestPriorityPolicy,
+        tao_RequestPriorityPolicy_life
+      >
+    RequestPriorityPolicy_out;
+
+  struct TAO_Messaging_Export tao_RequestPriorityPolicy_life
   {
-  public:
-    RequestPriorityPolicy_var (void); // default constructor
-    RequestPriorityPolicy_var (RequestPriorityPolicy_ptr p) : ptr_ (p) {} 
-    RequestPriorityPolicy_var (const RequestPriorityPolicy_var &); // copy constructor
-    ~RequestPriorityPolicy_var (void); // destructor
-    
-    RequestPriorityPolicy_var &operator= (RequestPriorityPolicy_ptr);
-    RequestPriorityPolicy_var &operator= (const RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_ptr operator-> (void) const;
-    
-    operator const RequestPriorityPolicy_ptr &() const;
-    operator RequestPriorityPolicy_ptr &();
-    // in, inout, out, _retn 
-    RequestPriorityPolicy_ptr in (void) const;
-    RequestPriorityPolicy_ptr &inout (void);
-    RequestPriorityPolicy_ptr &out (void);
-    RequestPriorityPolicy_ptr _retn (void);
-    RequestPriorityPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RequestPriorityPolicy_ptr tao_duplicate (RequestPriorityPolicy_ptr);
     static void tao_release (RequestPriorityPolicy_ptr);
     static RequestPriorityPolicy_ptr tao_nil (void);
-    static RequestPriorityPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RequestPriorityPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RequestPriorityPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RequestPriorityPolicy_var (const TAO_Base_var &rhs);
-    RequestPriorityPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___OUT_CH_)
-#define _MESSAGING_REQUESTPRIORITYPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export RequestPriorityPolicy_out
+  struct TAO_Messaging_Export tao_RequestPriorityPolicy_cast
   {
-  public:
-    RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &);
-    RequestPriorityPolicy_out (RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_out (const RequestPriorityPolicy_out &);
-    RequestPriorityPolicy_out &operator= (const RequestPriorityPolicy_out &);
-    RequestPriorityPolicy_out &operator= (const RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_out &operator= (RequestPriorityPolicy_ptr);
-    operator RequestPriorityPolicy_ptr &();
-    RequestPriorityPolicy_ptr &ptr (void);
-    RequestPriorityPolicy_ptr operator-> (void);
-  
-  private:
-    RequestPriorityPolicy_ptr &ptr_;
+    static RequestPriorityPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY_CH_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY_CH_
-  
+
   class TAO_Messaging_Export RequestPriorityPolicy
     : public virtual CORBA::Policy
   {
@@ -486,159 +379,118 @@ TAO_NAMESPACE  Messaging
     typedef RequestPriorityPolicy_ptr _ptr_type;
     typedef RequestPriorityPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj);
-    
+
     static RequestPriorityPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestPriorityPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestPriorityPolicy_ptr _nil (void)
       {
         return (RequestPriorityPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::Messaging::PriorityRange priority_range (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     RequestPriorityPolicy (void);
     virtual ~RequestPriorityPolicy (void);
-    
-    friend class _TAO_RequestPriorityPolicy_Remote_Proxy_Impl;
-    friend class _TAO_RequestPriorityPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_RequestPriorityPolicy_Direct_Proxy_Impl;
-  
+
   private:
     RequestPriorityPolicy (const RequestPriorityPolicy &);
     void operator= (const RequestPriorityPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestPriorityPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong REPLY_PRIORITY_POLICY_TYPE = 26U;
-  
+
+  const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_REPLYPRIORITYPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_REPLYPRIORITYPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___PTR_CH_)
-#define _MESSAGING_REPLYPRIORITYPOLICY___PTR_CH_
-  
   class ReplyPriorityPolicy;
   typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___VAR_CH_)
-#define _MESSAGING_REPLYPRIORITYPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export ReplyPriorityPolicy_var : public TAO_Base_var
+  struct tao_ReplyPriorityPolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        ReplyPriorityPolicy,
+        tao_ReplyPriorityPolicy_life
+      >
+    ReplyPriorityPolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ReplyPriorityPolicy,
+        tao_ReplyPriorityPolicy_life
+      >
+    ReplyPriorityPolicy_out;
+
+  struct TAO_Messaging_Export tao_ReplyPriorityPolicy_life
   {
-  public:
-    ReplyPriorityPolicy_var (void); // default constructor
-    ReplyPriorityPolicy_var (ReplyPriorityPolicy_ptr p) : ptr_ (p) {} 
-    ReplyPriorityPolicy_var (const ReplyPriorityPolicy_var &); // copy constructor
-    ~ReplyPriorityPolicy_var (void); // destructor
-    
-    ReplyPriorityPolicy_var &operator= (ReplyPriorityPolicy_ptr);
-    ReplyPriorityPolicy_var &operator= (const ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_ptr operator-> (void) const;
-    
-    operator const ReplyPriorityPolicy_ptr &() const;
-    operator ReplyPriorityPolicy_ptr &();
-    // in, inout, out, _retn 
-    ReplyPriorityPolicy_ptr in (void) const;
-    ReplyPriorityPolicy_ptr &inout (void);
-    ReplyPriorityPolicy_ptr &out (void);
-    ReplyPriorityPolicy_ptr _retn (void);
-    ReplyPriorityPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ReplyPriorityPolicy_ptr tao_duplicate (ReplyPriorityPolicy_ptr);
     static void tao_release (ReplyPriorityPolicy_ptr);
     static ReplyPriorityPolicy_ptr tao_nil (void);
-    static ReplyPriorityPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ReplyPriorityPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ReplyPriorityPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ReplyPriorityPolicy_var (const TAO_Base_var &rhs);
-    ReplyPriorityPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___OUT_CH_)
-#define _MESSAGING_REPLYPRIORITYPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export ReplyPriorityPolicy_out
+  struct TAO_Messaging_Export tao_ReplyPriorityPolicy_cast
   {
-  public:
-    ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &);
-    ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_out (const ReplyPriorityPolicy_out &);
-    ReplyPriorityPolicy_out &operator= (const ReplyPriorityPolicy_out &);
-    ReplyPriorityPolicy_out &operator= (const ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_out &operator= (ReplyPriorityPolicy_ptr);
-    operator ReplyPriorityPolicy_ptr &();
-    ReplyPriorityPolicy_ptr &ptr (void);
-    ReplyPriorityPolicy_ptr operator-> (void);
-  
-  private:
-    ReplyPriorityPolicy_ptr &ptr_;
+    static ReplyPriorityPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY_CH_)
 #define _MESSAGING_REPLYPRIORITYPOLICY_CH_
-  
+
   class TAO_Messaging_Export ReplyPriorityPolicy
     : public virtual CORBA::Policy
   {
@@ -646,159 +498,118 @@ TAO_NAMESPACE  Messaging
     typedef ReplyPriorityPolicy_ptr _ptr_type;
     typedef ReplyPriorityPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj);
-    
+
     static ReplyPriorityPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ReplyPriorityPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ReplyPriorityPolicy_ptr _nil (void)
       {
         return (ReplyPriorityPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::Messaging::PriorityRange priority_range (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ReplyPriorityPolicy (void);
     virtual ~ReplyPriorityPolicy (void);
-    
-    friend class _TAO_ReplyPriorityPolicy_Remote_Proxy_Impl;
-    friend class _TAO_ReplyPriorityPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_ReplyPriorityPolicy_Direct_Proxy_Impl;
-  
+
   private:
     ReplyPriorityPolicy (const ReplyPriorityPolicy &);
     void operator= (const ReplyPriorityPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong REQUEST_START_TIME_POLICY_TYPE = 27U;
-  
+
+  const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_REQUESTSTARTTIMEPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___PTR_CH_)
-#define _MESSAGING_REQUESTSTARTTIMEPOLICY___PTR_CH_
-  
   class RequestStartTimePolicy;
   typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CH_)
-#define _MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export RequestStartTimePolicy_var : public TAO_Base_var
+  struct tao_RequestStartTimePolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        RequestStartTimePolicy,
+        tao_RequestStartTimePolicy_life
+      >
+    RequestStartTimePolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        RequestStartTimePolicy,
+        tao_RequestStartTimePolicy_life
+      >
+    RequestStartTimePolicy_out;
+
+  struct TAO_Messaging_Export tao_RequestStartTimePolicy_life
   {
-  public:
-    RequestStartTimePolicy_var (void); // default constructor
-    RequestStartTimePolicy_var (RequestStartTimePolicy_ptr p) : ptr_ (p) {} 
-    RequestStartTimePolicy_var (const RequestStartTimePolicy_var &); // copy constructor
-    ~RequestStartTimePolicy_var (void); // destructor
-    
-    RequestStartTimePolicy_var &operator= (RequestStartTimePolicy_ptr);
-    RequestStartTimePolicy_var &operator= (const RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_ptr operator-> (void) const;
-    
-    operator const RequestStartTimePolicy_ptr &() const;
-    operator RequestStartTimePolicy_ptr &();
-    // in, inout, out, _retn 
-    RequestStartTimePolicy_ptr in (void) const;
-    RequestStartTimePolicy_ptr &inout (void);
-    RequestStartTimePolicy_ptr &out (void);
-    RequestStartTimePolicy_ptr _retn (void);
-    RequestStartTimePolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RequestStartTimePolicy_ptr tao_duplicate (RequestStartTimePolicy_ptr);
     static void tao_release (RequestStartTimePolicy_ptr);
     static RequestStartTimePolicy_ptr tao_nil (void);
-    static RequestStartTimePolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RequestStartTimePolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RequestStartTimePolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RequestStartTimePolicy_var (const TAO_Base_var &rhs);
-    RequestStartTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CH_)
-#define _MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export RequestStartTimePolicy_out
+  struct TAO_Messaging_Export tao_RequestStartTimePolicy_cast
   {
-  public:
-    RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &);
-    RequestStartTimePolicy_out (RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_out (const RequestStartTimePolicy_out &);
-    RequestStartTimePolicy_out &operator= (const RequestStartTimePolicy_out &);
-    RequestStartTimePolicy_out &operator= (const RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_out &operator= (RequestStartTimePolicy_ptr);
-    operator RequestStartTimePolicy_ptr &();
-    RequestStartTimePolicy_ptr &ptr (void);
-    RequestStartTimePolicy_ptr operator-> (void);
-  
-  private:
-    RequestStartTimePolicy_ptr &ptr_;
+    static RequestStartTimePolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY_CH_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY_CH_
-  
+
   class TAO_Messaging_Export RequestStartTimePolicy
     : public virtual CORBA::Policy
   {
@@ -806,159 +617,118 @@ TAO_NAMESPACE  Messaging
     typedef RequestStartTimePolicy_ptr _ptr_type;
     typedef RequestStartTimePolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj);
-    
+
     static RequestStartTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestStartTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestStartTimePolicy_ptr _nil (void)
       {
         return (RequestStartTimePolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::TimeBase::UtcT start_time (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     RequestStartTimePolicy (void);
     virtual ~RequestStartTimePolicy (void);
-    
-    friend class _TAO_RequestStartTimePolicy_Remote_Proxy_Impl;
-    friend class _TAO_RequestStartTimePolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_RequestStartTimePolicy_Direct_Proxy_Impl;
-  
+
   private:
     RequestStartTimePolicy (const RequestStartTimePolicy &);
     void operator= (const RequestStartTimePolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestStartTimePolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong REQUEST_END_TIME_POLICY_TYPE = 28U;
-  
+
+  const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_REQUESTENDTIMEPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___PTR_CH_)
-#define _MESSAGING_REQUESTENDTIMEPOLICY___PTR_CH_
-  
   class RequestEndTimePolicy;
   typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___VAR_CH_)
-#define _MESSAGING_REQUESTENDTIMEPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export RequestEndTimePolicy_var : public TAO_Base_var
+  struct tao_RequestEndTimePolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        RequestEndTimePolicy,
+        tao_RequestEndTimePolicy_life
+      >
+    RequestEndTimePolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        RequestEndTimePolicy,
+        tao_RequestEndTimePolicy_life
+      >
+    RequestEndTimePolicy_out;
+
+  struct TAO_Messaging_Export tao_RequestEndTimePolicy_life
   {
-  public:
-    RequestEndTimePolicy_var (void); // default constructor
-    RequestEndTimePolicy_var (RequestEndTimePolicy_ptr p) : ptr_ (p) {} 
-    RequestEndTimePolicy_var (const RequestEndTimePolicy_var &); // copy constructor
-    ~RequestEndTimePolicy_var (void); // destructor
-    
-    RequestEndTimePolicy_var &operator= (RequestEndTimePolicy_ptr);
-    RequestEndTimePolicy_var &operator= (const RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_ptr operator-> (void) const;
-    
-    operator const RequestEndTimePolicy_ptr &() const;
-    operator RequestEndTimePolicy_ptr &();
-    // in, inout, out, _retn 
-    RequestEndTimePolicy_ptr in (void) const;
-    RequestEndTimePolicy_ptr &inout (void);
-    RequestEndTimePolicy_ptr &out (void);
-    RequestEndTimePolicy_ptr _retn (void);
-    RequestEndTimePolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RequestEndTimePolicy_ptr tao_duplicate (RequestEndTimePolicy_ptr);
     static void tao_release (RequestEndTimePolicy_ptr);
     static RequestEndTimePolicy_ptr tao_nil (void);
-    static RequestEndTimePolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RequestEndTimePolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RequestEndTimePolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RequestEndTimePolicy_var (const TAO_Base_var &rhs);
-    RequestEndTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___OUT_CH_)
-#define _MESSAGING_REQUESTENDTIMEPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export RequestEndTimePolicy_out
+  struct TAO_Messaging_Export tao_RequestEndTimePolicy_cast
   {
-  public:
-    RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &);
-    RequestEndTimePolicy_out (RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_out (const RequestEndTimePolicy_out &);
-    RequestEndTimePolicy_out &operator= (const RequestEndTimePolicy_out &);
-    RequestEndTimePolicy_out &operator= (const RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_out &operator= (RequestEndTimePolicy_ptr);
-    operator RequestEndTimePolicy_ptr &();
-    RequestEndTimePolicy_ptr &ptr (void);
-    RequestEndTimePolicy_ptr operator-> (void);
-  
-  private:
-    RequestEndTimePolicy_ptr &ptr_;
+    static RequestEndTimePolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY_CH_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY_CH_
-  
+
   class TAO_Messaging_Export RequestEndTimePolicy
     : public virtual CORBA::Policy
   {
@@ -966,159 +736,118 @@ TAO_NAMESPACE  Messaging
     typedef RequestEndTimePolicy_ptr _ptr_type;
     typedef RequestEndTimePolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj);
-    
+
     static RequestEndTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestEndTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestEndTimePolicy_ptr _nil (void)
       {
         return (RequestEndTimePolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::TimeBase::UtcT end_time (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     RequestEndTimePolicy (void);
     virtual ~RequestEndTimePolicy (void);
-    
-    friend class _TAO_RequestEndTimePolicy_Remote_Proxy_Impl;
-    friend class _TAO_RequestEndTimePolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_RequestEndTimePolicy_Direct_Proxy_Impl;
-  
+
   private:
     RequestEndTimePolicy (const RequestEndTimePolicy &);
     void operator= (const RequestEndTimePolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestEndTimePolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong REPLY_START_TIME_POLICY_TYPE = 29U;
-  
+
+  const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_REPLYSTARTTIMEPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___PTR_CH_)
-#define _MESSAGING_REPLYSTARTTIMEPOLICY___PTR_CH_
-  
   class ReplyStartTimePolicy;
   typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CH_)
-#define _MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export ReplyStartTimePolicy_var : public TAO_Base_var
+  struct tao_ReplyStartTimePolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        ReplyStartTimePolicy,
+        tao_ReplyStartTimePolicy_life
+      >
+    ReplyStartTimePolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ReplyStartTimePolicy,
+        tao_ReplyStartTimePolicy_life
+      >
+    ReplyStartTimePolicy_out;
+
+  struct TAO_Messaging_Export tao_ReplyStartTimePolicy_life
   {
-  public:
-    ReplyStartTimePolicy_var (void); // default constructor
-    ReplyStartTimePolicy_var (ReplyStartTimePolicy_ptr p) : ptr_ (p) {} 
-    ReplyStartTimePolicy_var (const ReplyStartTimePolicy_var &); // copy constructor
-    ~ReplyStartTimePolicy_var (void); // destructor
-    
-    ReplyStartTimePolicy_var &operator= (ReplyStartTimePolicy_ptr);
-    ReplyStartTimePolicy_var &operator= (const ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_ptr operator-> (void) const;
-    
-    operator const ReplyStartTimePolicy_ptr &() const;
-    operator ReplyStartTimePolicy_ptr &();
-    // in, inout, out, _retn 
-    ReplyStartTimePolicy_ptr in (void) const;
-    ReplyStartTimePolicy_ptr &inout (void);
-    ReplyStartTimePolicy_ptr &out (void);
-    ReplyStartTimePolicy_ptr _retn (void);
-    ReplyStartTimePolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ReplyStartTimePolicy_ptr tao_duplicate (ReplyStartTimePolicy_ptr);
     static void tao_release (ReplyStartTimePolicy_ptr);
     static ReplyStartTimePolicy_ptr tao_nil (void);
-    static ReplyStartTimePolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ReplyStartTimePolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ReplyStartTimePolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ReplyStartTimePolicy_var (const TAO_Base_var &rhs);
-    ReplyStartTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CH_)
-#define _MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export ReplyStartTimePolicy_out
+  struct TAO_Messaging_Export tao_ReplyStartTimePolicy_cast
   {
-  public:
-    ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &);
-    ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_out (const ReplyStartTimePolicy_out &);
-    ReplyStartTimePolicy_out &operator= (const ReplyStartTimePolicy_out &);
-    ReplyStartTimePolicy_out &operator= (const ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_out &operator= (ReplyStartTimePolicy_ptr);
-    operator ReplyStartTimePolicy_ptr &();
-    ReplyStartTimePolicy_ptr &ptr (void);
-    ReplyStartTimePolicy_ptr operator-> (void);
-  
-  private:
-    ReplyStartTimePolicy_ptr &ptr_;
+    static ReplyStartTimePolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY_CH_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY_CH_
-  
+
   class TAO_Messaging_Export ReplyStartTimePolicy
     : public virtual CORBA::Policy
   {
@@ -1126,159 +855,118 @@ TAO_NAMESPACE  Messaging
     typedef ReplyStartTimePolicy_ptr _ptr_type;
     typedef ReplyStartTimePolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj);
-    
+
     static ReplyStartTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ReplyStartTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ReplyStartTimePolicy_ptr _nil (void)
       {
         return (ReplyStartTimePolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::TimeBase::UtcT start_time (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ReplyStartTimePolicy (void);
     virtual ~ReplyStartTimePolicy (void);
-    
-    friend class _TAO_ReplyStartTimePolicy_Remote_Proxy_Impl;
-    friend class _TAO_ReplyStartTimePolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_ReplyStartTimePolicy_Direct_Proxy_Impl;
-  
+
   private:
     ReplyStartTimePolicy (const ReplyStartTimePolicy &);
     void operator= (const ReplyStartTimePolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong REPLY_END_TIME_POLICY_TYPE = 30U;
-  
+
+  const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_REPLYENDTIMEPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_REPLYENDTIMEPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___PTR_CH_)
-#define _MESSAGING_REPLYENDTIMEPOLICY___PTR_CH_
-  
   class ReplyEndTimePolicy;
   typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___VAR_CH_)
-#define _MESSAGING_REPLYENDTIMEPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export ReplyEndTimePolicy_var : public TAO_Base_var
+  struct tao_ReplyEndTimePolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        ReplyEndTimePolicy,
+        tao_ReplyEndTimePolicy_life
+      >
+    ReplyEndTimePolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        ReplyEndTimePolicy,
+        tao_ReplyEndTimePolicy_life
+      >
+    ReplyEndTimePolicy_out;
+
+  struct TAO_Messaging_Export tao_ReplyEndTimePolicy_life
   {
-  public:
-    ReplyEndTimePolicy_var (void); // default constructor
-    ReplyEndTimePolicy_var (ReplyEndTimePolicy_ptr p) : ptr_ (p) {} 
-    ReplyEndTimePolicy_var (const ReplyEndTimePolicy_var &); // copy constructor
-    ~ReplyEndTimePolicy_var (void); // destructor
-    
-    ReplyEndTimePolicy_var &operator= (ReplyEndTimePolicy_ptr);
-    ReplyEndTimePolicy_var &operator= (const ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_ptr operator-> (void) const;
-    
-    operator const ReplyEndTimePolicy_ptr &() const;
-    operator ReplyEndTimePolicy_ptr &();
-    // in, inout, out, _retn 
-    ReplyEndTimePolicy_ptr in (void) const;
-    ReplyEndTimePolicy_ptr &inout (void);
-    ReplyEndTimePolicy_ptr &out (void);
-    ReplyEndTimePolicy_ptr _retn (void);
-    ReplyEndTimePolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ReplyEndTimePolicy_ptr tao_duplicate (ReplyEndTimePolicy_ptr);
     static void tao_release (ReplyEndTimePolicy_ptr);
     static ReplyEndTimePolicy_ptr tao_nil (void);
-    static ReplyEndTimePolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ReplyEndTimePolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ReplyEndTimePolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ReplyEndTimePolicy_var (const TAO_Base_var &rhs);
-    ReplyEndTimePolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___OUT_CH_)
-#define _MESSAGING_REPLYENDTIMEPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export ReplyEndTimePolicy_out
+  struct TAO_Messaging_Export tao_ReplyEndTimePolicy_cast
   {
-  public:
-    ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &);
-    ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_out (const ReplyEndTimePolicy_out &);
-    ReplyEndTimePolicy_out &operator= (const ReplyEndTimePolicy_out &);
-    ReplyEndTimePolicy_out &operator= (const ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_out &operator= (ReplyEndTimePolicy_ptr);
-    operator ReplyEndTimePolicy_ptr &();
-    ReplyEndTimePolicy_ptr &ptr (void);
-    ReplyEndTimePolicy_ptr operator-> (void);
-  
-  private:
-    ReplyEndTimePolicy_ptr &ptr_;
+    static ReplyEndTimePolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY_CH_)
 #define _MESSAGING_REPLYENDTIMEPOLICY_CH_
-  
+
   class TAO_Messaging_Export ReplyEndTimePolicy
     : public virtual CORBA::Policy
   {
@@ -1286,159 +974,118 @@ TAO_NAMESPACE  Messaging
     typedef ReplyEndTimePolicy_ptr _ptr_type;
     typedef ReplyEndTimePolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj);
-    
+
     static ReplyEndTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ReplyEndTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ReplyEndTimePolicy_ptr _nil (void)
       {
         return (ReplyEndTimePolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::TimeBase::UtcT end_time (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ReplyEndTimePolicy (void);
     virtual ~ReplyEndTimePolicy (void);
-    
-    friend class _TAO_ReplyEndTimePolicy_Remote_Proxy_Impl;
-    friend class _TAO_ReplyEndTimePolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_ReplyEndTimePolicy_Direct_Proxy_Impl;
-  
+
   private:
     ReplyEndTimePolicy (const ReplyEndTimePolicy &);
     void operator= (const ReplyEndTimePolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31U;
-  
+
+  const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___PTR_CH_)
-#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___PTR_CH_
-  
   class RelativeRequestTimeoutPolicy;
   typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CH_)
-#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export RelativeRequestTimeoutPolicy_var : public TAO_Base_var
+  struct tao_RelativeRequestTimeoutPolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        RelativeRequestTimeoutPolicy,
+        tao_RelativeRequestTimeoutPolicy_life
+      >
+    RelativeRequestTimeoutPolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        RelativeRequestTimeoutPolicy,
+        tao_RelativeRequestTimeoutPolicy_life
+      >
+    RelativeRequestTimeoutPolicy_out;
+
+  struct TAO_Messaging_Export tao_RelativeRequestTimeoutPolicy_life
   {
-  public:
-    RelativeRequestTimeoutPolicy_var (void); // default constructor
-    RelativeRequestTimeoutPolicy_var (RelativeRequestTimeoutPolicy_ptr p) : ptr_ (p) {} 
-    RelativeRequestTimeoutPolicy_var (const RelativeRequestTimeoutPolicy_var &); // copy constructor
-    ~RelativeRequestTimeoutPolicy_var (void); // destructor
-    
-    RelativeRequestTimeoutPolicy_var &operator= (RelativeRequestTimeoutPolicy_ptr);
-    RelativeRequestTimeoutPolicy_var &operator= (const RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_ptr operator-> (void) const;
-    
-    operator const RelativeRequestTimeoutPolicy_ptr &() const;
-    operator RelativeRequestTimeoutPolicy_ptr &();
-    // in, inout, out, _retn 
-    RelativeRequestTimeoutPolicy_ptr in (void) const;
-    RelativeRequestTimeoutPolicy_ptr &inout (void);
-    RelativeRequestTimeoutPolicy_ptr &out (void);
-    RelativeRequestTimeoutPolicy_ptr _retn (void);
-    RelativeRequestTimeoutPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RelativeRequestTimeoutPolicy_ptr tao_duplicate (RelativeRequestTimeoutPolicy_ptr);
     static void tao_release (RelativeRequestTimeoutPolicy_ptr);
     static RelativeRequestTimeoutPolicy_ptr tao_nil (void);
-    static RelativeRequestTimeoutPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RelativeRequestTimeoutPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RelativeRequestTimeoutPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RelativeRequestTimeoutPolicy_var (const TAO_Base_var &rhs);
-    RelativeRequestTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CH_)
-#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export RelativeRequestTimeoutPolicy_out
+  struct TAO_Messaging_Export tao_RelativeRequestTimeoutPolicy_cast
   {
-  public:
-    RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &);
-    RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_out (const RelativeRequestTimeoutPolicy_out &);
-    RelativeRequestTimeoutPolicy_out &operator= (const RelativeRequestTimeoutPolicy_out &);
-    RelativeRequestTimeoutPolicy_out &operator= (const RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_out &operator= (RelativeRequestTimeoutPolicy_ptr);
-    operator RelativeRequestTimeoutPolicy_ptr &();
-    RelativeRequestTimeoutPolicy_ptr &ptr (void);
-    RelativeRequestTimeoutPolicy_ptr operator-> (void);
-  
-  private:
-    RelativeRequestTimeoutPolicy_ptr &ptr_;
+    static RelativeRequestTimeoutPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY_CH_
-  
+
   class TAO_Messaging_Export RelativeRequestTimeoutPolicy
     : public virtual CORBA::Policy
   {
@@ -1446,220 +1093,150 @@ TAO_NAMESPACE  Messaging
     typedef RelativeRequestTimeoutPolicy_ptr _ptr_type;
     typedef RelativeRequestTimeoutPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj);
-    
+
     static RelativeRequestTimeoutPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RelativeRequestTimeoutPolicy_ptr _nil (void)
       {
         return (RelativeRequestTimeoutPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual TimeBase::TimeT relative_expiry (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     RelativeRequestTimeoutPolicy (void);
     virtual ~RelativeRequestTimeoutPolicy (void);
-    
-    friend class _TAO_RelativeRequestTimeoutPolicy_Remote_Proxy_Impl;
-    friend class _TAO_RelativeRequestTimeoutPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_RelativeRequestTimeoutPolicy_Direct_Proxy_Impl;
-  
+
   private:
     RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy &);
     void operator= (const RelativeRequestTimeoutPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong ROUTING_POLICY_TYPE = 33U;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class RoutingTypeRange_var;
-  
+
+  const CORBA::PolicyType ROUTING_POLICY_TYPE = 33U;
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct RoutingTypeRange;
+
+  typedef
+    TAO_Fixed_Var_T<
+        RoutingTypeRange
+      >
+    RoutingTypeRange_var;
+
+  typedef
+    RoutingTypeRange &
+    RoutingTypeRange_out;
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_Messaging_Export RoutingTypeRange
   {
     typedef RoutingTypeRange_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     Messaging::RoutingType min;
     Messaging::RoutingType max;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Messaging_Export RoutingTypeRange_var
-  {
-  public:
-    RoutingTypeRange_var (void);
-    RoutingTypeRange_var (RoutingTypeRange *);
-    RoutingTypeRange_var (const RoutingTypeRange_var &);
-    // Fixed-size types only.
-    RoutingTypeRange_var (const RoutingTypeRange &);
-    ~RoutingTypeRange_var (void);
-    
-    RoutingTypeRange_var &operator= (RoutingTypeRange *);
-    RoutingTypeRange_var &operator= (const RoutingTypeRange_var &);
-    
-    // Fixed-size types only.
-    RoutingTypeRange_var &operator= (const RoutingTypeRange &);
-    
-    RoutingTypeRange *operator-> (void);
-    const RoutingTypeRange *operator-> (void) const;
-    
-    operator const RoutingTypeRange &() const;
-    operator RoutingTypeRange &();
-    operator RoutingTypeRange &() const;
-    
-    // in, inout, out, _retn 
-    const RoutingTypeRange &in (void) const;
-    RoutingTypeRange &inout (void);
-    RoutingTypeRange &out (void);
-    RoutingTypeRange _retn (void);
-    RoutingTypeRange *ptr (void) const;
-  
-  private:
-    RoutingTypeRange *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
-  
-  typedef RoutingTypeRange &RoutingTypeRange_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingTypeRange;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_ROUTINGPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_ROUTINGPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_ROUTINGPOLICY___PTR_CH_)
-#define _MESSAGING_ROUTINGPOLICY___PTR_CH_
-  
   class RoutingPolicy;
   typedef RoutingPolicy *RoutingPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_ROUTINGPOLICY___VAR_CH_)
-#define _MESSAGING_ROUTINGPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export RoutingPolicy_var : public TAO_Base_var
+  struct tao_RoutingPolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        RoutingPolicy,
+        tao_RoutingPolicy_life
+      >
+    RoutingPolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        RoutingPolicy,
+        tao_RoutingPolicy_life
+      >
+    RoutingPolicy_out;
+
+  struct TAO_Messaging_Export tao_RoutingPolicy_life
   {
-  public:
-    RoutingPolicy_var (void); // default constructor
-    RoutingPolicy_var (RoutingPolicy_ptr p) : ptr_ (p) {} 
-    RoutingPolicy_var (const RoutingPolicy_var &); // copy constructor
-    ~RoutingPolicy_var (void); // destructor
-    
-    RoutingPolicy_var &operator= (RoutingPolicy_ptr);
-    RoutingPolicy_var &operator= (const RoutingPolicy_var &);
-    RoutingPolicy_ptr operator-> (void) const;
-    
-    operator const RoutingPolicy_ptr &() const;
-    operator RoutingPolicy_ptr &();
-    // in, inout, out, _retn 
-    RoutingPolicy_ptr in (void) const;
-    RoutingPolicy_ptr &inout (void);
-    RoutingPolicy_ptr &out (void);
-    RoutingPolicy_ptr _retn (void);
-    RoutingPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RoutingPolicy_ptr tao_duplicate (RoutingPolicy_ptr);
     static void tao_release (RoutingPolicy_ptr);
     static RoutingPolicy_ptr tao_nil (void);
-    static RoutingPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RoutingPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RoutingPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RoutingPolicy_var (const TAO_Base_var &rhs);
-    RoutingPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_ROUTINGPOLICY___OUT_CH_)
-#define _MESSAGING_ROUTINGPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export RoutingPolicy_out
+  struct TAO_Messaging_Export tao_RoutingPolicy_cast
   {
-  public:
-    RoutingPolicy_out (RoutingPolicy_ptr &);
-    RoutingPolicy_out (RoutingPolicy_var &);
-    RoutingPolicy_out (const RoutingPolicy_out &);
-    RoutingPolicy_out &operator= (const RoutingPolicy_out &);
-    RoutingPolicy_out &operator= (const RoutingPolicy_var &);
-    RoutingPolicy_out &operator= (RoutingPolicy_ptr);
-    operator RoutingPolicy_ptr &();
-    RoutingPolicy_ptr &ptr (void);
-    RoutingPolicy_ptr operator-> (void);
-  
-  private:
-    RoutingPolicy_ptr &ptr_;
+    static RoutingPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_ROUTINGPOLICY_CH_)
 #define _MESSAGING_ROUTINGPOLICY_CH_
-  
+
   class TAO_Messaging_Export RoutingPolicy
     : public virtual CORBA::Policy
   {
@@ -1667,159 +1244,118 @@ TAO_NAMESPACE  Messaging
     typedef RoutingPolicy_ptr _ptr_type;
     typedef RoutingPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj);
-    
+
     static RoutingPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RoutingPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RoutingPolicy_ptr _nil (void)
       {
         return (RoutingPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::Messaging::RoutingTypeRange routing_range (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     RoutingPolicy (void);
     virtual ~RoutingPolicy (void);
-    
-    friend class _TAO_RoutingPolicy_Remote_Proxy_Impl;
-    friend class _TAO_RoutingPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_RoutingPolicy_Direct_Proxy_Impl;
-  
+
   private:
     RoutingPolicy (const RoutingPolicy &);
     void operator= (const RoutingPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong MAX_HOPS_POLICY_TYPE = 34U;
-  
+
+  const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_MAXHOPSPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_MAXHOPSPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_MAXHOPSPOLICY___PTR_CH_)
-#define _MESSAGING_MAXHOPSPOLICY___PTR_CH_
-  
   class MaxHopsPolicy;
   typedef MaxHopsPolicy *MaxHopsPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_MAXHOPSPOLICY___VAR_CH_)
-#define _MESSAGING_MAXHOPSPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export MaxHopsPolicy_var : public TAO_Base_var
+  struct tao_MaxHopsPolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        MaxHopsPolicy,
+        tao_MaxHopsPolicy_life
+      >
+    MaxHopsPolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        MaxHopsPolicy,
+        tao_MaxHopsPolicy_life
+      >
+    MaxHopsPolicy_out;
+
+  struct TAO_Messaging_Export tao_MaxHopsPolicy_life
   {
-  public:
-    MaxHopsPolicy_var (void); // default constructor
-    MaxHopsPolicy_var (MaxHopsPolicy_ptr p) : ptr_ (p) {} 
-    MaxHopsPolicy_var (const MaxHopsPolicy_var &); // copy constructor
-    ~MaxHopsPolicy_var (void); // destructor
-    
-    MaxHopsPolicy_var &operator= (MaxHopsPolicy_ptr);
-    MaxHopsPolicy_var &operator= (const MaxHopsPolicy_var &);
-    MaxHopsPolicy_ptr operator-> (void) const;
-    
-    operator const MaxHopsPolicy_ptr &() const;
-    operator MaxHopsPolicy_ptr &();
-    // in, inout, out, _retn 
-    MaxHopsPolicy_ptr in (void) const;
-    MaxHopsPolicy_ptr &inout (void);
-    MaxHopsPolicy_ptr &out (void);
-    MaxHopsPolicy_ptr _retn (void);
-    MaxHopsPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static MaxHopsPolicy_ptr tao_duplicate (MaxHopsPolicy_ptr);
     static void tao_release (MaxHopsPolicy_ptr);
     static MaxHopsPolicy_ptr tao_nil (void);
-    static MaxHopsPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        MaxHopsPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    MaxHopsPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    MaxHopsPolicy_var (const TAO_Base_var &rhs);
-    MaxHopsPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_MAXHOPSPOLICY___OUT_CH_)
-#define _MESSAGING_MAXHOPSPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export MaxHopsPolicy_out
+  struct TAO_Messaging_Export tao_MaxHopsPolicy_cast
   {
-  public:
-    MaxHopsPolicy_out (MaxHopsPolicy_ptr &);
-    MaxHopsPolicy_out (MaxHopsPolicy_var &);
-    MaxHopsPolicy_out (const MaxHopsPolicy_out &);
-    MaxHopsPolicy_out &operator= (const MaxHopsPolicy_out &);
-    MaxHopsPolicy_out &operator= (const MaxHopsPolicy_var &);
-    MaxHopsPolicy_out &operator= (MaxHopsPolicy_ptr);
-    operator MaxHopsPolicy_ptr &();
-    MaxHopsPolicy_ptr &ptr (void);
-    MaxHopsPolicy_ptr operator-> (void);
-  
-  private:
-    MaxHopsPolicy_ptr &ptr_;
+    static MaxHopsPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_MAXHOPSPOLICY_CH_)
 #define _MESSAGING_MAXHOPSPOLICY_CH_
-  
+
   class TAO_Messaging_Export MaxHopsPolicy
     : public virtual CORBA::Policy
   {
@@ -1827,159 +1363,118 @@ TAO_NAMESPACE  Messaging
     typedef MaxHopsPolicy_ptr _ptr_type;
     typedef MaxHopsPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj);
-    
+
     static MaxHopsPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static MaxHopsPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static MaxHopsPolicy_ptr _nil (void)
       {
         return (MaxHopsPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::UShort max_hops (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     MaxHopsPolicy (void);
     virtual ~MaxHopsPolicy (void);
-    
-    friend class _TAO_MaxHopsPolicy_Remote_Proxy_Impl;
-    friend class _TAO_MaxHopsPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_MaxHopsPolicy_Direct_Proxy_Impl;
-  
+
   private:
     MaxHopsPolicy (const MaxHopsPolicy &);
     void operator= (const MaxHopsPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MaxHopsPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong QUEUE_ORDER_POLICY_TYPE = 35U;
-  
+
+  const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35U;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_MESSAGING_QUEUEORDERPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_QUEUEORDERPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_MESSAGING_QUEUEORDERPOLICY___PTR_CH_)
-#define _MESSAGING_QUEUEORDERPOLICY___PTR_CH_
-  
   class QueueOrderPolicy;
   typedef QueueOrderPolicy *QueueOrderPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_QUEUEORDERPOLICY___VAR_CH_)
-#define _MESSAGING_QUEUEORDERPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export QueueOrderPolicy_var : public TAO_Base_var
+  struct tao_QueueOrderPolicy_life;
+
+  typedef
+    TAO_Objref_Var_T<
+        QueueOrderPolicy,
+        tao_QueueOrderPolicy_life
+      >
+    QueueOrderPolicy_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        QueueOrderPolicy,
+        tao_QueueOrderPolicy_life
+      >
+    QueueOrderPolicy_out;
+
+  struct TAO_Messaging_Export tao_QueueOrderPolicy_life
   {
-  public:
-    QueueOrderPolicy_var (void); // default constructor
-    QueueOrderPolicy_var (QueueOrderPolicy_ptr p) : ptr_ (p) {} 
-    QueueOrderPolicy_var (const QueueOrderPolicy_var &); // copy constructor
-    ~QueueOrderPolicy_var (void); // destructor
-    
-    QueueOrderPolicy_var &operator= (QueueOrderPolicy_ptr);
-    QueueOrderPolicy_var &operator= (const QueueOrderPolicy_var &);
-    QueueOrderPolicy_ptr operator-> (void) const;
-    
-    operator const QueueOrderPolicy_ptr &() const;
-    operator QueueOrderPolicy_ptr &();
-    // in, inout, out, _retn 
-    QueueOrderPolicy_ptr in (void) const;
-    QueueOrderPolicy_ptr &inout (void);
-    QueueOrderPolicy_ptr &out (void);
-    QueueOrderPolicy_ptr _retn (void);
-    QueueOrderPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static QueueOrderPolicy_ptr tao_duplicate (QueueOrderPolicy_ptr);
     static void tao_release (QueueOrderPolicy_ptr);
     static QueueOrderPolicy_ptr tao_nil (void);
-    static QueueOrderPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        QueueOrderPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    QueueOrderPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    QueueOrderPolicy_var (const TAO_Base_var &rhs);
-    QueueOrderPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_QUEUEORDERPOLICY___OUT_CH_)
-#define _MESSAGING_QUEUEORDERPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Messaging_Export QueueOrderPolicy_out
+  struct TAO_Messaging_Export tao_QueueOrderPolicy_cast
   {
-  public:
-    QueueOrderPolicy_out (QueueOrderPolicy_ptr &);
-    QueueOrderPolicy_out (QueueOrderPolicy_var &);
-    QueueOrderPolicy_out (const QueueOrderPolicy_out &);
-    QueueOrderPolicy_out &operator= (const QueueOrderPolicy_out &);
-    QueueOrderPolicy_out &operator= (const QueueOrderPolicy_var &);
-    QueueOrderPolicy_out &operator= (QueueOrderPolicy_ptr);
-    operator QueueOrderPolicy_ptr &();
-    QueueOrderPolicy_ptr &ptr (void);
-    QueueOrderPolicy_ptr operator-> (void);
-  
-  private:
-    QueueOrderPolicy_ptr &ptr_;
+    static QueueOrderPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_QUEUEORDERPOLICY_CH_)
 #define _MESSAGING_QUEUEORDERPOLICY_CH_
-  
+
   class TAO_Messaging_Export QueueOrderPolicy
     : public virtual CORBA::Policy
   {
@@ -1987,63 +1482,59 @@ TAO_NAMESPACE  Messaging
     typedef QueueOrderPolicy_ptr _ptr_type;
     typedef QueueOrderPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj);
-    
+
     static QueueOrderPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static QueueOrderPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static QueueOrderPolicy_ptr _nil (void)
       {
         return (QueueOrderPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual Messaging::Ordering allowed_orders (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     QueueOrderPolicy (void);
     virtual ~QueueOrderPolicy (void);
-    
-    friend class _TAO_QueueOrderPolicy_Remote_Proxy_Impl;
-    friend class _TAO_QueueOrderPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_QueueOrderPolicy_Direct_Proxy_Impl;
-  
+
   private:
     QueueOrderPolicy (const QueueOrderPolicy &);
     void operator= (const QueueOrderPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_QueueOrderPolicy;
 
 // TAO_IDL - Generated from
@@ -2168,7 +1659,7 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Routi
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_No_ImplC.i"
@@ -2184,4 +1675,3 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Routi
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.i b/TAO/tao/Messaging/Messaging_No_ImplC.i
index c70646567d3..70fe89a87b4 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.i
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.i
@@ -26,13 +26,6 @@
 #if !defined (_MESSAGING_REBINDPOLICY___CI_)
 #define _MESSAGING_REBINDPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-Messaging::RebindPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -63,181 +56,11 @@ TAO::Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class Messaging::PriorityRange_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (PriorityRange *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (const ::Messaging::PriorityRange_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Messaging::PriorityRange (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (const ::Messaging::PriorityRange &p)
-{
-  ACE_NEW (this->ptr_, ::Messaging::PriorityRange (p));
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::~PriorityRange_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var &
-Messaging::PriorityRange_var::operator= (PriorityRange *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::Messaging::PriorityRange_var &
-Messaging::PriorityRange_var::operator= (const ::Messaging::PriorityRange_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PriorityRange *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PriorityRange (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PriorityRange *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE Messaging::PriorityRange_var &
-Messaging::PriorityRange_var::operator= (const ::Messaging::PriorityRange &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::Messaging::PriorityRange (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::Messaging::PriorityRange *
-Messaging::PriorityRange_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PriorityRange *
-Messaging::PriorityRange_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator const ::Messaging::PriorityRange &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator ::Messaging::PriorityRange &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator ::Messaging::PriorityRange &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::Messaging::PriorityRange &
-Messaging::PriorityRange_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PriorityRange &
-Messaging::PriorityRange_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::Messaging::PriorityRange &
-Messaging::PriorityRange_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PriorityRange
-Messaging::PriorityRange_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PriorityRange *
-Messaging::PriorityRange_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___CI_)
 #define _MESSAGING_REQUESTPRIORITYPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-Messaging::RequestPriorityPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -273,13 +96,6 @@ TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR
 #if !defined (_MESSAGING_REPLYPRIORITYPOLICY___CI_)
 #define _MESSAGING_REPLYPRIORITYPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-Messaging::ReplyPriorityPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -315,13 +131,6 @@ TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &
 #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___CI_)
 #define _MESSAGING_REQUESTSTARTTIMEPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-Messaging::RequestStartTimePolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -356,14 +165,6 @@ TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCD
 
 #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___CI_)
 #define _MESSAGING_REQUESTENDTIMEPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-Messaging::RequestEndTimePolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -398,14 +199,6 @@ TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR
 
 #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___CI_)
 #define _MESSAGING_REPLYSTARTTIMEPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-Messaging::ReplyStartTimePolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -440,14 +233,6 @@ TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR
 
 #if !defined (_MESSAGING_REPLYENDTIMEPOLICY___CI_)
 #define _MESSAGING_REPLYENDTIMEPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-Messaging::ReplyEndTimePolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -482,14 +267,6 @@ TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
 
 #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___CI_)
 #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -520,181 +297,11 @@ TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_I
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingTypeRange_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (RoutingTypeRange *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const ::Messaging::RoutingTypeRange_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Messaging::RoutingTypeRange (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const ::Messaging::RoutingTypeRange &p)
-{
-  ACE_NEW (this->ptr_, ::Messaging::RoutingTypeRange (p));
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::~RoutingTypeRange_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var &
-Messaging::RoutingTypeRange_var::operator= (RoutingTypeRange *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::Messaging::RoutingTypeRange_var &
-Messaging::RoutingTypeRange_var::operator= (const ::Messaging::RoutingTypeRange_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          RoutingTypeRange *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              RoutingTypeRange (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              RoutingTypeRange *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE Messaging::RoutingTypeRange_var &
-Messaging::RoutingTypeRange_var::operator= (const ::Messaging::RoutingTypeRange &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::Messaging::RoutingTypeRange (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator const ::Messaging::RoutingTypeRange &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator ::Messaging::RoutingTypeRange &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator ::Messaging::RoutingTypeRange &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingTypeRange
-Messaging::RoutingTypeRange_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_MESSAGING_ROUTINGPOLICY___CI_)
 #define _MESSAGING_ROUTINGPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-Messaging::RoutingPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -729,14 +336,6 @@ TAO::Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
 
 #if !defined (_MESSAGING_MAXHOPSPOLICY___CI_)
 #define _MESSAGING_MAXHOPSPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-Messaging::MaxHopsPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -772,13 +371,6 @@ TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
 #if !defined (_MESSAGING_QUEUEORDERPOLICY___CI_)
 #define _MESSAGING_QUEUEORDERPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -809,7 +401,7 @@ TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -850,7 +442,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -889,4 +481,3 @@ CORBA::Boolean operator>> (
       return 0;
     }
 }
-
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
index 26f73938885..c237fae6364 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -24,17 +24,6 @@
 
 
 #include "Messaging_RT_PolicyC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -51,32 +40,32 @@ static const CORBA::Long _oc_Messaging_Timeout[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5469),
+  ACE_NTOHL (0x6d656f75),
+  ACE_NTOHL (0x743a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/Timeout:1.0
     8,
-  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x54696d65),
   ACE_NTOHL (0x6f757400),  // name = Timeout
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54696d65),
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
@@ -106,7 +95,7 @@ TAO_NAMESPACE_END
 int Messaging::RelativeRoundtripTimeoutPolicy::_tao_class_id = 0;
 
 Messaging::RelativeRoundtripTimeoutPolicy_ptr
-tao_Messaging_RelativeRoundtripTimeoutPolicy_duplicate (
+Messaging::tao_RelativeRoundtripTimeoutPolicy_life::tao_duplicate (
     Messaging::RelativeRoundtripTimeoutPolicy_ptr p
   )
 {
@@ -114,7 +103,7 @@ tao_Messaging_RelativeRoundtripTimeoutPolicy_duplicate (
 }
 
 void
-tao_Messaging_RelativeRoundtripTimeoutPolicy_release (
+Messaging::tao_RelativeRoundtripTimeoutPolicy_life::tao_release (
     Messaging::RelativeRoundtripTimeoutPolicy_ptr p
   )
 {
@@ -122,15 +111,24 @@ tao_Messaging_RelativeRoundtripTimeoutPolicy_release (
 }
 
 Messaging::RelativeRoundtripTimeoutPolicy_ptr
-tao_Messaging_RelativeRoundtripTimeoutPolicy_nil (
+Messaging::tao_RelativeRoundtripTimeoutPolicy_life::tao_nil (
     void
   )
 {
   return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_RelativeRoundtripTimeoutPolicy_life::tao_marshal (
+    Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::RelativeRoundtripTimeoutPolicy_ptr
-tao_Messaging_RelativeRoundtripTimeoutPolicy_narrow (
+Messaging::tao_RelativeRoundtripTimeoutPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -139,7 +137,7 @@ tao_Messaging_RelativeRoundtripTimeoutPolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_RelativeRoundtripTimeoutPolicy_upcast (
+Messaging::tao_RelativeRoundtripTimeoutPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -148,205 +146,32 @@ tao_Messaging_RelativeRoundtripTimeoutPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_RelativeRoundtripTimeoutPolicy_marshal (
-    Messaging::RelativeRoundtripTimeoutPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::RelativeRoundtripTimeoutPolicy_var
-// *************************************************************
-
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (void)
-  : ptr_ (RelativeRoundtripTimeoutPolicy::_nil ())
-{}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_var &
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_var &
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator const ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RelativeRoundtripTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return val;
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::tao_duplicate (RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  return ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p);
-}
-
-void
-Messaging::RelativeRoundtripTimeoutPolicy_var::tao_release (RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::tao_nil (void)
-{
-  return ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::RelativeRoundtripTimeoutPolicy_var::tao_upcast (void *src)
-{
-  RelativeRoundtripTimeoutPolicy **tmp =
-    ACE_static_cast (RelativeRoundtripTimeoutPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::RelativeRoundtripTimeoutPolicy,
+        Messaging::tao_RelativeRoundtripTimeoutPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::RelativeRoundtripTimeoutPolicy,
+        Messaging::tao_RelativeRoundtripTimeoutPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::RelativeRoundtripTimeoutPolicy, \
+        Messaging::tao_RelativeRoundtripTimeoutPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::RelativeRoundtripTimeoutPolicy, \
+        Messaging::tao_RelativeRoundtripTimeoutPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::RelativeRoundtripTimeoutPolicy_out
-// *************************************************************
-
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p)
-  : ptr_ (ACE_const_cast (RelativeRoundtripTimeoutPolicy_out &, p).ptr_)
-{}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RelativeRoundtripTimeoutPolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
 {}
@@ -354,7 +179,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
 Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void)
 {}
 
-void 
+void
 Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RelativeRoundtripTimeoutPolicy *tmp = ACE_static_cast (RelativeRoundtripTimeoutPolicy *, _tao_void_pointer);
@@ -370,7 +195,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
   return RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::RelativeRoundtripTimeoutPolicy_ptr 
+Messaging::RelativeRoundtripTimeoutPolicy_ptr
 Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -380,7 +205,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
     {
       return RelativeRoundtripTimeoutPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RelativeRoundtripTimeoutPolicy_ptr,
@@ -400,14 +225,14 @@ Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (RelativeRoundtripTimeoutP
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::RelativeRoundtripTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, RelativeRoundtripTimeoutPolicy)::_tao_class_id)
@@ -440,12 +265,12 @@ void *Messaging::RelativeRoundtripTimeoutPolicy::_tao_QueryInterface (ptr_arith_
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -454,6 +279,12 @@ const char* Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id
   return "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -461,29 +292,29 @@ static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5265), 
-  ACE_NTOHL (0x6c617469), 
-  ACE_NTOHL (0x7665526f), 
-  ACE_NTOHL (0x756e6474), 
-  ACE_NTOHL (0x72697054), 
-  ACE_NTOHL (0x696d656f), 
-  ACE_NTOHL (0x7574506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5265),
+  ACE_NTOHL (0x6c617469),
+  ACE_NTOHL (0x7665526f),
+  ACE_NTOHL (0x756e6474),
+  ACE_NTOHL (0x72697054),
+  ACE_NTOHL (0x696d656f),
+  ACE_NTOHL (0x7574506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0
     31,
-  ACE_NTOHL (0x52656c61), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x526f756e), 
-  ACE_NTOHL (0x64747269), 
-  ACE_NTOHL (0x7054696d), 
-  ACE_NTOHL (0x656f7574), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x52656c61),
+  ACE_NTOHL (0x74697665),
+  ACE_NTOHL (0x526f756e),
+  ACE_NTOHL (0x64747269),
+  ACE_NTOHL (0x7054696d),
+  ACE_NTOHL (0x656f7574),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = RelativeRoundtripTimeoutPolicy
   };
 
@@ -557,4 +388,3 @@ operator>>= (
 # pragma instantiate TAO_Object_Manager<Messaging::RelativeRoundtripTimeoutPolicy, Messaging::RelativeRoundtripTimeoutPolicy_var>
 # pragma instantiate TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
index 48cd2dfd990..ed1a187cb72 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
@@ -26,14 +26,13 @@
 #define _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
-#include "tao/PolicyC.h"
 #include "tao/TimeBaseC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -66,7 +65,7 @@ TAO_NAMESPACE  Messaging
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef TimeBase::TimeT Timeout;
   typedef TimeBase::TimeT_out Timeout_out;
@@ -79,93 +78,56 @@ TAO_NAMESPACE  Messaging
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32U;
+  const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___PTR_CH_)
-#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___PTR_CH_
+#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__ODDS_N_ENDS_CH_
   
   class RelativeRoundtripTimeoutPolicy;
   typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CH_)
-#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy_var : public TAO_Base_var
+  struct tao_RelativeRoundtripTimeoutPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        RelativeRoundtripTimeoutPolicy,
+        tao_RelativeRoundtripTimeoutPolicy_life
+      >
+    RelativeRoundtripTimeoutPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        RelativeRoundtripTimeoutPolicy,
+        tao_RelativeRoundtripTimeoutPolicy_life
+      >
+    RelativeRoundtripTimeoutPolicy_out;
+  
+  struct TAO_Messaging_Export tao_RelativeRoundtripTimeoutPolicy_life
   {
-  public:
-    RelativeRoundtripTimeoutPolicy_var (void); // default constructor
-    RelativeRoundtripTimeoutPolicy_var (RelativeRoundtripTimeoutPolicy_ptr p) : ptr_ (p) {} 
-    RelativeRoundtripTimeoutPolicy_var (const RelativeRoundtripTimeoutPolicy_var &); // copy constructor
-    ~RelativeRoundtripTimeoutPolicy_var (void); // destructor
-    
-    RelativeRoundtripTimeoutPolicy_var &operator= (RelativeRoundtripTimeoutPolicy_ptr);
-    RelativeRoundtripTimeoutPolicy_var &operator= (const RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_ptr operator-> (void) const;
-    
-    operator const RelativeRoundtripTimeoutPolicy_ptr &() const;
-    operator RelativeRoundtripTimeoutPolicy_ptr &();
-    // in, inout, out, _retn 
-    RelativeRoundtripTimeoutPolicy_ptr in (void) const;
-    RelativeRoundtripTimeoutPolicy_ptr &inout (void);
-    RelativeRoundtripTimeoutPolicy_ptr &out (void);
-    RelativeRoundtripTimeoutPolicy_ptr _retn (void);
-    RelativeRoundtripTimeoutPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RelativeRoundtripTimeoutPolicy_ptr tao_duplicate (RelativeRoundtripTimeoutPolicy_ptr);
     static void tao_release (RelativeRoundtripTimeoutPolicy_ptr);
     static RelativeRoundtripTimeoutPolicy_ptr tao_nil (void);
-    static RelativeRoundtripTimeoutPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RelativeRoundtripTimeoutPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RelativeRoundtripTimeoutPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RelativeRoundtripTimeoutPolicy_var (const TAO_Base_var &rhs);
-    RelativeRoundtripTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CH_)
-#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy_out
+  struct TAO_Messaging_Export tao_RelativeRoundtripTimeoutPolicy_cast
   {
-  public:
-    RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &);
-    RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_out (const RelativeRoundtripTimeoutPolicy_out &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (const RelativeRoundtripTimeoutPolicy_out &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (const RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (RelativeRoundtripTimeoutPolicy_ptr);
-    operator RelativeRoundtripTimeoutPolicy_ptr &();
-    RelativeRoundtripTimeoutPolicy_ptr &ptr (void);
-    RelativeRoundtripTimeoutPolicy_ptr operator-> (void);
-  
-  private:
-    RelativeRoundtripTimeoutPolicy_ptr &ptr_;
+    static RelativeRoundtripTimeoutPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_
@@ -209,7 +171,7 @@ TAO_NAMESPACE  Messaging
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -219,10 +181,6 @@ TAO_NAMESPACE  Messaging
   protected:
     RelativeRoundtripTimeoutPolicy (void);
     virtual ~RelativeRoundtripTimeoutPolicy (void);
-    
-    friend class _TAO_RelativeRoundtripTimeoutPolicy_Remote_Proxy_Impl;
-    friend class _TAO_RelativeRoundtripTimeoutPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_RelativeRoundtripTimeoutPolicy_Direct_Proxy_Impl;
   
   private:
     RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy &);
@@ -260,7 +218,7 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_RT_PolicyC.i"
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.i b/TAO/tao/Messaging/Messaging_RT_PolicyC.i
index 7ee2b5d77c4..5bfee9c2659 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.i
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.i
@@ -25,14 +25,6 @@
 
 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___CI_)
 #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -61,4 +53,3 @@ TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO
 }
 
 #endif /* end #if !defined */
-
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
index 81e97b6c3c2..b075ac15833 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -25,16 +25,6 @@
 
 #include "Messaging_SyncScope_PolicyC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -50,7 +40,7 @@
 int Messaging::SyncScopePolicy::_tao_class_id = 0;
 
 Messaging::SyncScopePolicy_ptr
-tao_Messaging_SyncScopePolicy_duplicate (
+Messaging::tao_SyncScopePolicy_life::tao_duplicate (
     Messaging::SyncScopePolicy_ptr p
   )
 {
@@ -58,7 +48,7 @@ tao_Messaging_SyncScopePolicy_duplicate (
 }
 
 void
-tao_Messaging_SyncScopePolicy_release (
+Messaging::tao_SyncScopePolicy_life::tao_release (
     Messaging::SyncScopePolicy_ptr p
   )
 {
@@ -66,15 +56,24 @@ tao_Messaging_SyncScopePolicy_release (
 }
 
 Messaging::SyncScopePolicy_ptr
-tao_Messaging_SyncScopePolicy_nil (
+Messaging::tao_SyncScopePolicy_life::tao_nil (
     void
   )
 {
   return Messaging::SyncScopePolicy::_nil ();
 }
 
+CORBA::Boolean
+Messaging::tao_SyncScopePolicy_life::tao_marshal (
+    Messaging::SyncScopePolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 Messaging::SyncScopePolicy_ptr
-tao_Messaging_SyncScopePolicy_narrow (
+Messaging::tao_SyncScopePolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -83,7 +82,7 @@ tao_Messaging_SyncScopePolicy_narrow (
 }
 
 CORBA::Object *
-tao_Messaging_SyncScopePolicy_upcast (
+Messaging::tao_SyncScopePolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -92,205 +91,32 @@ tao_Messaging_SyncScopePolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_Messaging_SyncScopePolicy_marshal (
-    Messaging::SyncScopePolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// Messaging::SyncScopePolicy_var
-// *************************************************************
-
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (void)
-  : ptr_ (SyncScopePolicy::_nil ())
-{}
-
-::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (SyncScopePolicy::_duplicate (p.ptr ()))
-{}
-
-Messaging::SyncScopePolicy_var::~SyncScopePolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-Messaging::SyncScopePolicy_var &
-Messaging::SyncScopePolicy_var::operator= (SyncScopePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::SyncScopePolicy_var &
-Messaging::SyncScopePolicy_var::operator= (const ::Messaging::SyncScopePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::SyncScopePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-Messaging::SyncScopePolicy_var::operator const ::Messaging::SyncScopePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-Messaging::SyncScopePolicy_var::operator ::Messaging::SyncScopePolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
-  return this->ptr_;
-}
-
-::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::SyncScopePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
-  return val;
-}
-
-::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::tao_duplicate (SyncScopePolicy_ptr p)
-{
-  return ::Messaging::SyncScopePolicy::_duplicate (p);
-}
-
-void
-Messaging::SyncScopePolicy_var::tao_release (SyncScopePolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::tao_nil (void)
-{
-  return ::Messaging::SyncScopePolicy::_nil ();
-}
-
-::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::Messaging::SyncScopePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-Messaging::SyncScopePolicy_var::tao_upcast (void *src)
-{
-  SyncScopePolicy **tmp =
-    ACE_static_cast (SyncScopePolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        Messaging::SyncScopePolicy,
+        Messaging::tao_SyncScopePolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        Messaging::SyncScopePolicy,
+        Messaging::tao_SyncScopePolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        Messaging::SyncScopePolicy, \
+        Messaging::tao_SyncScopePolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        Messaging::SyncScopePolicy, \
+        Messaging::tao_SyncScopePolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// Messaging::SyncScopePolicy_out
-// *************************************************************
-
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
-}
-
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
-}
-
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const ::Messaging::SyncScopePolicy_out &p)
-  : ptr_ (ACE_const_cast (SyncScopePolicy_out &, p).ptr_)
-{}
-
-::Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (const ::Messaging::SyncScopePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (SyncScopePolicy_out&, p).ptr_;
-  return *this;
-}
-
-Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (const ::Messaging::SyncScopePolicy_var &p)
-{
-  this->ptr_ = ::Messaging::SyncScopePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (SyncScopePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-Messaging::SyncScopePolicy_out::operator ::Messaging::SyncScopePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 Messaging::SyncScopePolicy::SyncScopePolicy (void)
 {}
@@ -298,7 +124,7 @@ Messaging::SyncScopePolicy::SyncScopePolicy (void)
 Messaging::SyncScopePolicy::~SyncScopePolicy (void)
 {}
 
-void 
+void
 Messaging::SyncScopePolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   SyncScopePolicy *tmp = ACE_static_cast (SyncScopePolicy *, _tao_void_pointer);
@@ -314,7 +140,7 @@ Messaging::SyncScopePolicy::_narrow (
   return SyncScopePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-Messaging::SyncScopePolicy_ptr 
+Messaging::SyncScopePolicy_ptr
 Messaging::SyncScopePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -324,7 +150,7 @@ Messaging::SyncScopePolicy::_unchecked_narrow (
     {
       return SyncScopePolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           SyncScopePolicy_ptr,
@@ -344,14 +170,14 @@ Messaging::SyncScopePolicy::_duplicate (SyncScopePolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *Messaging::SyncScopePolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::Messaging, SyncScopePolicy)::_tao_class_id)
@@ -384,12 +210,12 @@ void *Messaging::SyncScopePolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -398,6 +224,12 @@ const char* Messaging::SyncScopePolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/SyncScopePolicy:1.0";
 }
 
+CORBA::Boolean
+Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -405,21 +237,21 @@ static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f5379), 
-  ACE_NTOHL (0x6e635363), 
-  ACE_NTOHL (0x6f706550), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f5379),
+  ACE_NTOHL (0x6e635363),
+  ACE_NTOHL (0x6f706550),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/SyncScopePolicy:1.0
     16,
-  ACE_NTOHL (0x53796e63), 
-  ACE_NTOHL (0x53636f70), 
-  ACE_NTOHL (0x65506f6c), 
+  ACE_NTOHL (0x53796e63),
+  ACE_NTOHL (0x53636f70),
+  ACE_NTOHL (0x65506f6c),
   ACE_NTOHL (0x69637900),  // name = SyncScopePolicy
   };
 
@@ -493,4 +325,3 @@ operator>>= (
 # pragma instantiate TAO_Object_Manager<Messaging::SyncScopePolicy, Messaging::SyncScopePolicy_var>
 # pragma instantiate TAO::Any_Impl_T<Messaging::SyncScopePolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
index 9cd6c653e91..eeed76a7dc7 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
@@ -26,14 +26,13 @@
 #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPE_POLICYC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "messaging_export.h"
-#include "tao/PolicyC.h"
 #include "tao/Messaging_SyncScopeC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -68,93 +67,56 @@ TAO_NAMESPACE  Messaging
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong SYNC_SCOPE_POLICY_TYPE = 24U;
+  const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_MESSAGING_SYNCSCOPEPOLICY___PTR_CH_)
-#define _MESSAGING_SYNCSCOPEPOLICY___PTR_CH_
+#if !defined (_MESSAGING_SYNCSCOPEPOLICY__ODDS_N_ENDS_CH_)
+#define _MESSAGING_SYNCSCOPEPOLICY__ODDS_N_ENDS_CH_
   
   class SyncScopePolicy;
   typedef SyncScopePolicy *SyncScopePolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_SYNCSCOPEPOLICY___VAR_CH_)
-#define _MESSAGING_SYNCSCOPEPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export SyncScopePolicy_var : public TAO_Base_var
+  struct tao_SyncScopePolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        SyncScopePolicy,
+        tao_SyncScopePolicy_life
+      >
+    SyncScopePolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        SyncScopePolicy,
+        tao_SyncScopePolicy_life
+      >
+    SyncScopePolicy_out;
+  
+  struct TAO_Messaging_Export tao_SyncScopePolicy_life
   {
-  public:
-    SyncScopePolicy_var (void); // default constructor
-    SyncScopePolicy_var (SyncScopePolicy_ptr p) : ptr_ (p) {} 
-    SyncScopePolicy_var (const SyncScopePolicy_var &); // copy constructor
-    ~SyncScopePolicy_var (void); // destructor
-    
-    SyncScopePolicy_var &operator= (SyncScopePolicy_ptr);
-    SyncScopePolicy_var &operator= (const SyncScopePolicy_var &);
-    SyncScopePolicy_ptr operator-> (void) const;
-    
-    operator const SyncScopePolicy_ptr &() const;
-    operator SyncScopePolicy_ptr &();
-    // in, inout, out, _retn 
-    SyncScopePolicy_ptr in (void) const;
-    SyncScopePolicy_ptr &inout (void);
-    SyncScopePolicy_ptr &out (void);
-    SyncScopePolicy_ptr _retn (void);
-    SyncScopePolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static SyncScopePolicy_ptr tao_duplicate (SyncScopePolicy_ptr);
     static void tao_release (SyncScopePolicy_ptr);
     static SyncScopePolicy_ptr tao_nil (void);
-    static SyncScopePolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        SyncScopePolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    SyncScopePolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    SyncScopePolicy_var (const TAO_Base_var &rhs);
-    SyncScopePolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_SYNCSCOPEPOLICY___OUT_CH_)
-#define _MESSAGING_SYNCSCOPEPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Messaging_Export SyncScopePolicy_out
+  struct TAO_Messaging_Export tao_SyncScopePolicy_cast
   {
-  public:
-    SyncScopePolicy_out (SyncScopePolicy_ptr &);
-    SyncScopePolicy_out (SyncScopePolicy_var &);
-    SyncScopePolicy_out (const SyncScopePolicy_out &);
-    SyncScopePolicy_out &operator= (const SyncScopePolicy_out &);
-    SyncScopePolicy_out &operator= (const SyncScopePolicy_var &);
-    SyncScopePolicy_out &operator= (SyncScopePolicy_ptr);
-    operator SyncScopePolicy_ptr &();
-    SyncScopePolicy_ptr &ptr (void);
-    SyncScopePolicy_ptr operator-> (void);
-  
-  private:
-    SyncScopePolicy_ptr &ptr_;
+    static SyncScopePolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY_CH_)
 #define _MESSAGING_SYNCSCOPEPOLICY_CH_
@@ -198,7 +160,7 @@ TAO_NAMESPACE  Messaging
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -208,10 +170,6 @@ TAO_NAMESPACE  Messaging
   protected:
     SyncScopePolicy (void);
     virtual ~SyncScopePolicy (void);
-    
-    friend class _TAO_SyncScopePolicy_Remote_Proxy_Impl;
-    friend class _TAO_SyncScopePolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_SyncScopePolicy_Direct_Proxy_Impl;
   
   private:
     SyncScopePolicy (const SyncScopePolicy &);
@@ -249,7 +207,7 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_SyncScope_PolicyC.i"
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
index 5ab27cf553c..cb4d254d31a 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.i
@@ -25,14 +25,6 @@
 
 #if !defined (_MESSAGING_SYNCSCOPEPOLICY___CI_)
 #define _MESSAGING_SYNCSCOPEPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -61,4 +53,3 @@ TAO::Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
 }
 
 #endif /* end #if !defined */
-
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
index b38f1d1e709..ed0759ed148 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -24,17 +24,6 @@
 
 
 #include "TAO_ExtC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -50,7 +39,7 @@
 int TAO::ConnectionTimeoutPolicy::_tao_class_id = 0;
 
 TAO::ConnectionTimeoutPolicy_ptr
-tao_TAO_ConnectionTimeoutPolicy_duplicate (
+TAO::tao_ConnectionTimeoutPolicy_life::tao_duplicate (
     TAO::ConnectionTimeoutPolicy_ptr p
   )
 {
@@ -58,7 +47,7 @@ tao_TAO_ConnectionTimeoutPolicy_duplicate (
 }
 
 void
-tao_TAO_ConnectionTimeoutPolicy_release (
+TAO::tao_ConnectionTimeoutPolicy_life::tao_release (
     TAO::ConnectionTimeoutPolicy_ptr p
   )
 {
@@ -66,15 +55,24 @@ tao_TAO_ConnectionTimeoutPolicy_release (
 }
 
 TAO::ConnectionTimeoutPolicy_ptr
-tao_TAO_ConnectionTimeoutPolicy_nil (
+TAO::tao_ConnectionTimeoutPolicy_life::tao_nil (
     void
   )
 {
   return TAO::ConnectionTimeoutPolicy::_nil ();
 }
 
+CORBA::Boolean
+TAO::tao_ConnectionTimeoutPolicy_life::tao_marshal (
+    TAO::ConnectionTimeoutPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 TAO::ConnectionTimeoutPolicy_ptr
-tao_TAO_ConnectionTimeoutPolicy_narrow (
+TAO::tao_ConnectionTimeoutPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -83,7 +81,7 @@ tao_TAO_ConnectionTimeoutPolicy_narrow (
 }
 
 CORBA::Object *
-tao_TAO_ConnectionTimeoutPolicy_upcast (
+TAO::tao_ConnectionTimeoutPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -92,205 +90,32 @@ tao_TAO_ConnectionTimeoutPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_TAO_ConnectionTimeoutPolicy_marshal (
-    TAO::ConnectionTimeoutPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// TAO::ConnectionTimeoutPolicy_var
-// *************************************************************
-
-TAO::ConnectionTimeoutPolicy_var::ConnectionTimeoutPolicy_var (void)
-  : ptr_ (ConnectionTimeoutPolicy::_nil ())
-{}
-
-::TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO::ConnectionTimeoutPolicy_var::ConnectionTimeoutPolicy_var (const ::TAO::ConnectionTimeoutPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ConnectionTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
-TAO::ConnectionTimeoutPolicy_var::~ConnectionTimeoutPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-TAO::ConnectionTimeoutPolicy_var &
-TAO::ConnectionTimeoutPolicy_var::operator= (ConnectionTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO::ConnectionTimeoutPolicy_var &
-TAO::ConnectionTimeoutPolicy_var::operator= (const ::TAO::ConnectionTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-TAO::ConnectionTimeoutPolicy_var::operator const ::TAO::ConnectionTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-TAO::ConnectionTimeoutPolicy_var::operator ::TAO::ConnectionTimeoutPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr &
-TAO::ConnectionTimeoutPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr &
-TAO::ConnectionTimeoutPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
-  return this->ptr_;
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO::ConnectionTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
-  return val;
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy_var::tao_duplicate (ConnectionTimeoutPolicy_ptr p)
-{
-  return ::TAO::ConnectionTimeoutPolicy::_duplicate (p);
-}
-
-void
-TAO::ConnectionTimeoutPolicy_var::tao_release (ConnectionTimeoutPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy_var::tao_nil (void)
-{
-  return ::TAO::ConnectionTimeoutPolicy::_nil ();
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO::ConnectionTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-TAO::ConnectionTimeoutPolicy_var::tao_upcast (void *src)
-{
-  ConnectionTimeoutPolicy **tmp =
-    ACE_static_cast (ConnectionTimeoutPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        TAO::ConnectionTimeoutPolicy,
+        TAO::tao_ConnectionTimeoutPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        TAO::ConnectionTimeoutPolicy,
+        TAO::tao_ConnectionTimeoutPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        TAO::ConnectionTimeoutPolicy, \
+        TAO::tao_ConnectionTimeoutPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        TAO::ConnectionTimeoutPolicy, \
+        TAO::tao_ConnectionTimeoutPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// TAO::ConnectionTimeoutPolicy_out
-// *************************************************************
-
-TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
-}
-
-TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
-}
-
-TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (const ::TAO::ConnectionTimeoutPolicy_out &p)
-  : ptr_ (ACE_const_cast (ConnectionTimeoutPolicy_out &, p).ptr_)
-{}
-
-::TAO::ConnectionTimeoutPolicy_out &
-TAO::ConnectionTimeoutPolicy_out::operator= (const ::TAO::ConnectionTimeoutPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ConnectionTimeoutPolicy_out&, p).ptr_;
-  return *this;
-}
-
-TAO::ConnectionTimeoutPolicy_out &
-TAO::ConnectionTimeoutPolicy_out::operator= (const ::TAO::ConnectionTimeoutPolicy_var &p)
-{
-  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-TAO::ConnectionTimeoutPolicy_out &
-TAO::ConnectionTimeoutPolicy_out::operator= (ConnectionTimeoutPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO::ConnectionTimeoutPolicy_out::operator ::TAO::ConnectionTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr &
-TAO::ConnectionTimeoutPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::TAO::ConnectionTimeoutPolicy_ptr
-TAO::ConnectionTimeoutPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void)
 {}
@@ -298,7 +123,7 @@ TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void)
 TAO::ConnectionTimeoutPolicy::~ConnectionTimeoutPolicy (void)
 {}
 
-void 
+void
 TAO::ConnectionTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConnectionTimeoutPolicy *tmp = ACE_static_cast (ConnectionTimeoutPolicy *, _tao_void_pointer);
@@ -314,7 +139,7 @@ TAO::ConnectionTimeoutPolicy::_narrow (
   return ConnectionTimeoutPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO::ConnectionTimeoutPolicy_ptr 
+TAO::ConnectionTimeoutPolicy_ptr
 TAO::ConnectionTimeoutPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -324,7 +149,7 @@ TAO::ConnectionTimeoutPolicy::_unchecked_narrow (
     {
       return ConnectionTimeoutPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ConnectionTimeoutPolicy_ptr,
@@ -344,14 +169,14 @@ TAO::ConnectionTimeoutPolicy::_duplicate (ConnectionTimeoutPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *TAO::ConnectionTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::TAO, ConnectionTimeoutPolicy)::_tao_class_id)
@@ -384,12 +209,12 @@ void *TAO::ConnectionTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -398,6 +223,12 @@ const char* TAO::ConnectionTimeoutPolicy::_interface_repository_id (void) const
   return "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0";
 }
 
+CORBA::Boolean
+TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -405,22 +236,22 @@ static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x436f6e6e), 
-  ACE_NTOHL (0x65637469), 
-  ACE_NTOHL (0x6f6e5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x74506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
+  ACE_NTOHL (0x54414f2f),
+  ACE_NTOHL (0x436f6e6e),
+  ACE_NTOHL (0x65637469),
+  ACE_NTOHL (0x6f6e5469),
+  ACE_NTOHL (0x6d656f75),
+  ACE_NTOHL (0x74506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/ConnectionTimeoutPolicy:1.0
     24,
-  ACE_NTOHL (0x436f6e6e), 
-  ACE_NTOHL (0x65637469), 
-  ACE_NTOHL (0x6f6e5469), 
-  ACE_NTOHL (0x6d656f75), 
-  ACE_NTOHL (0x74506f6c), 
+  ACE_NTOHL (0x436f6e6e),
+  ACE_NTOHL (0x65637469),
+  ACE_NTOHL (0x6f6e5469),
+  ACE_NTOHL (0x6d656f75),
+  ACE_NTOHL (0x74506f6c),
   ACE_NTOHL (0x69637900),  // name = ConnectionTimeoutPolicy
   };
 
@@ -494,4 +325,3 @@ operator>>= (
 # pragma instantiate TAO_Object_Manager<TAO::ConnectionTimeoutPolicy, TAO::ConnectionTimeoutPolicy_var>
 # pragma instantiate TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
index cba366bc7e4..22c8bcc26e7 100644
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -26,13 +26,12 @@
 #define _TAO_IDL_ORIG_TAO_EXTC_H_
 
 #include "ace/pre.h"
-#include "tao/orbconf.h"
+#include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PolicyC.h"
 #include "tao/TimeBaseC.h"
 #include "messaging_export.h"
 
@@ -68,93 +67,56 @@ TAO_NAMESPACE  TAO
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong CONNECTION_TIMEOUT_POLICY_TYPE = 1413545992U;
+  const CORBA::PolicyType CONNECTION_TIMEOUT_POLICY_TYPE = 1413545992U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___PTR_CH_)
-#define _TAO_CONNECTIONTIMEOUTPOLICY___PTR_CH_
+#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY__ODDS_N_ENDS_CH_)
+#define _TAO_CONNECTIONTIMEOUTPOLICY__ODDS_N_ENDS_CH_
   
   class ConnectionTimeoutPolicy;
   typedef ConnectionTimeoutPolicy *ConnectionTimeoutPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___VAR_CH_)
-#define _TAO_CONNECTIONTIMEOUTPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Messaging_Export ConnectionTimeoutPolicy_var : public TAO_Base_var
+  struct tao_ConnectionTimeoutPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ConnectionTimeoutPolicy,
+        tao_ConnectionTimeoutPolicy_life
+      >
+    ConnectionTimeoutPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ConnectionTimeoutPolicy,
+        tao_ConnectionTimeoutPolicy_life
+      >
+    ConnectionTimeoutPolicy_out;
+  
+  struct TAO_Messaging_Export tao_ConnectionTimeoutPolicy_life
   {
-  public:
-    ConnectionTimeoutPolicy_var (void); // default constructor
-    ConnectionTimeoutPolicy_var (ConnectionTimeoutPolicy_ptr p) : ptr_ (p) {} 
-    ConnectionTimeoutPolicy_var (const ConnectionTimeoutPolicy_var &); // copy constructor
-    ~ConnectionTimeoutPolicy_var (void); // destructor
-    
-    ConnectionTimeoutPolicy_var &operator= (ConnectionTimeoutPolicy_ptr);
-    ConnectionTimeoutPolicy_var &operator= (const ConnectionTimeoutPolicy_var &);
-    ConnectionTimeoutPolicy_ptr operator-> (void) const;
-    
-    operator const ConnectionTimeoutPolicy_ptr &() const;
-    operator ConnectionTimeoutPolicy_ptr &();
-    // in, inout, out, _retn 
-    ConnectionTimeoutPolicy_ptr in (void) const;
-    ConnectionTimeoutPolicy_ptr &inout (void);
-    ConnectionTimeoutPolicy_ptr &out (void);
-    ConnectionTimeoutPolicy_ptr _retn (void);
-    ConnectionTimeoutPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ConnectionTimeoutPolicy_ptr tao_duplicate (ConnectionTimeoutPolicy_ptr);
     static void tao_release (ConnectionTimeoutPolicy_ptr);
     static ConnectionTimeoutPolicy_ptr tao_nil (void);
-    static ConnectionTimeoutPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ConnectionTimeoutPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ConnectionTimeoutPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ConnectionTimeoutPolicy_var (const TAO_Base_var &rhs);
-    ConnectionTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___OUT_CH_)
-#define _TAO_CONNECTIONTIMEOUTPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Messaging_Export ConnectionTimeoutPolicy_out
+  struct TAO_Messaging_Export tao_ConnectionTimeoutPolicy_cast
   {
-  public:
-    ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_ptr &);
-    ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_var &);
-    ConnectionTimeoutPolicy_out (const ConnectionTimeoutPolicy_out &);
-    ConnectionTimeoutPolicy_out &operator= (const ConnectionTimeoutPolicy_out &);
-    ConnectionTimeoutPolicy_out &operator= (const ConnectionTimeoutPolicy_var &);
-    ConnectionTimeoutPolicy_out &operator= (ConnectionTimeoutPolicy_ptr);
-    operator ConnectionTimeoutPolicy_ptr &();
-    ConnectionTimeoutPolicy_ptr &ptr (void);
-    ConnectionTimeoutPolicy_ptr operator-> (void);
-  
-  private:
-    ConnectionTimeoutPolicy_ptr &ptr_;
+    static ConnectionTimeoutPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY_CH_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY_CH_
@@ -198,7 +160,7 @@ TAO_NAMESPACE  TAO
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -208,10 +170,6 @@ TAO_NAMESPACE  TAO
   protected:
     ConnectionTimeoutPolicy (void);
     virtual ~ConnectionTimeoutPolicy (void);
-    
-    friend class _TAO_ConnectionTimeoutPolicy_Remote_Proxy_Impl;
-    friend class _TAO_ConnectionTimeoutPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConnectionTimeoutPolicy_Direct_Proxy_Impl;
   
   private:
     ConnectionTimeoutPolicy (const ConnectionTimeoutPolicy &);
@@ -249,7 +207,7 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::Connec
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "TAO_ExtC.i"
diff --git a/TAO/tao/Messaging/TAO_ExtC.i b/TAO/tao/Messaging/TAO_ExtC.i
index f82ebc3d9ed..0b055bbf586 100644
--- a/TAO/tao/Messaging/TAO_ExtC.i
+++ b/TAO/tao/Messaging/TAO_ExtC.i
@@ -25,14 +25,6 @@
 
 #if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___CI_)
 #define _TAO_CONNECTIONTIMEOUTPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -61,4 +53,3 @@ TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
 }
 
 #endif /* end #if !defined */
-
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index 5692f904e2e..5feef2e22ec 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -25,16 +25,6 @@
 
 #include "Messaging_PolicyValueC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -51,46 +41,46 @@ static const CORBA::Long _oc_Messaging_PolicyValue[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
     12,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
   ACE_NTOHL (0x6c756500),  // name = PolicyValue
   2, // member count
     6,
-  ACE_NTOHL (0x70747970), 
+  ACE_NTOHL (0x70747970),
   ACE_NTOHL (0x65000000),  // name = ptype
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f506f), 
-    ACE_NTOHL (0x6c696379), 
-    ACE_NTOHL (0x54797065), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f506f),
+    ACE_NTOHL (0x6c696379),
+    ACE_NTOHL (0x54797065),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
         11,
-    ACE_NTOHL (0x506f6c69), 
-    ACE_NTOHL (0x63795479), 
+    ACE_NTOHL (0x506f6c69),
+    ACE_NTOHL (0x63795479),
     ACE_NTOHL (0x70650000),  // name = PolicyType
         CORBA::tk_ulong,
 
 
   7,
-  ACE_NTOHL (0x7076616c), 
+  ACE_NTOHL (0x7076616c),
   ACE_NTOHL (0x75650000),  // name = pvalue
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -118,8 +108,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void Messaging::PolicyValue::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -127,29 +117,17 @@ void Messaging::PolicyValue::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_)
-#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// Messaging::PolicyValue::_tao_seq_Octet
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (max)
 {}
 
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (
@@ -158,30 +136,20 @@ Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (
     CORBA::Octet *buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (max, length, buffer, release)
 {}
 
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (seq)
 {}
 
-Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
+Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void)
 {}
 
 void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer)
@@ -190,87 +158,48 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *_tao_voi
   delete tmp;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_
+template class
+  TAO_Var_Var_T<
+      PolicyValue
+    >;
 
-void
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_allocate_buffer (CORBA::ULong length)
-{
-  Messaging::PolicyValue* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      Messaging::PolicyValue *old =
-        ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Out_T<
+      PolicyValue,
+      PolicyValue_var
+    >;
 
-void
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  Messaging::PolicyValue *tmp =
-    ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
-  _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      PolicyValue \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      PolicyValue, \
+      PolicyValue_var \
+    >
 
-#if !defined (_MESSAGING_POLICYVALUESEQ_CS_)
-#define _MESSAGING_POLICYVALUESEQ_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// Messaging::PolicyValueSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 Messaging::PolicyValueSeq::PolicyValueSeq (void)
 {}
 
 Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Messaging::PolicyValue>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        Messaging::PolicyValue
+      >
+    (max)
 {}
 
 Messaging::PolicyValueSeq::PolicyValueSeq (
@@ -279,30 +208,20 @@ Messaging::PolicyValueSeq::PolicyValueSeq (
     Messaging::PolicyValue *buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Messaging::PolicyValue>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        Messaging::PolicyValue
+      >
+    (max, length, buffer, release)
 {}
 
 Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<Messaging::PolicyValue>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        Messaging::PolicyValue
+      >
+    (seq)
 {}
 
-Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor
+Messaging::PolicyValueSeq::~PolicyValueSeq (void)
 {}
 
 void Messaging::PolicyValueSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -311,7 +230,37 @@ void Messaging::PolicyValueSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      PolicyValueSeq,
+      Messaging::PolicyValue
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      PolicyValueSeq,
+      PolicyValueSeq_var,
+      Messaging::PolicyValue
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      PolicyValueSeq, \
+      Messaging::PolicyValue \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      PolicyValueSeq, \
+      PolicyValueSeq_var, \
+      Messaging::PolicyValue \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -320,21 +269,21 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65536571), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65536571),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
     15,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
-  ACE_NTOHL (0x6c756553), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x6c756553),
   ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
     CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
@@ -343,46 +292,46 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       38,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x4d657373), 
-      ACE_NTOHL (0x6167696e), 
-      ACE_NTOHL (0x672f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x56616c75), 
-      ACE_NTOHL (0x653a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x4d657373),
+      ACE_NTOHL (0x6167696e),
+      ACE_NTOHL (0x672f506f),
+      ACE_NTOHL (0x6c696379),
+      ACE_NTOHL (0x56616c75),
+      ACE_NTOHL (0x653a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
             12,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63795661), 
+      ACE_NTOHL (0x506f6c69),
+      ACE_NTOHL (0x63795661),
       ACE_NTOHL (0x6c756500),  // name = PolicyValue
       2, // member count
             6,
-      ACE_NTOHL (0x70747970), 
+      ACE_NTOHL (0x70747970),
       ACE_NTOHL (0x65000000),  // name = ptype
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f506f), 
-        ACE_NTOHL (0x6c696379), 
-        ACE_NTOHL (0x54797065), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f506f),
+        ACE_NTOHL (0x6c696379),
+        ACE_NTOHL (0x54797065),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
                 11,
-        ACE_NTOHL (0x506f6c69), 
-        ACE_NTOHL (0x63795479), 
+        ACE_NTOHL (0x506f6c69),
+        ACE_NTOHL (0x63795479),
         ACE_NTOHL (0x70650000),  // name = PolicyType
                 CORBA::tk_ulong,
 
 
       7,
-      ACE_NTOHL (0x7076616c), 
+      ACE_NTOHL (0x7076616c),
       ACE_NTOHL (0x75650000),  // name = pvalue
             CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -413,7 +362,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -478,7 +427,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<Messaging::PolicyValue>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -544,7 +493,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
@@ -555,27 +504,27 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
           ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence);
         if (oseq->mb ())
           return strm.write_octet_array_mb (oseq->mb ());
         else
           return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
       }
-      
+
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  
+
   return 0;
 }
 
@@ -585,7 +534,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -595,18 +544,18 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       if (ACE_BIT_DISABLED (strm.start ()->flags (),
       ACE_Message_Block::DONT_DELETE))
@@ -616,7 +565,7 @@ CORBA::Boolean operator>> (
         strm.orb_core ()->resource_factory ()->
         input_cdr_allocator_type_locked () == 1)
         {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
             ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
           oseq->replace (_tao_seq_len, strm.start ());
           oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -627,17 +576,17 @@ CORBA::Boolean operator>> (
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  
+
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -645,20 +594,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -668,7 +617,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -678,27 +627,26 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
-
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index 24af31cc50a..13b919eebc3 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -26,16 +26,12 @@
 #define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "IOPC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "IOPC.h"
-#include "Sequence.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -66,9 +62,25 @@ TAO_NAMESPACE  Messaging
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class PolicyValue_var;
+  struct PolicyValue;
+  
+  typedef
+    TAO_Var_Var_T<
+        PolicyValue
+      >
+    PolicyValue_var;
+  
+  typedef
+    TAO_Out_T<
+        PolicyValue,
+        PolicyValue_var
+      >
+    PolicyValue_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export PolicyValue
   {
@@ -77,46 +89,32 @@ TAO_NAMESPACE  Messaging
     static void _tao_any_destructor (void *);
     CORBA::PolicyType ptype;
     
-
-#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_)
-#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-    
-    class _tao_seq_Octet;
-    
-    // *************************************************************
-    // Messaging::PolicyValue::_tao_seq_Octet
-    // *************************************************************
-    
-    class TAO_Export _tao_seq_Octet : public 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
     
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    class TAO_Export _tao_seq_Octet
+      : public
+          TAO_Unbounded_Sequence<
+              CORBA::Octet
+            >
     {
     public:
       _tao_seq_Octet (void);
       _tao_seq_Octet (CORBA::ULong max);
       _tao_seq_Octet (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
+          CORBA::ULong max,
+          CORBA::ULong length,
           CORBA::Octet *buffer, 
           CORBA::Boolean release = 0
         );
       _tao_seq_Octet (const _tao_seq_Octet &);
       ~_tao_seq_Octet (void);
       
-      static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void *);
       
       
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       _tao_seq_Octet (
           CORBA::ULong length,
@@ -125,8 +123,6 @@ TAO_NAMESPACE  Messaging
         : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
     };
-
-#endif /* end #if !defined */
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
@@ -136,234 +132,52 @@ TAO_NAMESPACE  Messaging
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export PolicyValue_var
-  {
-  public:
-    PolicyValue_var (void);
-    PolicyValue_var (PolicyValue *);
-    PolicyValue_var (const PolicyValue_var &);
-    ~PolicyValue_var (void);
-    
-    PolicyValue_var &operator= (PolicyValue *);
-    PolicyValue_var &operator= (const PolicyValue_var &);
-    PolicyValue *operator-> (void);
-    const PolicyValue *operator-> (void) const;
-    
-    operator const PolicyValue &() const;
-    operator PolicyValue &();
-    operator PolicyValue &() const;
-    
-    // Variable-size types only.
-    operator PolicyValue *&();
-    
-    // in, inout, out, _retn 
-    const PolicyValue &in (void) const;
-    PolicyValue &inout (void);
-    PolicyValue *&out (void);
-    PolicyValue *_retn (void);
-    PolicyValue *ptr (void) const;
-  
-  private:
-    PolicyValue *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_Export PolicyValue_out
-  {
-  public:
-    PolicyValue_out (PolicyValue *&);
-    PolicyValue_out (PolicyValue_var &);
-    PolicyValue_out (const PolicyValue_out &);
-    PolicyValue_out &operator= (const PolicyValue_out &);
-    PolicyValue_out &operator= (PolicyValue *);
-    operator PolicyValue *&();
-    PolicyValue *&ptr (void);
-    PolicyValue *operator-> (void);
-    
-  private:
-    PolicyValue *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const PolicyValue_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue;
   
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_
-  
-  class TAO_Export _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void);
-    _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        PolicyValue *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
-        const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &operator= (
-        const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void);
-    
-    // = Accessors.
-    PolicyValue &operator[] (CORBA::ULong i);
-    const PolicyValue &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static PolicyValue *allocbuf (CORBA::ULong size);
-    static void freebuf (PolicyValue *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    PolicyValue *get_buffer (CORBA::Boolean orphan = 0);
-    const PolicyValue *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        PolicyValue *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
-#define _MESSAGING_POLICYVALUESEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
   
   class PolicyValueSeq;
-  class PolicyValueSeq_var;
   
-  // *************************************************************
-  // Messaging::PolicyValueSeq
-  // *************************************************************
+  typedef
+    TAO_VarSeq_Var_T<
+        PolicyValueSeq,
+        Messaging::PolicyValue
+      >
+    PolicyValueSeq_var;
   
-  class TAO_Export PolicyValueSeq : public 
+  typedef
+    TAO_Seq_Out_T<
+        PolicyValueSeq,
+        PolicyValueSeq_var,
+        Messaging::PolicyValue
+      >
+    PolicyValueSeq_out;
   
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<PolicyValue>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  class TAO_Export PolicyValueSeq
+    : public
+        TAO_Unbounded_Sequence<
+            Messaging::PolicyValue
+          >
   {
   public:
     PolicyValueSeq (void);
     PolicyValueSeq (CORBA::ULong max);
     PolicyValueSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
+        CORBA::ULong max,
+        CORBA::ULong length,
         PolicyValue *buffer, 
         CORBA::Boolean release = 0
       );
     PolicyValueSeq (const PolicyValueSeq &);
     ~PolicyValueSeq (void);
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
     
     typedef PolicyValueSeq_var _var_type;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_POLICYVALUESEQ___VAR_CH_)
-#define _MESSAGING_POLICYVALUESEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class Messaging::PolicyValueSeq_var
-  // *************************************************************
-  
-  class TAO_Export PolicyValueSeq_var
-  {
-  public:
-    PolicyValueSeq_var (void);
-    PolicyValueSeq_var (PolicyValueSeq *);
-    PolicyValueSeq_var (const PolicyValueSeq_var &);
-    ~PolicyValueSeq_var (void);
-    
-    PolicyValueSeq_var &operator= (PolicyValueSeq *);
-    PolicyValueSeq_var &operator= (const PolicyValueSeq_var &);
-    PolicyValueSeq *operator-> (void);
-    const PolicyValueSeq *operator-> (void) const;
-    
-    operator const PolicyValueSeq &() const;
-    operator PolicyValueSeq &();
-    operator PolicyValueSeq &() const;
-    
-    // Variable-size base types only.
-    operator PolicyValueSeq *&();
-    
-    PolicyValue & operator[] (CORBA::ULong index);
-    const PolicyValue & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const PolicyValueSeq &in (void) const;
-    PolicyValueSeq &inout (void);
-    PolicyValueSeq *&out (void);
-    PolicyValueSeq *_retn (void);
-    PolicyValueSeq *ptr (void) const;
-  
-  private:
-    PolicyValueSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_POLICYVALUESEQ___OUT_CH_)
-#define _MESSAGING_POLICYVALUESEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export PolicyValueSeq_out
-  {
-  public:
-    PolicyValueSeq_out (PolicyValueSeq *&);
-    PolicyValueSeq_out (PolicyValueSeq_var &);
-    PolicyValueSeq_out (const PolicyValueSeq_out &);
-    PolicyValueSeq_out &operator= (const PolicyValueSeq_out &);
-    PolicyValueSeq_out &operator= (PolicyValueSeq *);
-    operator PolicyValueSeq *&();
-    PolicyValueSeq *&ptr (void);
-    PolicyValueSeq *operator-> (void);
-    PolicyValue & operator[] (CORBA::ULong index);
-  
-  private:
-    PolicyValueSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const PolicyValueSeq_var &);
-  };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -373,12 +187,12 @@ TAO_NAMESPACE  Messaging
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong TAG_POLICIES = 2U;
+  const IOP::ComponentId TAG_POLICIES = 2U;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong INVOCATION_POLICIES = 2U;
+  const IOP::ServiceId INVOCATION_POLICIES = 2U;
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
@@ -453,7 +267,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_PolicyValueC.i"
diff --git a/TAO/tao/Messaging_PolicyValueC.i b/TAO/tao/Messaging_PolicyValueC.i
index 331ec91b760..3710f2372eb 100644
--- a/TAO/tao/Messaging_PolicyValueC.i
+++ b/TAO/tao/Messaging_PolicyValueC.i
@@ -21,675 +21,6 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValue_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (PolicyValue *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (const ::Messaging::PolicyValue_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Messaging::PolicyValue (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::~PolicyValue_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (PolicyValue *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (const ::Messaging::PolicyValue_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PolicyValue *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PolicyValue (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PolicyValue *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::Messaging::PolicyValue *
-Messaging::PolicyValue_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PolicyValue *
-Messaging::PolicyValue_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator const ::Messaging::PolicyValue &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator ::Messaging::PolicyValue &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator ::Messaging::PolicyValue &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Messaging::PolicyValue_var::operator ::Messaging::PolicyValue *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::Messaging::PolicyValue &
-Messaging::PolicyValue_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PolicyValue &
-Messaging::PolicyValue_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::Messaging::PolicyValue *&
-Messaging::PolicyValue_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PolicyValue *
-Messaging::PolicyValue_var::_retn (void)
-{
-  ::Messaging::PolicyValue *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::Messaging::PolicyValue *
-Messaging::PolicyValue_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValue_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (::Messaging::PolicyValue *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (const ::Messaging::PolicyValue_out &p)
-  : ptr_ (ACE_const_cast (PolicyValue_out&, p).ptr_)
-{}
-
-ACE_INLINE
-Messaging::PolicyValue_out &
-Messaging::PolicyValue_out::operator= (const ::Messaging::PolicyValue_out &p)
-{
-  this->ptr_ = ACE_const_cast (PolicyValue_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out &
-Messaging::PolicyValue_out::operator= (PolicyValue *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-Messaging::PolicyValue_out::operator ::Messaging::PolicyValue *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PolicyValue *&
-Messaging::PolicyValue_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::PolicyValue *
-Messaging::PolicyValue_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_
-
-ACE_INLINE
-Messaging::PolicyValue *
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (CORBA::ULong size)
-{
-  Messaging::PolicyValue *retval = 0;
-  ACE_NEW_RETURN (retval, Messaging::PolicyValue[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (Messaging::PolicyValue *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void)
-{
-}
-
-ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    Messaging::PolicyValue *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (
-    const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      Messaging::PolicyValue *tmp1 =
-        _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->maximum_);
-      Messaging::PolicyValue * const tmp2 =
-        ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator= (
-    const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          Messaging::PolicyValue *tmp =
-            ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  Messaging::PolicyValue *tmp1 =
-    ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_);
-  Messaging::PolicyValue * const tmp2 =
-    ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-Messaging::PolicyValue &
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  Messaging::PolicyValue* tmp =
-    ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const Messaging::PolicyValue &
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  Messaging::PolicyValue * const tmp =
-    ACE_reinterpret_cast (Messaging::PolicyValue* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-Messaging::PolicyValue *
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (CORBA::Boolean orphan)
-{
-  Messaging::PolicyValue *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const Messaging::PolicyValue *
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const Messaging::PolicyValue * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    Messaging::PolicyValue *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      Messaging::PolicyValue *tmp =
-        ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_);
-      _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_MESSAGING_POLICYVALUESEQ_CI_)
-#define _MESSAGING_POLICYVALUESEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValueSeq_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (PolicyValueSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const ::Messaging::PolicyValueSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var &
-Messaging::PolicyValueSeq_var::operator= (PolicyValueSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq_var &
-Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PolicyValueSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PolicyValueSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PolicyValueSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator const ::Messaging::PolicyValueSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue &
-Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const Messaging::PolicyValue &
-Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const Messaging::PolicyValue &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::Messaging::PolicyValueSeq &
-Messaging::PolicyValueSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq &
-Messaging::PolicyValueSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq *&
-Messaging::PolicyValueSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::_retn (void)
-{
-  ::Messaging::PolicyValueSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValueSeq_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const ::Messaging::PolicyValueSeq_out &p)
-  : ptr_ (ACE_const_cast (PolicyValueSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq_out &
-Messaging::PolicyValueSeq_out::operator= (const ::Messaging::PolicyValueSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (PolicyValueSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq_out &
-Messaging::PolicyValueSeq_out::operator= (PolicyValueSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::operator ::Messaging::PolicyValueSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq *&
-Messaging::PolicyValueSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue &
-Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_
@@ -708,7 +39,7 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
index 2b4ed88e016..e6096db4589 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -63,7 +63,7 @@ TAO_NAMESPACE  Messaging
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Short SyncScope;
   typedef CORBA::Short_out SyncScope_out;
@@ -76,22 +76,22 @@ TAO_NAMESPACE  Messaging
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short SYNC_NONE = 0;
+  const Messaging::SyncScope SYNC_NONE = 0;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short SYNC_WITH_TRANSPORT = 1;
+  const Messaging::SyncScope SYNC_WITH_TRANSPORT = 1;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short SYNC_WITH_SERVER = 2;
+  const Messaging::SyncScope SYNC_WITH_SERVER = 2;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short SYNC_WITH_TARGET = 3;
+  const Messaging::SyncScope SYNC_WITH_TARGET = 3;
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
@@ -110,7 +110,7 @@ TAO_NAMESPACE_CLOSE // module Messaging
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_SyncScopeC.i"
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 457da9934df..05c4988a592 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+
 // Implementation of Named Value List and NamedValue classes
 
 #include "tao/NVList.h"
@@ -134,7 +135,7 @@ CORBA::NVList::add_value (const char *name,
                           ACE_ENV_ARG_DECL)
 {
   // Call the helper to allocate a NamedValue element.
-  CORBA::NamedValue_ptr nv = this->add_element (flags 
+  CORBA::NamedValue_ptr nv = this->add_element (flags
                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -306,8 +307,8 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
                             int flag
                             ACE_ENV_ARG_DECL)
 {
-  ACE_GUARD (TAO_SYNCH_MUTEX, 
-             ace_mon, 
+  ACE_GUARD (TAO_SYNCH_MUTEX,
+             ace_mon,
              this->refcount_lock_);
 
   if (this->incoming_ != 0)
@@ -393,7 +394,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
 {
   if (TAO_debug_level > 3)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
     }
 
@@ -433,8 +434,8 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
 ptr_arith_t
 CORBA::NVList::_tao_target_alignment (void)
 {
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
-                    ace_mon, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    ace_mon,
                     this->refcount_lock_,
                     ACE_CDR::MAX_ALIGNMENT);
 
@@ -479,6 +480,10 @@ CORBA::NVList::_lazy_has_arguments (void) const
 template class ACE_Node<CORBA::NamedValue_ptr>;
 template class ACE_Unbounded_Queue<CORBA::NamedValue_ptr>;
 template class ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>;
+template class TAO_Pseudo_Var_T<CORBA::NamedValue>;
+template class TAO_Pseudo_Out_T<CORBA::NamedValue, CORBA::NamedValue_var>;
+template class TAO_Pseudo_Var_T<CORBA::NVList>;
+template class TAO_Pseudo_Out_T<CORBA::NVList, CORBA::NVList_var>;
 #  if defined (ACE_LACKS_AUTO_PTR) \
       || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
            && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
@@ -489,6 +494,10 @@ template class auto_ptr<TAO_InputCDR>;
 #pragma instantiate ACE_Node<CORBA::NamedValue_ptr>
 #pragma instantiate ACE_Unbounded_Queue<CORBA::NamedValue_ptr>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>
+#pragma instantiate TAO_Pseudo_Var_T<CORBA::NamedValue>
+#pragma instantiate TAO_Pseudo_Out_T<CORBA::NamedValue, CORBA::NamedValue_var>
+#pragma instantiate TAO_Pseudo_Var_T<CORBA::NVList>
+#pragma instantiate TAO_Pseudo_Out_T<CORBA::NVList, CORBA::NVList_var>
 #  if defined (ACE_LACKS_AUTO_PTR) \
       || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
            && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index 6a96ca61b66..e19d7b5840e 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -32,6 +32,10 @@ class TAO_InputCDR;
 
 namespace CORBA
 {
+  class NamedValue;
+  typedef TAO_Pseudo_Var_T<NamedValue> NamedValue_var;
+  typedef TAO_Pseudo_Out_T<NamedValue, NamedValue_var> NamedValue_out;
+
   /**
    * @class NamedValue
    *
@@ -53,7 +57,7 @@ namespace CORBA
 
   public:
     /// optional name
-    const char *name (void) const;
+    const char * name (void) const;
 
     /// return the value
     CORBA::Any_ptr value (void) const;
@@ -62,18 +66,16 @@ namespace CORBA
     CORBA::Flags flags (void) const;
 
     // The pseudo object static methods..
-    static NamedValue* _duplicate (NamedValue*);
-    static NamedValue* _nil (void);
+    static NamedValue * _duplicate (NamedValue *);
+    static NamedValue * _nil (void);
 
     // = Reference counting.
     CORBA::ULong _incr_refcnt (void);
     CORBA::ULong _decr_refcnt (void);
 
     // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef NamedValue_ptr _ptr_type;
     typedef NamedValue_var _var_type;
-#endif /* __GNUC__ */
 
   protected:
 
@@ -105,70 +107,15 @@ namespace CORBA
     CORBA::Flags flags_;
 
     /// optional IDL name of the parameter
-    char *name_;
-  };
-
-  /**
-   * @class NamedValue_var
-   *
-   * @brief The T_var class for NamedValue
-   *
-   * As any other pseudo object NamedValue must have a T_var class,
-   * the interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_Export NamedValue_var
-  {
-  public:
-
-    NamedValue_var (void); // default constructor
-    NamedValue_var (NamedValue_ptr);
-    NamedValue_var (const NamedValue_var &); // copy constructor
-    ~NamedValue_var (void); // destructor
-
-    NamedValue_var &operator= (NamedValue_ptr);
-    NamedValue_var &operator= (const NamedValue_var &);
-    NamedValue_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const NamedValue_ptr &() const;
-    operator NamedValue_ptr &();
-    NamedValue_ptr in (void) const;
-    NamedValue_ptr &inout (void);
-    NamedValue_ptr &out (void);
-    NamedValue_ptr _retn (void);
-    NamedValue_ptr ptr (void) const;
-
-  private:
-    NamedValue_ptr ptr_;
-  };
-
-  /**
-   * @class NamedValue_out
-   *
-   * @brief The T_out class for NamedValue
-   *
-   * As any other pseudo object NamedValue must have a T_out class,
-   * the interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_Export NamedValue_out
-  {
-  public:
-    NamedValue_out (NamedValue_ptr &);
-    NamedValue_out (NamedValue_var &);
-    NamedValue_out (NamedValue_out &);
-    NamedValue_out &operator= (NamedValue_out &);
-    NamedValue_out &operator= (const NamedValue_var &);
-    NamedValue_out &operator= (NamedValue_ptr);
-    operator NamedValue_ptr &();
-    NamedValue_ptr &ptr (void);
-    NamedValue_ptr operator-> (void);
-
-  private:
-    NamedValue_ptr &ptr_;
+    char * name_;
   };
 
   // ****************************************************************
 
+  class NVList;
+  typedef TAO_Pseudo_Var_T<NVList> NVList_var;
+  typedef TAO_Pseudo_Out_T<NVList, NVList_var> NVList_out;
+
   /**
    * @class NVList
    *
@@ -233,8 +180,8 @@ namespace CORBA
                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     // The pseudo object static methods..
-    static NVList* _duplicate (NVList*);
-    static NVList* _nil (void);
+    static NVList * _duplicate (NVList *);
+    static NVList * _nil (void);
 
     // = Reference counting.
     CORBA::ULong _incr_refcnt (void);
@@ -248,20 +195,20 @@ namespace CORBA
      * The <flag> is used to check which parameters (IN, OUT and/or
      * INOUT) are to be extracted
      */
-    void _tao_incoming_cdr (TAO_InputCDR &cdr,
+    void _tao_incoming_cdr (TAO_InputCDR & cdr,
                             int flag,
-                            int &lazy_evaluation
+                            int & lazy_evaluation
                             ACE_ENV_ARG_DECL);
 
     /// Encode the NVList into the CDR stream. <flag> masks the type of
     /// arguments (IN, OUT or INOUT) that are to be marshaled.
-    void _tao_encode (TAO_OutputCDR &cdr,
-                      TAO_ORB_Core *orb_core,
+    void _tao_encode (TAO_OutputCDR & cdr,
+                      TAO_ORB_Core * orb_core,
                       int flag
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /// Decode the NVList arguments from the <cdr> stream.
-    void _tao_decode (TAO_InputCDR &cdr,
+    void _tao_decode (TAO_InputCDR & cdr,
                       int flag
                       ACE_ENV_ARG_DECL);
 
@@ -280,10 +227,8 @@ namespace CORBA
     CORBA::Boolean _lazy_has_arguments (void) const;
 
     // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef NVList_ptr _ptr_type;
     typedef NVList_var _var_type;
-#endif /* __GNUC__ */
 
   protected:
 
@@ -326,74 +271,14 @@ namespace CORBA
      * store the CDR buffer and perform lazy evaluation to compute the
      * Anys.
      */
-    TAO_InputCDR *incoming_;
+    TAO_InputCDR * incoming_;
 
     /// The flags used to check which parameters are actually extracted
     /// from the <incoming_> buffer
     int incoming_flag_;
   };
-
-  /**
-   * @class NVList_var
-   *
-   * @brief The T_var class for NVList
-   *
-   * As any other pseudo object NVList must have a T_var class,
-   * the interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_Export NVList_var
-  {
-  public:
-    NVList_var (void);
-    NVList_var (NVList_ptr);
-    NVList_var (const NVList_var &);
-    ~NVList_var (void);
-
-    NVList_var &operator= (NVList_ptr);
-    NVList_var &operator= (const NVList_var &);
-    NVList_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const NVList_ptr &() const;
-    operator NVList_ptr &();
-    NVList_ptr in (void) const;
-    NVList_ptr &inout (void);
-    NVList_ptr &out (void);
-    NVList_ptr _retn (void);
-    NVList_ptr ptr (void) const;
-
-  private:
-    NVList_ptr ptr_;
-   };
-
-  /**
-   * @class NVList_out
-   *
-   * @brief The T_out class for NVList
-   *
-   * As any other pseudo object NVList must have a T_out class,
-   * the interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_Export NVList_out
-  {
-  public:
-    NVList_out (NVList_ptr &);
-    NVList_out (NVList_var &);
-    NVList_out (NVList_out &);
-    NVList_out &operator= (NVList_out &);
-    NVList_out &operator= (const NVList_var &);
-    NVList_out &operator= (NVList_ptr);
-    operator NVList_ptr &();
-    NVList_ptr &ptr (void);
-    NVList_ptr operator-> (void);
-
-  private:
-    NVList_ptr &ptr_;
-   };
 }
 
-// ****************************************************************
-
 #if defined (__ACE_INLINE__)
 # include "tao/NVList.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i
index 94715f70889..e2f191fd945 100644
--- a/TAO/tao/NVList.i
+++ b/TAO/tao/NVList.i
@@ -15,7 +15,8 @@ CORBA::release (CORBA::NamedValue_ptr nv)
     nv->_decr_refcnt ();
 }
 
-// constructor
+// *************************************************************
+
 ACE_INLINE
 CORBA::NamedValue::NamedValue (void)
   : refcount_ (1),
@@ -24,220 +25,67 @@ CORBA::NamedValue::NamedValue (void)
 {
 }
 
-// return the name
-ACE_INLINE const char*
+ACE_INLINE 
+const char *
 CORBA::NamedValue::name (void) const
 {
   return this->name_;
 }
 
-// return the value
-ACE_INLINE CORBA::Any_ptr
+ACE_INLINE 
+CORBA::Any_ptr
 CORBA::NamedValue::value (void) const
 {
   return ACE_const_cast (CORBA::Any_ptr, &this->any_);
 }
 
-// return the flags
-ACE_INLINE CORBA::Flags
+ACE_INLINE 
+CORBA::Flags
 CORBA::NamedValue::flags (void) const
 {
   return this->flags_;
 }
 
-ACE_INLINE CORBA::NamedValue*
-CORBA::NamedValue::_duplicate (CORBA::NamedValue *x)
+ACE_INLINE 
+CORBA::NamedValue *
+CORBA::NamedValue::_duplicate (CORBA::NamedValue * x)
 {
   if (x != 0)
-    x->_incr_refcnt ();
+    {
+      x->_incr_refcnt ();
+    }
+
   return x;
 }
 
-ACE_INLINE CORBA::NamedValue*
+ACE_INLINE 
+CORBA::NamedValue*
 CORBA::NamedValue::_nil (void)
 {
   return 0;
 }
 
 // *************************************************************
-// Inline operations for class CORBA::NamedValue_var
-// *************************************************************
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 CORBA::is_nil (CORBA::NVList_ptr nvl)
 {
   return (CORBA::Boolean) (nvl == 0);
 }
 
-ACE_INLINE void
+ACE_INLINE 
+void
 CORBA::release (CORBA::NVList_ptr nvl)
 {
   if (nvl)
-    nvl->_decr_refcnt ();
-}
-
-ACE_INLINE
-CORBA::NamedValue_var::NamedValue_var (void)
-  : ptr_ (CORBA::NamedValue::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::NamedValue_var::NamedValue_var (CORBA::NamedValue_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::NamedValue_var::~NamedValue_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::NamedValue_ptr
-CORBA::NamedValue_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::NamedValue_var::NamedValue_var (const CORBA::NamedValue_var &p)
-  : ptr_ (CORBA::NamedValue::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA::NamedValue_var &
-CORBA::NamedValue_var::operator= (CORBA::NamedValue_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::NamedValue_var &
-CORBA::NamedValue_var::operator= (const CORBA::NamedValue_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::NamedValue::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::NamedValue_var::operator const CORBA::NamedValue_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::NamedValue_var::operator CORBA::NamedValue_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NamedValue_ptr
-CORBA::NamedValue_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NamedValue_ptr
-CORBA::NamedValue_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NamedValue_ptr &
-CORBA::NamedValue_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NamedValue_ptr &
-CORBA::NamedValue_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::NamedValue::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NamedValue_ptr
-CORBA::NamedValue_var::_retn (void)
-{
-  // yield ownership
-  CORBA::NamedValue_ptr val = this->ptr_;
-  this->ptr_ = CORBA::NamedValue::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::NamedValue_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::NamedValue_out::NamedValue_out (CORBA::NamedValue_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA::NamedValue::_nil ();
-}
-
-ACE_INLINE
-CORBA::NamedValue_out::NamedValue_out (CORBA::NamedValue_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::NamedValue::_nil ();
-}
-
-ACE_INLINE
-CORBA::NamedValue_out::NamedValue_out (CORBA::NamedValue_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::NamedValue_out &
-CORBA::NamedValue_out::operator= (CORBA::NamedValue_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::NamedValue_out &
-CORBA::NamedValue_out::operator= (const CORBA::NamedValue_var &p)
-{
-  this->ptr_ = CORBA::NamedValue::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::NamedValue_out &
-CORBA::NamedValue_out::operator= (CORBA::NamedValue_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::NamedValue_out::operator CORBA::NamedValue_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NamedValue_ptr &
-CORBA::NamedValue_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NamedValue_ptr
-CORBA::NamedValue_out::operator-> (void)
-{
-  return this->ptr_;
+    {
+      nvl->_decr_refcnt ();
+    }
 }
 
 // ****************************************************************
 
-// = methods for the NVList class
-
-// constructor
 ACE_INLINE
 CORBA::NVList::NVList (void)
   : max_ (0),
@@ -247,7 +95,8 @@ CORBA::NVList::NVList (void)
 {
 }
 
-ACE_INLINE CORBA::ULong
+ACE_INLINE 
+CORBA::ULong
 CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const
 {
   (ACE_const_cast (CORBA::NVList *,
@@ -257,177 +106,21 @@ CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const
   return this->max_;
 }
 
-ACE_INLINE CORBA::NVList*
-CORBA::NVList::_duplicate (CORBA::NVList *x)
+ACE_INLINE 
+CORBA::NVList *
+CORBA::NVList::_duplicate (CORBA::NVList * x)
 {
   if (x != 0)
-    x->_incr_refcnt ();
+    {
+      x->_incr_refcnt ();
+    }
+
   return x;
 }
 
-ACE_INLINE CORBA::NVList*
+ACE_INLINE 
+CORBA::NVList *
 CORBA::NVList::_nil (void)
 {
   return 0;
 }
-
-// *************************************************************
-// Inline operations for class CORBA::NVList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::NVList_var::NVList_var (void)
-  : ptr_ (CORBA::NVList::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::NVList_var::NVList_var (CORBA::NVList_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::NVList_var::~NVList_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::NVList_ptr
-CORBA::NVList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::NVList_var::NVList_var (const CORBA::NVList_var &p)
-  : ptr_ (CORBA::NVList::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA::NVList_var &
-CORBA::NVList_var::operator= (CORBA::NVList_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::NVList_var &
-CORBA::NVList_var::operator= (const CORBA::NVList_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::NVList::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::NVList_var::operator const CORBA::NVList_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::NVList_var::operator CORBA::NVList_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NVList_ptr
-CORBA::NVList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NVList_ptr
-CORBA::NVList_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NVList_ptr &
-CORBA::NVList_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NVList_ptr &
-CORBA::NVList_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::NVList::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NVList_ptr
-CORBA::NVList_var::_retn (void)
-{
-  // yield ownership
-  CORBA::NVList_ptr val = this->ptr_;
-  this->ptr_ = CORBA::NVList::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::NVList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::NVList_out::NVList_out (CORBA::NVList_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA::NVList::_nil ();
-}
-
-ACE_INLINE
-CORBA::NVList_out::NVList_out (CORBA::NVList_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::NVList::_nil ();
-}
-
-ACE_INLINE
-CORBA::NVList_out::NVList_out (CORBA::NVList_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::NVList_out &
-CORBA::NVList_out::operator= (CORBA::NVList_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::NVList_out &
-CORBA::NVList_out::operator= (const CORBA::NVList_var &p)
-{
-  this->ptr_ = CORBA::NVList::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::NVList_out &
-CORBA::NVList_out::operator= (CORBA::NVList_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::NVList_out::operator CORBA::NVList_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NVList_ptr &
-CORBA::NVList_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::NVList_ptr
-CORBA::NVList_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index fc9a8bee1a6..4e77a23767e 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -2099,3 +2099,64 @@ CORBA::ORB::lookup_value_factory (const char *repository_id
       return 0; // %! raise exception !
     }
 }
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Var_T<CORBA::Request>;
+  template class TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>;
+  template class 
+    TAO_Unbounded_Pseudo_Sequence<
+        CORBA::Request, 
+        CORBA::Request_var
+      >;
+  template class 
+    TAO_VarSeq_Var_T<
+        CORBA::ORB::RequestSeq, 
+        TAO_Pseudo_Object_Manager<
+            CORBA::Request, 
+            CORBA::Request_var
+          >
+      >;
+  template class 
+    TAO_Seq_Out_T<
+        CORBA::ORB::RequestSeq, 
+        CORBA::ORB::RequestSeq_var, 
+        TAO_Pseudo_Object_Manager<
+            CORBA::Request,
+            CORBA::Request_var
+          >
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::Request>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>
+# pragma instantiate \
+    TAO_Unbounded_Pseudo_Sequence< \
+        CORBA::Request, \
+        CORBA::Request_var \
+      >
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        CORBA::ORB::RequestSeq, \
+        TAO_Pseudo_Object_Manager< \
+            CORBA::Request, \
+            CORBA::Request_var \
+          > \
+      >
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::ORB::RequestSeq, \
+        CORBA::ORB::RequestSeq_var, \
+        TAO_Pseudo_Object_Manager< \
+            CORBA::Request, \
+            CORBA::Request_var \
+          > \
+      >
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 7f80cd78514..8cd8a781d7a 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -67,12 +67,14 @@ namespace CORBA
   class ValueMemberSeq;
 
   class ORB_ObjectIdList;
-  class ORB_ObjectIdList_var;
-  class ORB_ObjectIdList_out;
 
-  class ORB_RequestSeq;
-  class ORB_RequestSeq_var;
-  class ORB_RequestSeq_out;
+  class ORB;
+  typedef TAO_Pseudo_Var_T<ORB> ORB_var;
+  typedef TAO_Pseudo_Out_T<ORB, ORB_var> ORB_out;
+
+  class Request;
+  typedef TAO_Pseudo_Var_T<Request> Request_var;
+  typedef TAO_Pseudo_Out_T<Request, Request_var> Request_out;
 
   /**
    * @class ORB
@@ -170,11 +172,35 @@ namespace CORBA
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     // Typedefs for CORBA::ORB::RequestSeq, which is an argument of
-    // send_multiple_requests_*().  See Request.{h,i,cpp} for
-    // definitions.
-    typedef CORBA::ORB_RequestSeq RequestSeq;
-    typedef CORBA::ORB_RequestSeq_var RequestSeq_var;
-    typedef CORBA::ORB_RequestSeq_out RequestSeq_out;
+    // send_multiple_requests_*().
+
+    typedef 
+      TAO_Unbounded_Pseudo_Sequence<
+          CORBA::Request, 
+          CORBA::Request_var
+        > 
+      RequestSeq;
+
+    typedef 
+      TAO_VarSeq_Var_T<
+          RequestSeq, 
+          TAO_Pseudo_Object_Manager<
+              CORBA::Request, 
+              CORBA::Request_var
+            >
+        > 
+      RequestSeq_var;
+
+    typedef 
+      TAO_Seq_Out_T<
+          RequestSeq, 
+          RequestSeq_var, 
+          TAO_Pseudo_Object_Manager<
+              CORBA::Request,
+              CORBA::Request_var
+            >
+        >
+      RequestSeq_out;
 
     void create_list (CORBA::Long count,
                       CORBA::NVList_ptr &new_list
@@ -529,11 +555,13 @@ namespace CORBA
 
     /// Resolve the Policy Manager for this ORB.
     CORBA::Object_ptr resolve_policy_manager (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+        ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+      );
 
     /// Resolve the Policy Current for this thread.
     CORBA::Object_ptr resolve_policy_current (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+        ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+      );
 
   private:
 
@@ -589,62 +617,6 @@ namespace CORBA
     ACE_Time_Value *timeout_;
 
   };
-
-  /**
-   * @class ORB_var
-   *
-   * @brief CORBA::ORB_var implementation.
-   *
-   * CORBA::ORB_var implementation.
-   */
-  class TAO_Export ORB_var
-  {
-  public:
-    ORB_var (void); // default constructor
-    ORB_var (CORBA::ORB_ptr);
-    ORB_var (const ORB_var &); // copy constructor
-    ~ORB_var (void); // destructor
-
-    ORB_var &operator= (CORBA::ORB_ptr);
-    ORB_var &operator= (const ORB_var &);
-    CORBA::ORB_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const CORBA::ORB_ptr &() const;
-    operator CORBA::ORB_ptr &();
-    CORBA::ORB_ptr in (void) const;
-    CORBA::ORB_ptr &inout (void);
-    CORBA::ORB_ptr &out (void);
-    CORBA::ORB_ptr _retn (void);
-    CORBA::ORB_ptr ptr (void) const;
-
-  private:
-    CORBA::ORB_ptr ptr_;
-  };
-
-  /**
-   * @class ORB_out
-   *
-   * @brief CORBA::ORB_out implementation.
-   *
-   * CORBA::ORB_out implementation.
-   */
-  class TAO_Export ORB_out
-  {
-  public:
-    ORB_out (CORBA::ORB_ptr &);
-    ORB_out (CORBA::ORB_var &);
-    ORB_out (const ORB_out &);
-    ORB_out &operator= (ORB_out &);
-    ORB_out &operator= (const CORBA::ORB_var &);
-    ORB_out &operator= (CORBA::ORB_ptr);
-    operator CORBA::ORB_ptr &();
-    CORBA::ORB_ptr &ptr (void);
-    CORBA::ORB_ptr operator-> (void);
-
-  private:
-    CORBA::ORB_ptr &ptr_;
-  };
 }  // End namespace CORBA
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index 2a219388c0a..16a9d6be7e6 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -10,7 +10,10 @@
 ACE_INLINE CORBA::ULong
 CORBA::ORB::_incr_refcnt (void)
 {
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, lock_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+                    guard, 
+                    lock_, 
+                    0);
   return ++this->refcount_;
 }
 
@@ -20,8 +23,11 @@ CORBA::ORB::_decr_refcnt (void)
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0);
     this->refcount_--;
+
     if (this->refcount_ != 0)
-      return this->refcount_;
+      {
+        return this->refcount_;
+      }
   }
 
   delete this;
@@ -32,7 +38,10 @@ ACE_INLINE CORBA::ORB_ptr
 CORBA::ORB::_duplicate (CORBA::ORB_ptr obj)
 {
   if (obj)
-    obj->_incr_refcnt ();
+    {
+      obj->_incr_refcnt ();
+    }
+
   return obj;
 }
 
@@ -79,165 +88,3 @@ CORBA::release (CORBA::ORB_ptr obj)
     obj->_decr_refcnt ();
 }
 
-// *************************************************************
-// Inline operations for class CORBA::ORB_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ORB_var::ORB_var (void) // default constructor
-  : ptr_ (CORBA::ORB::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::ORB_var::ORB_var (CORBA::ORB_ptr p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA::ORB_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ORB_var::ORB_var (const CORBA::ORB_var &p) // copy constructor
-  : ptr_ (CORBA::ORB::_duplicate (p.ptr ()))
-{
-}
-
-ACE_INLINE
-CORBA::ORB_var::~ORB_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::ORB_var &
-CORBA::ORB_var::operator= (CORBA::ORB_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ORB_var &
-CORBA::ORB_var::operator= (const CORBA::ORB_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = CORBA::ORB::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ORB_var::operator const CORBA::ORB_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ORB_var::operator CORBA::ORB_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA::ORB_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA::ORB_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA::ORB_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA::ORB_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ORB::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA::ORB_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::ORB_ptr val = this->ptr_;
-  this->ptr_ = CORBA::ORB::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ORB_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ORB_out::ORB_out (CORBA::ORB_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::ORB::_nil ();
-}
-
-ACE_INLINE
-CORBA::ORB_out::ORB_out (CORBA::ORB_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::ORB::_nil ();
-}
-
-ACE_INLINE
-CORBA::ORB_out::ORB_out (const CORBA::ORB_out &p) // copy constructor
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::ORB_out &
-CORBA::ORB_out::operator= (CORBA::ORB_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ORB_out &
-CORBA::ORB_out::operator= (const CORBA::ORB_var &p)
-{
-  this->ptr_ = CORBA::ORB::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::ORB_out &
-CORBA::ORB_out::operator= (CORBA::ORB_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ORB_out::operator CORBA::ORB_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr &
-CORBA::ORB_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA::ORB_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 75d6092ed08..014b0120065 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -108,6 +108,34 @@ if (!this->is_evaluated_) \
       CORBA::Object::tao_object_initialize (this); \
   }
 
+CORBA::Object_ptr
+CORBA::Object::_unchecked_narrow (CORBA::Object_ptr obj
+                                  ACE_ENV_ARG_DECL_NOT_USED)
+{
+  if (CORBA::is_nil (obj))
+    {
+      return CORBA::Object::_nil ();
+    }
+
+  if (obj->is_local_)
+    {
+    return
+      ACE_reinterpret_cast (
+          CORBA::Object_ptr,
+          obj->_tao_QueryInterface (
+                   ACE_reinterpret_cast (
+                       ptr_arith_t,
+                       &CORBA::Object::_tao_class_id
+                     )
+                 )
+        );
+    }
+  else
+    {
+      return CORBA::Object::_duplicate (obj);
+    }
+}
+
 void
 CORBA::Object::_add_ref (void)
 {
@@ -950,9 +978,13 @@ TAO_Object_Proxy_Broker * (*_TAO_collocation_Object_Proxy_Broker_Factory_functio
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Object_Manager<CORBA::Object, CORBA::Object_var>;
+template class TAO_Pseudo_Var_T<CORBA::Object>;
+template class TAO_Pseudo_Out_T<CORBA::Object, CORBA::Object_var>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate TAO_Object_Manager<CORBA::Object, CORBA::Object_var>
+#pragma instantiate TAO_Pseudo_Var_T<CORBA::Object>
+#pragma instantiate TAO_Pseudo_Out_T<CORBA::Object, CORBA::Object_var>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 55fbbc06a5c..5fcfc97f22d 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -21,15 +21,14 @@
 
 #include "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "tao/Policy_ForwardC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Policy_ForwardC.h"
 #include "tao/Object_KeyC.h"
-
+#include "tao/Pseudo_VarOut_T.h"
 #include "ace/Synch.h"
 #include "tao/IOP_IORC.h"
 
@@ -45,6 +44,11 @@ namespace CORBA
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
 
+  class Object;
+
+  typedef TAO_Pseudo_Var_T<Object> Object_var;
+  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
+
   /**
    * @class Object
    *
@@ -375,77 +379,6 @@ namespace CORBA
      */
     ACE_Lock * refcount_lock_;
   };
-
-  /**
-   * @class Object_var
-   *
-   * @brief Object_var
-   *
-   * Object_var.
-   */
-  class TAO_Export Object_var : private TAO_Base_var
-  {
-  public:
-    Object_var (void); // default constructor
-    Object_var (CORBA::Object_ptr);
-    Object_var (const Object_var &); // copy constructor
-    ~Object_var (void); // destructor
-
-    Object_var &operator= (CORBA::Object_ptr);
-    Object_var &operator= (const Object_var &);
-    CORBA::Object_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const CORBA::Object_ptr &() const;
-    operator CORBA::Object_ptr &();
-    CORBA::Object_ptr in (void) const;
-    CORBA::Object_ptr &inout (void);
-    CORBA::Object_ptr &out (void);
-    CORBA::Object_ptr _retn (void);
-    CORBA::Object_ptr ptr (void) const;
-
-    static CORBA::Object_ptr tao_duplicate (CORBA::Object_ptr);
-    static void tao_release (CORBA::Object_ptr);
-    static CORBA::Object_ptr tao_nil (void);
-    static CORBA::Object_ptr tao_narrow (CORBA::Object *
-                                         ACE_ENV_ARG_DECL);
-    static CORBA::Object * tao_upcast (void *);
-
-  private:
-
-    // Unimplemented - Prevent widening assignment.
-    Object_var (const TAO_Base_var &rhs);
-    Object_var &operator= (const TAO_Base_var &rhs);
-
-  private:
-
-    CORBA::Object_ptr ptr_;
-
-  };
-
-  /**
-   * @class Object_out
-   *
-   * @brief Object_out
-   *
-   * Object_out
-   */
-  class TAO_Export Object_out
-  {
-  public:
-    Object_out (CORBA::Object_ptr &);
-    Object_out (Object_var &);
-    Object_out (const Object_out &);
-    Object_out &operator= (const Object_out &);
-    Object_out &operator= (const Object_var &);
-    Object_out &operator= (CORBA::Object_ptr);
-    operator CORBA::Object_ptr &();
-    CORBA::Object_ptr &ptr (void);
-    CORBA::Object_ptr operator-> (void);
-
-  private:
-    CORBA::Object_ptr &ptr_;
-  };
 }   // End CORBA namespace.
 
 /// This function pointer is set only when the Portable server
@@ -459,7 +392,7 @@ TAO_Export CORBA::Boolean
 operator<< (TAO_OutputCDR&, const CORBA::Object*);
 
 TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, CORBA::Object*&);
+operator>> (TAO_InputCDR&, CORBA::Object *&);
 
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index 3a3d03cfcf8..a8e47ac1d37 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 //
 // $Id$
+
 // ****************************************************************
 
 ACE_INLINE
@@ -18,26 +19,32 @@ CORBA::Object::Object (int)
 {
 }
 
-
 ACE_INLINE CORBA::Object_ptr
 CORBA::Object::_duplicate (CORBA::Object_ptr obj)
 {
   if (obj)
-    obj->_add_ref ();
+    {
+      obj->_add_ref ();
+    }
+
   return obj;
 }
 
 // ************************************************************
 // These are in CORBA namespace
 
-ACE_INLINE void
+ACE_INLINE
+void
 CORBA::release (CORBA::Object_ptr obj)
 {
   if (obj)
-    obj->_remove_ref ();
+    {
+      obj->_remove_ref ();
+    }
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE
+CORBA::Boolean
 CORBA::is_nil (CORBA::Object_ptr obj)
 {
   if (obj == 0)
@@ -52,30 +59,15 @@ CORBA::is_nil (CORBA::Object_ptr obj)
 
 // Null pointers represent nil objects.
 
-ACE_INLINE CORBA::Object_ptr
+ACE_INLINE
+CORBA::Object_ptr
 CORBA::Object::_nil (void)
 {
   return 0;
 }
 
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object::_unchecked_narrow (CORBA::Object_ptr obj
-                                  ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::Object::_nil ();
-
-  if (obj->is_local_)
-    return
-      ACE_reinterpret_cast (CORBA::Object_ptr,
-                            obj->_tao_QueryInterface
-                            (ACE_reinterpret_cast (ptr_arith_t,
-                                                   &CORBA::Object::_tao_class_id)));
-  else
-    return CORBA::Object::_duplicate (obj);
-}
-
-ACE_INLINE CORBA::Object_ptr
+ACE_INLINE
+CORBA::Object_ptr
 CORBA::Object::_narrow (CORBA::Object_ptr obj
                         ACE_ENV_ARG_DECL)
 {
@@ -83,13 +75,15 @@ CORBA::Object::_narrow (CORBA::Object_ptr obj
                                            ACE_ENV_ARG_PARAMETER);
 }
 
-ACE_INLINE TAO_Stub *
+ACE_INLINE
+TAO_Stub *
 CORBA::Object::_stubobj (void) const
 {
   return this->protocol_proxy_;
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE
+CORBA::Boolean
 CORBA::Object::marshal (TAO_OutputCDR &cdr)
 {
   return (cdr << this);
@@ -125,203 +119,3 @@ CORBA::Object::ior (void) const
 {
   return this->ior_.in ();
 }
-
-// *************************************************************
-// Inline operations for class CORBA::Object_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Object_var::Object_var (void)
-  : ptr_ (CORBA::Object::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::Object_var::Object_var (CORBA::Object_ptr p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA::Object_var::~Object_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Object_var::Object_var (const CORBA::Object_var &p)
-  : TAO_Base_var (),
-    ptr_ (CORBA::Object::_duplicate (p.ptr ()))
-{
-}
-
-ACE_INLINE CORBA::Object_var &
-CORBA::Object_var::operator= (CORBA::Object_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Object_var &
-CORBA::Object_var::operator= (const CORBA::Object_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::Object::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Object_var::operator const CORBA::Object_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Object_var::operator CORBA::Object_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Object_ptr &
-CORBA::Object_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Object_ptr &
-CORBA::Object_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Object::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::Object_ptr val = this->ptr_;
-  this->ptr_ = CORBA::Object::_nil ();
-  return val;
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object_var::tao_duplicate (CORBA::Object_ptr p)
-{
-  return CORBA::Object::_duplicate (p);
-}
-
-ACE_INLINE void
-CORBA::Object_var::tao_release (CORBA::Object_ptr p)
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object_var::tao_nil (void)
-{
-  return CORBA::Object::_nil ();
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return CORBA::Object::_duplicate (p);
-}
-
-ACE_INLINE CORBA::Object *
-CORBA::Object_var::tao_upcast (void *src)
-{
-  CORBA::Object **tmp =
-    ACE_static_cast (CORBA::Object **, src);
-  return *tmp;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Object_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Object_out::Object_out (CORBA::Object_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::Object::_nil ();
-}
-
-ACE_INLINE
-CORBA::Object_out::Object_out (CORBA::Object_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Object::_nil ();
-}
-
-ACE_INLINE
-CORBA::Object_out::Object_out (const CORBA::Object_out &p)
-  : ptr_ (p.ptr_)
-{
-}
-
-ACE_INLINE CORBA::Object_out &
-CORBA::Object_out::operator= (const CORBA::Object_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Object_out &
-CORBA::Object_out::operator= (const CORBA::Object_var &p)
-{
-  this->ptr_ = CORBA::Object::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::Object_out &
-CORBA::Object_out::operator= (CORBA::Object_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Object_out::operator CORBA::Object_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Object_ptr &
-CORBA::Object_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Object_ptr
-CORBA::Object_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
index cac871e2420..3d16bda541f 100644
--- a/TAO/tao/ObjectIdListC.cpp
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -25,15 +25,6 @@
 
 #include "ObjectIdListC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -55,14 +46,15 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectId[] =
   ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x434f5242), 
   ACE_NTOHL (0x412f4f52), 
-  ACE_NTOHL (0x422f4f62), 
+  ACE_NTOHL (0x425f4f62), 
   ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x49643a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
-    9,
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0
+    13,
+  ACE_NTOHL (0x4f52425f), 
   ACE_NTOHL (0x4f626a65), 
   ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x0),  // name = ObjectId
+  ACE_NTOHL (0x0),  // name = ORB_ObjectId
     CORBA::tk_string, 
   0U, // string length
 };
@@ -84,29 +76,15 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
-#define _CORBA_ORB_OBJECTIDLIST_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249
-
-// *************************************************************
-// CORBA::ORB_ObjectIdList
-// *************************************************************
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void)
 {}
 
 CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_String_Sequence
+    (max)
 {}
 
 CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
@@ -115,35 +93,51 @@ CORBA::ORB_ObjectIdList::ORB_ObjectIdList (
     char * *buffer,
     CORBA::Boolean release
   )
-  : 
+  : TAO_Unbounded_String_Sequence
+    (max, length, buffer, release)
+{}
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const ORB_ObjectIdList &seq)
+  : TAO_Unbounded_String_Sequence
+    (seq)
+{}
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void)
 {}
 
-CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const ORB_ObjectIdList &seq)
-  : 
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void) // dtor
-{}
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::ORB_ObjectIdList,
+      TAO_SeqElem_String_Manager
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::ORB_ObjectIdList,
+      CORBA::ORB_ObjectIdList_var,
+      TAO_SeqElem_String_Manager
+    >;
 
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+# pragma instantiate \
+  TAO_MngSeq_Var_T< \
+      CORBA::ORB_ObjectIdList, \
+      TAO_SeqElem_String_Manager \
+    >
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      CORBA::ORB_ObjectIdList, \
+      CORBA::ORB_ObjectIdList_var, \
+      TAO_SeqElem_String_Manager \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -157,21 +151,22 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
   ACE_NTOHL (0x6f72672f), 
   ACE_NTOHL (0x434f5242), 
   ACE_NTOHL (0x412f4f52), 
-  ACE_NTOHL (0x422f4f62), 
+  ACE_NTOHL (0x425f4f62), 
   ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x49644c69), 
   ACE_NTOHL (0x73743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectIdList:1.0
-    13,
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectIdList:1.0
+    17,
+  ACE_NTOHL (0x4f52425f), 
   ACE_NTOHL (0x4f626a65), 
   ACE_NTOHL (0x63744964), 
   ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x0),  // name = ObjectIdList
+  ACE_NTOHL (0x0),  // name = ORB_ObjectIdList
     CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
+  88, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
+    72, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
       ACE_NTOHL (0x49444c3a), 
@@ -179,14 +174,15 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
       ACE_NTOHL (0x6f72672f), 
       ACE_NTOHL (0x434f5242), 
       ACE_NTOHL (0x412f4f52), 
-      ACE_NTOHL (0x422f4f62), 
+      ACE_NTOHL (0x425f4f62), 
       ACE_NTOHL (0x6a656374), 
       ACE_NTOHL (0x49643a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
-            9,
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0
+            13,
+      ACE_NTOHL (0x4f52425f), 
       ACE_NTOHL (0x4f626a65), 
       ACE_NTOHL (0x63744964), 
-      ACE_NTOHL (0x0),  // name = ObjectId
+      ACE_NTOHL (0x0),  // name = ORB_ObjectId
             CORBA::tk_string, 
       0U, // string length
 
@@ -212,7 +208,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
index 1cee475691d..21cd0085f0a 100644
--- a/TAO/tao/ObjectIdListC.h
+++ b/TAO/tao/ObjectIdListC.h
@@ -26,13 +26,14 @@
 #define _TAO_IDL_ORIG_OBJECTIDLISTC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/Sequence.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Sequence.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -62,136 +63,61 @@
 
 TAO_NAMESPACE  CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
-  
+
   typedef char * ORB_ObjectId;
   typedef CORBA::String_var ORB_ObjectId_var;
   typedef CORBA::String_out ORB_ObjectId_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectId;
 
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
-#define _CORBA_ORB_OBJECTIDLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ORB_ObjectIdList;
-  class ORB_ObjectIdList_var;
-  
-  // *************************************************************
-  // CORBA::ORB_ObjectIdList
-  // *************************************************************
-  
-  class TAO_Export ORB_ObjectIdList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ORB_ObjectIdList,
+        TAO_SeqElem_String_Manager
+      >
+    ORB_ObjectIdList_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ORB_ObjectIdList,
+        ORB_ObjectIdList_var,
+        TAO_SeqElem_String_Manager
+      >
+    ORB_ObjectIdList_out;
+
+  class TAO_Export ORB_ObjectIdList
+    : public
+        TAO_Unbounded_String_Sequence
   {
   public:
     ORB_ObjectIdList (void);
     ORB_ObjectIdList (CORBA::ULong max);
     ORB_ObjectIdList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        char * *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        char * *buffer,
         CORBA::Boolean release = 0
       );
     ORB_ObjectIdList (const ORB_ObjectIdList &);
     ~ORB_ObjectIdList (void);
-    
-    typedef ORB_ObjectIdList_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_)
-#define _CORBA_ORB_OBJECTIDLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::ORB_ObjectIdList_var
-  // *************************************************************
-  
-  class TAO_Export ORB_ObjectIdList_var
-  {
-  public:
-    ORB_ObjectIdList_var (void);
-    ORB_ObjectIdList_var (ORB_ObjectIdList *);
-    ORB_ObjectIdList_var (const ORB_ObjectIdList_var &);
-    ~ORB_ObjectIdList_var (void);
-    
-    ORB_ObjectIdList_var &operator= (ORB_ObjectIdList *);
-    ORB_ObjectIdList_var &operator= (const ORB_ObjectIdList_var &);
-    ORB_ObjectIdList *operator-> (void);
-    const ORB_ObjectIdList *operator-> (void) const;
-    
-    operator const ORB_ObjectIdList &() const;
-    operator ORB_ObjectIdList &();
-    operator ORB_ObjectIdList &() const;
-    
-    // Variable-size base types only.
-    operator ORB_ObjectIdList *&();
-    
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ORB_ObjectIdList &in (void) const;
-    ORB_ObjectIdList &inout (void);
-    ORB_ObjectIdList *&out (void);
-    ORB_ObjectIdList *_retn (void);
-    ORB_ObjectIdList *ptr (void) const;
-  
-  private:
-    ORB_ObjectIdList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
-#define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export ORB_ObjectIdList_out
-  {
-  public:
-    ORB_ObjectIdList_out (ORB_ObjectIdList *&);
-    ORB_ObjectIdList_out (ORB_ObjectIdList_var &);
-    ORB_ObjectIdList_out (const ORB_ObjectIdList_out &);
-    ORB_ObjectIdList_out &operator= (const ORB_ObjectIdList_out &);
-    ORB_ObjectIdList_out &operator= (ORB_ObjectIdList *);
-    operator ORB_ObjectIdList *&();
-    ORB_ObjectIdList *&ptr (void);
-    ORB_ObjectIdList *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-  private:
-    ORB_ObjectIdList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ORB_ObjectIdList_var &);
+    typedef ORB_ObjectIdList_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectIdList;
 
 // TAO_IDL - Generated from
@@ -244,4 +170,3 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/ObjectIdListC.i b/TAO/tao/ObjectIdListC.i
index 79872ac40be..21c96338279 100644
--- a/TAO/tao/ObjectIdListC.i
+++ b/TAO/tao/ObjectIdListC.i
@@ -20,244 +20,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CI_)
-#define _CORBA_ORB_OBJECTIDLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::ORB_ObjectIdList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (ORB_ObjectIdList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (const ::CORBA::ORB_ObjectIdList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ORB_ObjectIdList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var::~ORB_ObjectIdList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var &
-CORBA::ORB_ObjectIdList_var::operator= (ORB_ObjectIdList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList_var &
-CORBA::ORB_ObjectIdList_var::operator= (const ::CORBA::ORB_ObjectIdList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ORB_ObjectIdList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ORB_ObjectIdList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ORB_ObjectIdList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::ORB_ObjectIdList *
-CORBA::ORB_ObjectIdList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList *
-CORBA::ORB_ObjectIdList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var::operator const ::CORBA::ORB_ObjectIdList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::ORB_ObjectIdList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::ORB_ObjectIdList &
-CORBA::ORB_ObjectIdList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList &
-CORBA::ORB_ObjectIdList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList *&
-CORBA::ORB_ObjectIdList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList *
-CORBA::ORB_ObjectIdList_var::_retn (void)
-{
-  ::CORBA::ORB_ObjectIdList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList *
-CORBA::ORB_ObjectIdList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566
-
-// *************************************************************
-// Inline operations for class CORBA::ORB_ObjectIdList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (ORB_ObjectIdList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (ORB_ObjectIdList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (const ::CORBA::ORB_ObjectIdList_out &p)
-  : ptr_ (ACE_const_cast (ORB_ObjectIdList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList_out &
-CORBA::ORB_ObjectIdList_out::operator= (const ::CORBA::ORB_ObjectIdList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ORB_ObjectIdList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList_out &
-CORBA::ORB_ObjectIdList_out::operator= (ORB_ObjectIdList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ORB_ObjectIdList_out::operator ::CORBA::ORB_ObjectIdList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList *&
-CORBA::ORB_ObjectIdList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::ORB_ObjectIdList *
-CORBA::ORB_ObjectIdList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::ORB_ObjectIdList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp
index a1ba3becaa3..b7eb9dac798 100644
--- a/TAO/tao/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjectReferenceTemplateC.cpp
@@ -25,16 +25,8 @@
 
 #include "ObjectReferenceTemplateC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
 #include "tao/ValueFactory.h"
 
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -50,23 +42,23 @@ static const CORBA::Long _oc_PortableInterceptor_ServerId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65724964), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65724964),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerId:1.0
     9,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65724964),
   ACE_NTOHL (0x0),  // name = ServerId
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -94,21 +86,21 @@ static const CORBA::Long _oc_PortableInterceptor_ORBId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x643a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x643a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBId:1.0
     6,
-  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x4f524249),
   ACE_NTOHL (0x64000000),  // name = ORBId
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -136,42 +128,42 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterName[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465724e), 
-  ACE_NTOHL (0x616d653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x7465724e),
+  ACE_NTOHL (0x616d653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterName:1.0
     12,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465724e), 
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x7465724e),
   ACE_NTOHL (0x616d6500),  // name = AdapterName
     CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72696e67), 
-    ACE_NTOHL (0x5365713a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5374),
+    ACE_NTOHL (0x72696e67),
+    ACE_NTOHL (0x5365713a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
         10,
-    ACE_NTOHL (0x53747269), 
-    ACE_NTOHL (0x6e675365), 
+    ACE_NTOHL (0x53747269),
+    ACE_NTOHL (0x6e675365),
     ACE_NTOHL (0x71000000),  // name = StringSeq
         CORBA::tk_sequence, // typecode kind
     16, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       0U,
 
@@ -202,37 +194,37 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744964),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectId:1.0
     9,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744964),
   ACE_NTOHL (0x0),  // name = ObjectId
     CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f63),
+    ACE_NTOHL (0x74657453),
+    ACE_NTOHL (0x65713a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
         9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
+    ACE_NTOHL (0x4f637465),
+    ACE_NTOHL (0x74536571),
     ACE_NTOHL (0x0),  // name = OctetSeq
         CORBA::tk_sequence, // typecode kind
     12, // encapsulation length
@@ -268,27 +260,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636546), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636546),
+  ACE_NTOHL (0x6163746f),
+  ACE_NTOHL (0x72793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
     23,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636546), 
-  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636546),
+  ACE_NTOHL (0x6163746f),
   ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
     2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -314,211 +306,47 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
-
-void
-tao_PortableInterceptor_ObjectReferenceFactory_add_ref (
-    PortableInterceptor::ObjectReferenceFactory *p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-tao_PortableInterceptor_ObjectReferenceFactory_remove_ref (
-    PortableInterceptor::ObjectReferenceFactory *p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
-
-// *************************************************************
-// Operations for class PortableInterceptor::ObjectReferenceFactory_var
-// *************************************************************
-
-PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (void)
-  : ptr_ (0)
-{}
-
-PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (ObjectReferenceFactory* p)
-  : ptr_ (p)
-{}
-
-PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory* p)
-  : ptr_ (ACE_const_cast (ObjectReferenceFactory *, p))
-{}
-
-PortableInterceptor::ObjectReferenceFactory *
-PortableInterceptor::ObjectReferenceFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory_var &p)
-{
-  CORBA::add_ref (p.ptr ());
-  this->ptr_ = p.ptr ();
-}
-
-PortableInterceptor::ObjectReferenceFactory_var::~ObjectReferenceFactory_var (void) // destructor
-{
-  CORBA::remove_ref (this->ptr_);
-}
-
-PortableInterceptor::ObjectReferenceFactory_var &
-PortableInterceptor::ObjectReferenceFactory_var::operator= (ObjectReferenceFactory *p)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceFactory_var &
-PortableInterceptor::ObjectReferenceFactory_var::operator= (const ObjectReferenceFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::remove_ref (this->ptr_);
-    ObjectReferenceFactory *tmp = p.ptr ();
-    CORBA::add_ref (tmp);
-    this->ptr_ = tmp;
-  }
-  
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceFactory_var::operator const PortableInterceptor::ObjectReferenceFactory* () const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory*& () // cast 
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory *
-PortableInterceptor::ObjectReferenceFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory *
-PortableInterceptor::ObjectReferenceFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory *&
-PortableInterceptor::ObjectReferenceFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory *&
-PortableInterceptor::ObjectReferenceFactory_var::out (void)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory *
-PortableInterceptor::ObjectReferenceFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ObjectReferenceFactory* tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:94
 
 void
-PortableInterceptor::ObjectReferenceFactory_var::tao_add_ref (
-    ObjectReferenceFactory *p
+PortableInterceptor::tao_ObjectReferenceFactory_life::tao_add_ref (
+    PortableInterceptor::ObjectReferenceFactory * p
   )
 {
   CORBA::add_ref (p);
 }
 
 void
-PortableInterceptor::ObjectReferenceFactory_var::tao_remove_ref (
-    ObjectReferenceFactory *p
+PortableInterceptor::tao_ObjectReferenceFactory_life::tao_remove_ref (
+    PortableInterceptor::ObjectReferenceFactory * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
-
-// *************************************************************
-// Operations for class PortableInterceptor::ObjectReferenceFactory_out
-// *************************************************************
-
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-}
-
-PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (const ObjectReferenceFactory_out &p)
-  : ptr_ (ACE_const_cast (ObjectReferenceFactory_out&, p).ptr_)
-{}
-
-PortableInterceptor::ObjectReferenceFactory_out &
-PortableInterceptor::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (ObjectReferenceFactory_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceFactory_out &
-PortableInterceptor::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_var &p)
-{
-  ObjectReferenceFactory *tmp = p.ptr ();
-  CORBA::add_ref (tmp);
-  this->ptr_ = tmp;
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceFactory_out &
-PortableInterceptor::ObjectReferenceFactory_out::operator= (ObjectReferenceFactory *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceFactory_out::operator PortableInterceptor::ObjectReferenceFactory*& () // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory *&
-PortableInterceptor::ObjectReferenceFactory_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceFactory *
-PortableInterceptor::ObjectReferenceFactory_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Value_Var_T<
+        PortableInterceptor::ObjectReferenceFactory,
+        PortableInterceptor::tao_ObjectReferenceFactory_life
+      >;
+  template class
+    TAO_Value_Out_T<
+        PortableInterceptor::ObjectReferenceFactory,
+        PortableInterceptor::tao_ObjectReferenceFactory_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Value_Var_T< \
+        PortableInterceptor::ObjectReferenceFactory, \
+        PortableInterceptor::tao_ObjectReferenceFactory_life \
+      >
+# pragma instantiate \
+    TAO_Value_Out_T< \
+        PortableInterceptor::ObjectReferenceFactory, \
+        PortableInterceptor::tao_ObjectReferenceFactory_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 PortableInterceptor::ObjectReferenceFactory *
 PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
@@ -527,7 +355,7 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return (ObjectReferenceFactory *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
@@ -548,9 +376,9 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_i
     {
       return this;
     }
-  
+
   void *rval = 0;
-  
+
   return rval;
 }
 
@@ -587,29 +415,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
@@ -623,27 +451,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x6174653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x6174653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
     24,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
     2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -669,211 +497,47 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
-
-void
-tao_PortableInterceptor_ObjectReferenceTemplate_add_ref (
-    PortableInterceptor::ObjectReferenceTemplate *p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-tao_PortableInterceptor_ObjectReferenceTemplate_remove_ref (
-    PortableInterceptor::ObjectReferenceTemplate *p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
-
-// *************************************************************
-// Operations for class PortableInterceptor::ObjectReferenceTemplate_var
-// *************************************************************
-
-PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void)
-  : ptr_ (0)
-{}
-
-PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (ObjectReferenceTemplate* p)
-  : ptr_ (p)
-{}
-
-PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate* p)
-  : ptr_ (ACE_const_cast (ObjectReferenceTemplate *, p))
-{}
-
-PortableInterceptor::ObjectReferenceTemplate *
-PortableInterceptor::ObjectReferenceTemplate_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p)
-{
-  CORBA::add_ref (p.ptr ());
-  this->ptr_ = p.ptr ();
-}
-
-PortableInterceptor::ObjectReferenceTemplate_var::~ObjectReferenceTemplate_var (void) // destructor
-{
-  CORBA::remove_ref (this->ptr_);
-}
-
-PortableInterceptor::ObjectReferenceTemplate_var &
-PortableInterceptor::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate *p)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_var &
-PortableInterceptor::ObjectReferenceTemplate_var::operator= (const ObjectReferenceTemplate_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::remove_ref (this->ptr_);
-    ObjectReferenceTemplate *tmp = p.ptr ();
-    CORBA::add_ref (tmp);
-    this->ptr_ = tmp;
-  }
-  
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_var::operator const PortableInterceptor::ObjectReferenceTemplate* () const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate*& () // cast 
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate *
-PortableInterceptor::ObjectReferenceTemplate_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate *
-PortableInterceptor::ObjectReferenceTemplate_var::in (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate *&
-PortableInterceptor::ObjectReferenceTemplate_var::inout (void)
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate *&
-PortableInterceptor::ObjectReferenceTemplate_var::out (void)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate *
-PortableInterceptor::ObjectReferenceTemplate_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ObjectReferenceTemplate* tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:94
 
 void
-PortableInterceptor::ObjectReferenceTemplate_var::tao_add_ref (
-    ObjectReferenceTemplate *p
+PortableInterceptor::tao_ObjectReferenceTemplate_life::tao_add_ref (
+    PortableInterceptor::ObjectReferenceTemplate * p
   )
 {
   CORBA::add_ref (p);
 }
 
 void
-PortableInterceptor::ObjectReferenceTemplate_var::tao_remove_ref (
-    ObjectReferenceTemplate *p
+PortableInterceptor::tao_ObjectReferenceTemplate_life::tao_remove_ref (
+    PortableInterceptor::ObjectReferenceTemplate * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
-
-// *************************************************************
-// Operations for class PortableInterceptor::ObjectReferenceTemplate_out
-// *************************************************************
-
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p)
-  : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_)
-{}
-
-PortableInterceptor::ObjectReferenceTemplate_out &
-PortableInterceptor::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_out &p)
-{
-  this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_out &
-PortableInterceptor::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_var &p)
-{
-  ObjectReferenceTemplate *tmp = p.ptr ();
-  CORBA::add_ref (tmp);
-  this->ptr_ = tmp;
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_out &
-PortableInterceptor::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ObjectReferenceTemplate_out::operator PortableInterceptor::ObjectReferenceTemplate*& () // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate *&
-PortableInterceptor::ObjectReferenceTemplate_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ObjectReferenceTemplate *
-PortableInterceptor::ObjectReferenceTemplate_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Value_Var_T<
+        PortableInterceptor::ObjectReferenceTemplate,
+        PortableInterceptor::tao_ObjectReferenceTemplate_life
+      >;
+  template class
+    TAO_Value_Out_T<
+        PortableInterceptor::ObjectReferenceTemplate,
+        PortableInterceptor::tao_ObjectReferenceTemplate_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Value_Var_T< \
+        PortableInterceptor::ObjectReferenceTemplate, \
+        PortableInterceptor::tao_ObjectReferenceTemplate_life \
+      >
+# pragma instantiate \
+    TAO_Value_Out_T< \
+        PortableInterceptor::ObjectReferenceTemplate, \
+        PortableInterceptor::tao_ObjectReferenceTemplate_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 PortableInterceptor::ObjectReferenceTemplate *
 PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
@@ -882,7 +546,7 @@ PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
@@ -903,9 +567,9 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_
     {
       return this;
     }
-  
+
   void *rval = 0;
-  
+
   if (rval == 0)
     {
 #if defined (_MSC_VER)
@@ -914,7 +578,7 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_
       rval = this->PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (type_id);
 #endif /* _MSC_VER */
     }
-  
+
   return rval;
 }
 
@@ -951,29 +615,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
@@ -981,144 +645,44 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
-#define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_allocate_buffer (CORBA::ULong length)
-{
-  PortableInterceptor::ObjectReferenceTemplate **tmp = 0;
-  tmp = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      PortableInterceptor::ObjectReferenceTemplate **old = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              CORBA::add_ref (old[i]);
-              tmp[i] = old[i];
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::remove_ref (tmp[i]);
-      tmp[i] = 0;
-    }
-  
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::remove_ref (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// PortableInterceptor::ObjectReferenceTemplateSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (void)
 {}
 
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Valuetype_Sequence<
+        PortableInterceptor::ObjectReferenceTemplate,
+        PortableInterceptor::ObjectReferenceTemplate_var,
+        PortableInterceptor::tao_ObjectReferenceTemplate_life
+      >
+    (max)
 {}
 
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    PortableInterceptor::ObjectReferenceTemplate_ptr *buffer,
+    PortableInterceptor::ObjectReferenceTemplate ** buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Valuetype_Sequence<
+        PortableInterceptor::ObjectReferenceTemplate,
+        PortableInterceptor::ObjectReferenceTemplate_var,
+        PortableInterceptor::tao_ObjectReferenceTemplate_life
+      >
+    (max, length, buffer, release)
 {}
 
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Valuetype_Sequence<
+        PortableInterceptor::ObjectReferenceTemplate,
+        PortableInterceptor::ObjectReferenceTemplate_var,
+        PortableInterceptor::tao_ObjectReferenceTemplate_life
+      >
+    (seq)
 {}
 
-PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void) // dtor
+PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void)
 {}
 
 void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -1127,7 +691,53 @@ void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (void
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      PortableInterceptor::ObjectReferenceTemplateSeq,
+      TAO_Valuetype_Manager<
+          PortableInterceptor::ObjectReferenceTemplate,
+          PortableInterceptor::ObjectReferenceTemplate_var,
+          PortableInterceptor::tao_ObjectReferenceTemplate_life
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      PortableInterceptor::ObjectReferenceTemplateSeq,
+      PortableInterceptor::ObjectReferenceTemplateSeq_var,
+      TAO_Valuetype_Manager<
+          PortableInterceptor::ObjectReferenceTemplate,
+          PortableInterceptor::ObjectReferenceTemplate_var,
+          PortableInterceptor::tao_ObjectReferenceTemplate_life
+        >
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_MngSeq_Var_T< \
+      PortableInterceptor::ObjectReferenceTemplateSeq, \
+      TAO_Valuetype_Manager< \
+          PortableInterceptor::ObjectReferenceTemplate, \
+          PortableInterceptor::ObjectReferenceTemplate_var, \
+          PortableInterceptor::tao_ObjectReferenceTemplate_life \
+        > \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      PortableInterceptor::ObjectReferenceTemplateSeq, \
+      PortableInterceptor::ObjectReferenceTemplateSeq_var, \
+      TAO_Valuetype_Manager< \
+          PortableInterceptor::ObjectReferenceTemplate, \
+          PortableInterceptor::ObjectReferenceTemplate_var, \
+          PortableInterceptor::tao_ObjectReferenceTemplate_life \
+        > \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -1136,29 +746,29 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x61746553), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x61746553),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
     27,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x61746553), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x61746553),
   ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
     CORBA::tk_sequence, // typecode kind
   124, // encapsulation length
@@ -1167,33 +777,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
     480, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       60,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x506f7274), 
-      ACE_NTOHL (0x61626c65), 
-      ACE_NTOHL (0x496e7465), 
-      ACE_NTOHL (0x72636570), 
-      ACE_NTOHL (0x746f722f), 
-      ACE_NTOHL (0x4f626a65), 
-      ACE_NTOHL (0x63745265), 
-      ACE_NTOHL (0x66657265), 
-      ACE_NTOHL (0x6e636554), 
-      ACE_NTOHL (0x656d706c), 
-      ACE_NTOHL (0x6174653a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x506f7274),
+      ACE_NTOHL (0x61626c65),
+      ACE_NTOHL (0x496e7465),
+      ACE_NTOHL (0x72636570),
+      ACE_NTOHL (0x746f722f),
+      ACE_NTOHL (0x4f626a65),
+      ACE_NTOHL (0x63745265),
+      ACE_NTOHL (0x66657265),
+      ACE_NTOHL (0x6e636554),
+      ACE_NTOHL (0x656d706c),
+      ACE_NTOHL (0x6174653a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
             24,
-      ACE_NTOHL (0x4f626a65), 
-      ACE_NTOHL (0x63745265), 
-      ACE_NTOHL (0x66657265), 
-      ACE_NTOHL (0x6e636554), 
-      ACE_NTOHL (0x656d706c), 
+      ACE_NTOHL (0x4f626a65),
+      ACE_NTOHL (0x63745265),
+      ACE_NTOHL (0x66657265),
+      ACE_NTOHL (0x6e636554),
+      ACE_NTOHL (0x656d706c),
       ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
             2, // value modifier
       CORBA::tk_null, // no stateful base valuetype
 
 3, // member count
-      
+
     0U,
 
 };
@@ -1222,25 +832,25 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465724d), 
-  ACE_NTOHL (0x616e6167), 
-  ACE_NTOHL (0x65724964), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x7465724d),
+  ACE_NTOHL (0x616e6167),
+  ACE_NTOHL (0x65724964),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0
     17,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465724d), 
-  ACE_NTOHL (0x616e6167), 
-  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x7465724d),
+  ACE_NTOHL (0x616e6167),
+  ACE_NTOHL (0x65724964),
   ACE_NTOHL (0x0),  // name = AdapterManagerId
     CORBA::tk_long,
 
@@ -1270,23 +880,23 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657253), 
-  ACE_NTOHL (0x74617465), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x74657253),
+  ACE_NTOHL (0x74617465),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0
     13,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657253), 
-  ACE_NTOHL (0x74617465), 
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x74657253),
+  ACE_NTOHL (0x74617465),
   ACE_NTOHL (0x0),  // name = AdapterState
     CORBA::tk_short,
 
@@ -1426,7 +1036,7 @@ TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
 #  pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1492,7 +1102,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:270
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
@@ -1544,7 +1154,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:270
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
@@ -1596,7 +1206,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1604,20 +1214,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -1627,7 +1237,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1637,27 +1247,26 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
-
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h
index e92cbee833a..dfec72ea8c9 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjectReferenceTemplateC.h
@@ -26,18 +26,20 @@
 #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/OctetSeqC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "OctetSeqC.h"
-#include "StringSeqC.h"
-#include "ValueBase.h"
-#include "Exception.h"
-#include "Any_T.h"
+#include "tao/StringSeqC.h"
+#include "tao/ValueBase.h"
+#include "tao/Exception.h"
+#include "tao/Any_T.h"
+#include "tao/Value_VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -67,137 +69,85 @@
 
 TAO_NAMESPACE  PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
+
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
+
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
-  
-  class ObjectReferenceFactory;
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_
-  
-  typedef ObjectReferenceFactory *ObjectReferenceFactory_ptr;
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
 
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
-  
-  class TAO_Export ObjectReferenceFactory_var
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:307
+
+  class ObjectReferenceFactory;
+  struct tao_ObjectReferenceFactory_life;
+  typedef
+    TAO_Value_Var_T<
+        ObjectReferenceFactory,
+        tao_ObjectReferenceFactory_life
+      >
+    ObjectReferenceFactory_var;
+  typedef
+    TAO_Value_Out_T<
+        ObjectReferenceFactory,
+        tao_ObjectReferenceFactory_life
+      >
+    ObjectReferenceFactory_out;
+
+  struct TAO_Export tao_ObjectReferenceFactory_life
   {
-  public:
-    ObjectReferenceFactory_var (void);
-    ObjectReferenceFactory_var (ObjectReferenceFactory*);
-    ObjectReferenceFactory_var (const ObjectReferenceFactory*); // (TAO extension)
-    ObjectReferenceFactory_var (const ObjectReferenceFactory_var &);
-    ~ObjectReferenceFactory_var (void);
-    
-    ObjectReferenceFactory_var &operator= (ObjectReferenceFactory*);
-    ObjectReferenceFactory_var &operator= (const ObjectReferenceFactory_var &);
-    ObjectReferenceFactory* operator-> (void) const;
-    
-    operator const ObjectReferenceFactory* () const;
-    operator ObjectReferenceFactory*& ();
-    // in, inout, out, _retn 
-    ObjectReferenceFactory* in (void) const;
-    ObjectReferenceFactory*& inout (void);
-    ObjectReferenceFactory*& out (void);
-    ObjectReferenceFactory* _retn (void);
-    ObjectReferenceFactory* ptr (void) const;
-    
-    // Hooks used by template sequence and valuetype manager classes
-    // for non-defined forward declared valuetypes.
     static void tao_add_ref (ObjectReferenceFactory *);
     static void tao_remove_ref (ObjectReferenceFactory *);
-  
-  private:
-    ObjectReferenceFactory* ptr_;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
-  
-  class TAO_Export ObjectReferenceFactory_out
-  {
-  public:
-    ObjectReferenceFactory_out (ObjectReferenceFactory* &);
-    ObjectReferenceFactory_out (ObjectReferenceFactory_var &);
-    ObjectReferenceFactory_out (const ObjectReferenceFactory_out &);
-    ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_out &);
-    ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_var &);
-    ObjectReferenceFactory_out &operator= (ObjectReferenceFactory*);
-    operator ObjectReferenceFactory*& ();
-    ObjectReferenceFactory*& ptr (void);
-    ObjectReferenceFactory* operator-> (void);
-    
-  private:
-    ObjectReferenceFactory* &ptr_;
-  };
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
-  
+
   class TAO_Export ObjectReferenceFactory
     : public virtual CORBA::ValueBase
   {
@@ -213,123 +163,61 @@ TAO_NAMESPACE  PortableInterceptor
       );
     virtual const char* _tao_obv_repository_id (void) const;
     static const char* _tao_obv_static_repository_id (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427
+
     virtual CORBA::Object_ptr make_object (
         const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
-  
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:272
+
   protected:
     ObjectReferenceFactory (void);
     virtual ~ObjectReferenceFactory (void);
-    
+
     virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
     virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-    
+
   private:
     ObjectReferenceFactory (const ObjectReferenceFactory &);
     void operator= (const ObjectReferenceFactory &);
-    
+
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
-  
-  class ObjectReferenceTemplate;
 
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_
-  
-  typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:307
 
-#endif /* end #if !defined */
+  class ObjectReferenceTemplate;
+  struct tao_ObjectReferenceTemplate_life;
+  typedef TAO_Value_Var_T<ObjectReferenceTemplate, tao_ObjectReferenceTemplate_life> ObjectReferenceTemplate_var;
+  typedef TAO_Value_Out_T<ObjectReferenceTemplate, tao_ObjectReferenceTemplate_life> ObjectReferenceTemplate_out;
 
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
-  
-  class TAO_Export ObjectReferenceTemplate_var
+  struct TAO_Export tao_ObjectReferenceTemplate_life
   {
-  public:
-    ObjectReferenceTemplate_var (void);
-    ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
-    ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
-    ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &);
-    ~ObjectReferenceTemplate_var (void);
-    
-    ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
-    ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate* operator-> (void) const;
-    
-    operator const ObjectReferenceTemplate* () const;
-    operator ObjectReferenceTemplate*& ();
-    // in, inout, out, _retn 
-    ObjectReferenceTemplate* in (void) const;
-    ObjectReferenceTemplate*& inout (void);
-    ObjectReferenceTemplate*& out (void);
-    ObjectReferenceTemplate* _retn (void);
-    ObjectReferenceTemplate* ptr (void) const;
-    
-    // Hooks used by template sequence and valuetype manager classes
-    // for non-defined forward declared valuetypes.
     static void tao_add_ref (ObjectReferenceTemplate *);
     static void tao_remove_ref (ObjectReferenceTemplate *);
-  
-  private:
-    ObjectReferenceTemplate* ptr_;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
-  
-  class TAO_Export ObjectReferenceTemplate_out
-  {
-  public:
-    ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
-    ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &);
-    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
-    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
-    operator ObjectReferenceTemplate*& ();
-    ObjectReferenceTemplate*& ptr (void);
-    ObjectReferenceTemplate* operator-> (void);
-    
-  private:
-    ObjectReferenceTemplate* &ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
-  
+
   class TAO_Export ObjectReferenceTemplate
     : public virtual ObjectReferenceFactory
   {
@@ -345,272 +233,159 @@ TAO_NAMESPACE  PortableInterceptor
       );
     virtual const char* _tao_obv_repository_id (void) const;
     static const char* _tao_obv_static_repository_id (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427
+
     virtual char * server_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427
+
     virtual char * orb_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427
+
     virtual ::PortableInterceptor::AdapterName * adapter_name (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
-  
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:272
+
   protected:
     ObjectReferenceTemplate (void);
     virtual ~ObjectReferenceTemplate (void);
-    
+
     virtual void *_tao_obv_narrow (ptr_arith_t);
 #if defined (_MSC_VER)
     virtual void *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t);
 #endif /* _MSC_VER */
-    
+
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-    
+
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
-#define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-  
-  class TAO_Export _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ObjectReferenceTemplate* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-        const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-      );
-    _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= (
-        const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void);
-    
-    // = Accessors.
-    TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems);
-    static void freebuf (ObjectReferenceTemplate **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0);
-    const ObjectReferenceTemplate* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-  };
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
 
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ObjectReferenceTemplateSeq;
-  class ObjectReferenceTemplateSeq_var;
-  
-  // *************************************************************
-  // PortableInterceptor::ObjectReferenceTemplateSeq
-  // *************************************************************
-  
-  class TAO_Export ObjectReferenceTemplateSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        ObjectReferenceTemplateSeq,
+        TAO_Valuetype_Manager<
+            PortableInterceptor::ObjectReferenceTemplate,
+            PortableInterceptor::ObjectReferenceTemplate_var,
+            PortableInterceptor::tao_ObjectReferenceTemplate_life
+          >
+      >
+    ObjectReferenceTemplateSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        ObjectReferenceTemplateSeq,
+        ObjectReferenceTemplateSeq_var,
+        TAO_Valuetype_Manager<
+            PortableInterceptor::ObjectReferenceTemplate,
+            PortableInterceptor::ObjectReferenceTemplate_var,
+            PortableInterceptor::tao_ObjectReferenceTemplate_life
+          >
+      >
+    ObjectReferenceTemplateSeq_out;
+
+  class TAO_Export ObjectReferenceTemplateSeq
+    : public
+        TAO_Unbounded_Valuetype_Sequence<
+            PortableInterceptor::ObjectReferenceTemplate,
+            PortableInterceptor::ObjectReferenceTemplate_var,
+            PortableInterceptor::tao_ObjectReferenceTemplate_life
+          >
   {
   public:
     ObjectReferenceTemplateSeq (void);
     ObjectReferenceTemplateSeq (CORBA::ULong max);
     ObjectReferenceTemplateSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ObjectReferenceTemplate_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ObjectReferenceTemplate ** buffer,
         CORBA::Boolean release = 0
       );
     ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
     ~ObjectReferenceTemplateSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ObjectReferenceTemplateSeq_var _var_type;
-  };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class PortableInterceptor::ObjectReferenceTemplateSeq_var
-  // *************************************************************
-  
-  class TAO_Export ObjectReferenceTemplateSeq_var
-  {
-  public:
-    ObjectReferenceTemplateSeq_var (void);
-    ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *);
-    ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &);
-    ~ObjectReferenceTemplateSeq_var (void);
-    
-    ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *);
-    ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &);
-    ObjectReferenceTemplateSeq *operator-> (void);
-    const ObjectReferenceTemplateSeq *operator-> (void) const;
-    
-    operator const ObjectReferenceTemplateSeq &() const;
-    operator ObjectReferenceTemplateSeq &();
-    operator ObjectReferenceTemplateSeq &() const;
-    
-    // Variable-size base types only.
-    operator ObjectReferenceTemplateSeq *&();
-    
-    TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const ObjectReferenceTemplateSeq &in (void) const;
-    ObjectReferenceTemplateSeq &inout (void);
-    ObjectReferenceTemplateSeq *&out (void);
-    ObjectReferenceTemplateSeq *_retn (void);
-    ObjectReferenceTemplateSeq *ptr (void) const;
-  
-  private:
-    ObjectReferenceTemplateSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export ObjectReferenceTemplateSeq_out
-  {
-  public:
-    ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&);
-    ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &);
-    ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &);
-    ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &);
-    ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *);
-    operator ObjectReferenceTemplateSeq *&();
-    ObjectReferenceTemplateSeq *&ptr (void);
-    ObjectReferenceTemplateSeq *operator-> (void);
-    TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index);
-  
-  private:
-    ObjectReferenceTemplateSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ObjectReferenceTemplateSeq_var &);
+    typedef ObjectReferenceTemplateSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::Long AdapterManagerId;
   typedef CORBA::Long_out AdapterManagerId_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::Short AdapterState;
   typedef CORBA::Short_out AdapterState_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short HOLDING = 0;
-  
+
+  const PortableInterceptor::AdapterState HOLDING = 0;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short ACTIVE = 1;
-  
+
+  const PortableInterceptor::AdapterState ACTIVE = 1;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short DISCARDING = 2;
-  
+
+  const PortableInterceptor::AdapterState DISCARDING = 2;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short INACTIVE = 3;
-  
+
+  const PortableInterceptor::AdapterState INACTIVE = 3;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short NON_EXISTENT = 4;
+
+  const PortableInterceptor::AdapterState NON_EXISTENT = 4;
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
@@ -623,7 +398,7 @@ TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
 TAO_NAMESPACE  OBV_PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:85
 
@@ -657,7 +432,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterce
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:212
 
 TAO_NAMESPACE CORBA
 {
@@ -673,7 +448,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:212
 
 TAO_NAMESPACE CORBA
 {
@@ -711,7 +486,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "ObjectReferenceTemplateC.i"
@@ -727,4 +502,3 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/ObjectReferenceTemplateC.i b/TAO/tao/ObjectReferenceTemplateC.i
index c4d2fa4d9bf..920743c6412 100644
--- a/TAO/tao/ObjectReferenceTemplateC.i
+++ b/TAO/tao/ObjectReferenceTemplateC.i
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
@@ -31,7 +31,7 @@ ACE_INLINE
 PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
 {}
 
-ACE_INLINE const char* 
+ACE_INLINE const char*
 PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0";
@@ -49,7 +49,7 @@ TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value (
   return 1;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
@@ -60,460 +60,14 @@ ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
 {}
 
-ACE_INLINE const char* 
+ACE_INLINE const char*
 PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_)
-#define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplate **
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (CORBA::ULong nelems)
-{
-  PortableInterceptor::ObjectReferenceTemplate **buf = 0;
-  
-  ACE_NEW_RETURN (buf, PortableInterceptor::ObjectReferenceTemplate*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = 0;
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (PortableInterceptor::ObjectReferenceTemplate **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void)
-{
-}
-
-ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    PortableInterceptor::ObjectReferenceTemplate* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq(
-    const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      PortableInterceptor::ObjectReferenceTemplate **tmp1 =
-        _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
-      PortableInterceptor::ObjectReferenceTemplate ** const tmp2 =
-        ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          if (tmp2[i] != 0)
-            {
-              tmp2[i]->_add_ref ();
-            }
-          
-          tmp1[i] = tmp2 [i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator= (
-    const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      PortableInterceptor::ObjectReferenceTemplate **tmp =
-        ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (tmp[i] != 0)
-            {
-              tmp[i]->_remove_ref ();
-            }
-          
-          tmp[i] = 0;
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  PortableInterceptor::ObjectReferenceTemplate **tmp1 =
-    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_);
-  
-  PortableInterceptor::ObjectReferenceTemplate ** const tmp2 =
-    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      if (tmp2[i] != 0)
-        {
-          tmp2[i]->_add_ref ();
-        }
-      
-      tmp1[i] = tmp2 [i];
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var>
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  PortableInterceptor::ObjectReferenceTemplate ** const tmp =
-    ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplate* *
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::get_buffer (CORBA::Boolean orphan)
-{
-  PortableInterceptor::ObjectReferenceTemplate **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(PortableInterceptor::ObjectReferenceTemplate**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const PortableInterceptor::ObjectReferenceTemplate* *
-PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ObjectReferenceTemplateSeq_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::PortableInterceptor::ObjectReferenceTemplateSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::~ObjectReferenceTemplateSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var &
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (ObjectReferenceTemplateSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq_var &
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ObjectReferenceTemplateSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ObjectReferenceTemplateSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ObjectReferenceTemplateSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::PortableInterceptor::ObjectReferenceTemplateSeq *
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq *
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator const ::PortableInterceptor::ObjectReferenceTemplateSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
-PortableInterceptor::ObjectReferenceTemplateSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::PortableInterceptor::ObjectReferenceTemplateSeq &
-PortableInterceptor::ObjectReferenceTemplateSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq &
-PortableInterceptor::ObjectReferenceTemplateSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq *&
-PortableInterceptor::ObjectReferenceTemplateSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq *
-PortableInterceptor::ObjectReferenceTemplateSeq_var::_retn (void)
-{
-  ::PortableInterceptor::ObjectReferenceTemplateSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq *
-PortableInterceptor::ObjectReferenceTemplateSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ObjectReferenceTemplateSeq_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p)
-  : ptr_ (ACE_const_cast (ObjectReferenceTemplateSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq_out &
-PortableInterceptor::ObjectReferenceTemplateSeq_out::operator= (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (ObjectReferenceTemplateSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq_out &
-PortableInterceptor::ObjectReferenceTemplateSeq_out::operator= (ObjectReferenceTemplateSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplateSeq_out::operator ::PortableInterceptor::ObjectReferenceTemplateSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq *&
-PortableInterceptor::ObjectReferenceTemplateSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableInterceptor::ObjectReferenceTemplateSeq *
-PortableInterceptor::ObjectReferenceTemplateSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>
-PortableInterceptor::ObjectReferenceTemplateSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:242
 
 #if defined (__ACE_INLINE__)
 
@@ -533,7 +87,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:242
 
 #if defined (__ACE_INLINE__)
 
@@ -569,4 +123,3 @@ CORBA::Boolean TAO_Export operator>> (
   );
 
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_ */
-
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index e95811bc841..fa3835d197d 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -15,18 +15,31 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+// be/be_codegen.cpp:314
 
 
 #include "Object_KeyC.h"
-#include "tao/Typecode.h"
-#include "tao/CDR.h"
-#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/Invocation.h"
+#include "tao/PortableInterceptor.h"
+
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo_i.h"
+#include "tao/ClientInterceptorAdapter.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,7 +52,163 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_sequence/sequence_cs.cpp:56
+
+TAO::ObjectKey::ObjectKey (void)
+{}
+
+TAO::ObjectKey::ObjectKey (CORBA::ULong max)
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (max)
+{}
+
+TAO::ObjectKey::ObjectKey (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet* buffer,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (max, length, buffer, release)
+{}
+
+TAO::ObjectKey::ObjectKey (const ObjectKey &seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (seq)
+{}
+
+TAO::ObjectKey::~ObjectKey (void)
+{}
+
+void TAO::ObjectKey::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ObjectKey *tmp = ACE_static_cast (ObjectKey*, _tao_void_pointer);
+  delete tmp;
+}
+
+void
+TAO::ObjectKey::encode_sequence_to_string (char * &str,
+                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
+{
+  // We must allocate a buffer which is (gag) 3 times the length
+  // of the sequence, which is the length required in the worst-case
+  // scenario of all non-printable characters.
+  //
+  // There are two strategies here...we could allocate all that space here,
+  // fill it up, then copy-allocate new space of just the right length.
+  // OR, we could just return this space.  The classic time-space tradeoff,
+  // and for now we'll let time win out, which means that we only do the
+  // allocation once.
+  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
+  str = CORBA::string_alloc (len);
+
+  char *cp = str;
+
+  for (u_int i = 0;
+       cp < (cp + len) && i < seq.length();
+       ++i)
+    {
+      // Some platforms define 'byte' as a macro, solve the problem
+      // here.
+#undef byte
+      u_char byte = seq[i];
+      if (isprint (byte) && byte != '\\')
+        {
+          *cp++ = (char) byte;
+          continue;
+        }
+
+      *cp++ = '\\';
+      *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f);
+      *cp++ = ACE::nibble2hex (byte & 0x0f);
+    }
+  // Zero terminate
+  *cp = '\0';
+}
+
+void
+TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+                                           const char *str)
+{
+  if (str == 0)
+    {
+      seq.length (0);
+      return;
+    }
+
+  u_int length = ACE_OS::strlen (str);
+  const char *eos = str + length;
+  const char *cp = str;
+
+  // Set the length of the sequence to be as long as
+  // we'll possibly need...we'll reset it to the actual
+  // length later.
+  seq.length (length);
+
+  u_int i = 0;
+  for (;
+       cp < eos && i < seq.length ();
+       i++)
+    {
+      if (*cp == '\\')
+        {
+          // This is an escaped non-printable,
+          // so we decode the hex values into
+          // the sequence's octet
+          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
+          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
+          cp += 3;
+        }
+      else
+        // Copy it in
+        seq[i] = *cp++;
+    }
+
+  // Set the length appropriately
+  seq.length (i);
+}
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_FixedSeq_Var_T<
+      ObjectKey,
+      CORBA::Octet
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ObjectKey,
+      ObjectKey_var,
+      CORBA::Octet
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_FixedSeq_Var_T< \
+      ObjectKey, \
+      CORBA::Octet \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ObjectKey, \
+      ObjectKey_var, \
+      CORBA::Octet \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_TAO_ObjectKey[] =
 {
@@ -82,7 +251,72 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const TAO::ObjectKey &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO::ObjectKey>::insert_copy (
+      _tao_any,
+      TAO::ObjectKey::_tao_any_destructor,
+      TAO::_tc_ObjectKey,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO::ObjectKey *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<TAO::ObjectKey>::insert (
+      _tao_any,
+      TAO::ObjectKey::_tao_any_destructor,
+      TAO::_tc_ObjectKey,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO::ObjectKey *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const TAO::ObjectKey *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const TAO::ObjectKey *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<TAO::ObjectKey>::extract (
+        _tao_any,
+        TAO::ObjectKey::_tao_any_destructor,
+        TAO::_tc_ObjectKey,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<TAO::ObjectKey>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<TAO::ObjectKey>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/cdr_op_cs.cpp:98
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -168,89 +402,3 @@ CORBA::Boolean operator>> (
 
   return 0;
 }
-
-// ****************************************************************
-
-void
-TAO::ObjectKey::encode_sequence_to_string (char * &str,
-                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
-{
-  // We must allocate a buffer which is (gag) 3 times the length
-  // of the sequence, which is the length required in the worst-case
-  // scenario of all non-printable characters.
-  //
-  // There are two strategies here...we could allocate all that space here,
-  // fill it up, then copy-allocate new space of just the right length.
-  // OR, we could just return this space.  The classic time-space tradeoff,
-  // and for now we'll let time win out, which means that we only do the
-  // allocation once.
-  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
-  str = CORBA::string_alloc (len);
-
-  char *cp = str;
-
-  for (u_int i = 0;
-       cp < (cp + len) && i < seq.length();
-       ++i)
-    {
-      // Some platforms define 'byte' as a macro, solve the problem
-      // here.
-#undef byte
-      u_char byte = seq[i];
-      if (isprint (byte) && byte != '\\')
-        {
-          *cp++ = (char) byte;
-          continue;
-        }
-
-      *cp++ = '\\';
-      *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f);
-      *cp++ = ACE::nibble2hex (byte & 0x0f);
-    }
-  // Zero terminate
-  *cp = '\0';
-}
-
-void
-TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                           const char *str)
-{
-  if (str == 0)
-    {
-      seq.length (0);
-      return;
-    }
-
-  u_int length = ACE_OS::strlen (str);
-  const char *eos = str + length;
-  const char *cp = str;
-
-  // Set the length of the sequence to be as long as
-  // we'll possibly need...we'll reset it to the actual
-  // length later.
-  seq.length (length);
-
-  u_int i = 0;
-  for (;
-       cp < eos && i < seq.length ();
-       i++)
-    {
-      if (*cp == '\\')
-        {
-          // This is an escaped non-printable,
-          // so we decode the hex values into
-          // the sequence's octet
-          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
-          cp += 3;
-        }
-      else
-        // Copy it in
-        seq[i] = *cp++;
-    }
-
-  // Set the length appropriately
-  seq.length (i);
-}
-
-// ****************************************************************
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 3344f315aaf..f5fc94ae33d 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -1,5 +1,4 @@
-// -*- c++ -*-
-// $Id$
+// -*- C++ -*-
 //
 // $Id$
 
@@ -16,12 +15,18 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+// be/be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_OBJECT_KEYC_H_
 #define _TAO_IDL_ORIG_OBJECT_KEYC_H_
@@ -34,7 +39,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Sequence.h"
+#include "tao/TAO_Export.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/Sequence_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -59,33 +67,37 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-namespace TAO
-{
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:48
 
-#if !defined (_TAO_OBJECTKEY_CH_)
-#define _TAO_OBJECTKEY_CH_
+TAO_NAMESPACE  TAO
+{
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  // be/be_visitor_sequence/sequence_ch.cpp:75
 
   class ObjectKey;
-  class ObjectKey_var;
-
-  // *************************************************************
-  // TAO::ObjectKey
-  // *************************************************************
-
-  class TAO_Export ObjectKey : public
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+  typedef
+    TAO_FixedSeq_Var_T<
+        ObjectKey,
+        CORBA::Octet
+      >
+    ObjectKey_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        ObjectKey,
+        ObjectKey_var,
+        CORBA::Octet
+      >
+    ObjectKey_out;
+
+  class TAO_Export ObjectKey
+    : public
+        TAO_Unbounded_Sequence<
+            CORBA::Octet
+          >
   {
   public:
     ObjectKey (void);
@@ -93,107 +105,61 @@ namespace TAO
     ObjectKey (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Octet *buffer,
+        CORBA::Octet* buffer,
         CORBA::Boolean release = 0
       );
     ObjectKey (const ObjectKey &);
-    ObjectKey& operator= (const ObjectKey &);
-
-    static void encode_sequence_to_string (char * &str,
-                                           const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
-    static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                           const char *str);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_OBJECTKEY___VAR_CH_)
-#define _TAO_OBJECTKEY___VAR_CH_
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-
-  // *************************************************************
-  // class TAO::ObjectKey_var
-  // *************************************************************
-
-  class TAO_Export ObjectKey_var
-  {
-  public:
-    ObjectKey_var (void);
-    ObjectKey_var (ObjectKey *);
-    ObjectKey_var (const ObjectKey_var &);
-
-    // Fixed-size base types only.
-    ObjectKey_var (const ObjectKey &);
-
-    ~ObjectKey_var (void);
-
-    ObjectKey_var &operator= (ObjectKey *);
-    ObjectKey_var &operator= (const ObjectKey_var &);
+    ~ObjectKey (void);
 
-    // Fixed-size base types only.
-    ObjectKey_var &operator= (const ObjectKey &);
+    static void _tao_any_destructor (void *);
 
-    ObjectKey *operator-> (void);
-    const ObjectKey *operator-> (void) const;
+    typedef ObjectKey_var _var_type;
 
-    operator const ObjectKey &() const;
-    operator ObjectKey &();
-    operator ObjectKey &() const;
-    CORBA::Octet & operator[] (CORBA::ULong index);
-    const CORBA::Octet & operator[] (CORBA::ULong index) const;
-
-    // in, inout, out, _retn
-    const ObjectKey &in (void) const;
-    ObjectKey &inout (void);
-    ObjectKey *&out (void);
-    ObjectKey *_retn (void);
-    ObjectKey *ptr (void) const;
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+    ObjectKey (
+        CORBA::ULong length,
+        const ACE_Message_Block* mb
+      )
+      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
+#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
+
+    static void encode_sequence_to_string (
+        char * &str,
+        const TAO_Unbounded_Sequence<CORBA::Octet> &seq
+      );
+    static void decode_string_to_sequence (
+        TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+        const char *str
+      );
 
-  private:
-    ObjectKey *ptr_;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_TAO_OBJECTKEY___OUT_CH_)
-#define _TAO_OBJECTKEY___OUT_CH_
-
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+  // be/be_visitor_typecode/typecode_decl.cpp:44
 
-  class TAO_Export ObjectKey_out
-  {
-  public:
-    ObjectKey_out (ObjectKey *&);
-    ObjectKey_out (ObjectKey_var &);
-    ObjectKey_out (const ObjectKey_out &);
-    ObjectKey_out &operator= (const ObjectKey_out &);
-    ObjectKey_out &operator= (ObjectKey *);
-    operator ObjectKey *&();
-    ObjectKey *&ptr (void);
-    ObjectKey *operator-> (void);
-    CORBA::Octet & operator[] (CORBA::ULong index);
-
-  private:
-    ObjectKey *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ObjectKey_var &);
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectKey;
 
-#endif /* end #if !defined */
+// TAO_IDL - Generated from
+// be/be_visitor_module/module_ch.cpp:67
 
 }
 TAO_NAMESPACE_CLOSE // module TAO
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const TAO::ObjectKey &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, TAO::ObjectKey*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ObjectKey *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::ObjectKey *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+// be/be_visitor_sequence/cdr_op_ch.cpp:57
 
 #if !defined _TAO_CDR_OP_TAO_ObjectKey_H_
 #define _TAO_CDR_OP_TAO_ObjectKey_H_
@@ -210,12 +176,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// be/be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// be/be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "Object_KeyC.i"
diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i
index 31710a4403b..38d6c1a11b3 100644
--- a/TAO/tao/Object_KeyC.i
+++ b/TAO/tao/Object_KeyC.i
@@ -15,309 +15,32 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// *************************************************************
-// Inline operations for class TAO::ObjectKey
-// *************************************************************
-
-ACE_INLINE
-TAO::ObjectKey::ObjectKey (void)
-{
-}
-
-ACE_INLINE
-TAO::ObjectKey::ObjectKey (CORBA::ULong max)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{
-}
-
-ACE_INLINE
-TAO::ObjectKey::ObjectKey (CORBA::ULong max,
-                           CORBA::ULong length,
-                           CORBA::Octet *data,
-                           CORBA::Boolean release)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (max, length, data, release)
-{
-}
-
-ACE_INLINE
-TAO::ObjectKey::ObjectKey (const TAO::ObjectKey &rhs)
-  :  TAO_Unbounded_Sequence<CORBA::Octet> (rhs)
-{
-}
-
-ACE_INLINE TAO::ObjectKey &
-TAO::ObjectKey::operator= (const TAO::ObjectKey &rhs)
-{
-  if (this == &rhs)
-    {
-        return *this;
-    }
-
-  TAO_Unbounded_Sequence<CORBA::Octet>::operator= (rhs);
-  return *this;
-}
-
-#if !defined (_TAO_OBJECTKEY_CI_)
-#define _TAO_OBJECTKEY_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class TAO::ObjectKey_var
-// *************************************************************
-
-ACE_INLINE
-TAO::ObjectKey_var::ObjectKey_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TAO::ObjectKey_var::ObjectKey_var (ObjectKey *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TAO::ObjectKey_var::ObjectKey_var (const ::TAO::ObjectKey_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::TAO::ObjectKey (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size base types only.
-ACE_INLINE
-TAO::ObjectKey_var::ObjectKey_var (const ::TAO::ObjectKey &p)
-{
-  ACE_NEW (this->ptr_, ::TAO::ObjectKey (p));
-}
-
-ACE_INLINE
-TAO::ObjectKey_var::~ObjectKey_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-TAO::ObjectKey_var &
-TAO::ObjectKey_var::operator= (ObjectKey *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::TAO::ObjectKey_var &
-TAO::ObjectKey_var::operator= (const ::TAO::ObjectKey_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ObjectKey *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ObjectKey (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ObjectKey *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// Fixed-size types only.
-ACE_INLINE
-::TAO::ObjectKey_var &
-TAO::ObjectKey_var::operator= (const ::TAO::ObjectKey &p)
-{
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::TAO::ObjectKey (p), *this);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::TAO::ObjectKey *
-TAO::ObjectKey_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::TAO::ObjectKey *
-TAO::ObjectKey_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO::ObjectKey_var::operator const ::TAO::ObjectKey &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO::ObjectKey_var::operator ::TAO::ObjectKey &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO::ObjectKey_var::operator ::TAO::ObjectKey &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Octet &
-TAO::ObjectKey_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::Octet &
-TAO::ObjectKey_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::TAO::ObjectKey &
-TAO::ObjectKey_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::TAO::ObjectKey &
-TAO::ObjectKey_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::TAO::ObjectKey *&
-TAO::ObjectKey_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::TAO::ObjectKey *
-TAO::ObjectKey_var::_retn (void)
-{
-  ::TAO::ObjectKey *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::TAO::ObjectKey *
-TAO::ObjectKey_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class TAO::ObjectKey_out
-// *************************************************************
-
-ACE_INLINE
-TAO::ObjectKey_out::ObjectKey_out (ObjectKey *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO::ObjectKey_out::ObjectKey_out (ObjectKey_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-TAO::ObjectKey_out::ObjectKey_out (const ::TAO::ObjectKey_out &p)
-  : ptr_ (ACE_const_cast (ObjectKey_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::TAO::ObjectKey_out &
-TAO::ObjectKey_out::operator= (const ::TAO::ObjectKey_out &p)
-{
-  this->ptr_ = ACE_const_cast (ObjectKey_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::TAO::ObjectKey_out &
-TAO::ObjectKey_out::operator= (ObjectKey *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-TAO::ObjectKey_out::operator ::TAO::ObjectKey *&() // cast
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/cdr_op_ci.cpp:84
 
-ACE_INLINE
-::TAO::ObjectKey *&
-TAO::ObjectKey_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
+#if !defined _TAO_CDR_OP_TAO_ObjectKey_I_
+#define _TAO_CDR_OP_TAO_ObjectKey_I_
 
-ACE_INLINE
-::TAO::ObjectKey *
-TAO::ObjectKey_out::operator-> (void)
-{
-  return this->ptr_;
-}
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    const TAO::ObjectKey &
+  );
 
-ACE_INLINE
-CORBA::Octet &
-TAO::ObjectKey_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    TAO::ObjectKey &
+  );
 
-#endif /* end #if !defined */
+#endif /* _TAO_CDR_OP_TAO_ObjectKey_I_ */
 
diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp
new file mode 100644
index 00000000000..cd9c7464503
--- /dev/null
+++ b/TAO/tao/Objref_VarOut_T.cpp
@@ -0,0 +1,209 @@
+// $Id$
+#ifndef TAO_OBJREF_VAROUT_T_C
+#define TAO_OBJREF_VAROUT_T_C
+
+#include "tao/Objref_VarOut_T.h"
+#include "tao/Environment.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Objref_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+
+
+ACE_RCSID (tao,
+           Objref_VarOut_T,
+           "$Id$")
+
+template <typename T, typename T_life>
+TAO_Objref_Var_T<T, T_life>::TAO_Objref_Var_T (void)
+  : ptr_ (T_life::tao_nil ())
+{
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Var_T<T, T_life>::TAO_Objref_Var_T (const TAO_Objref_Var_T<T, T_life> & p)
+  : TAO_Base_var (),
+    ptr_ (T_life::tao_duplicate (p.ptr ()))
+{
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Var_T<T, T_life>::~TAO_Objref_Var_T (void)
+{
+  T_life::tao_release (this->ptr_);
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Var_T<T, T_life> &
+TAO_Objref_Var_T<T, T_life>::operator= (T * p)
+{
+  T_life::tao_release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Var_T<T, T_life> &
+TAO_Objref_Var_T<T, T_life>::operator= (
+    const TAO_Objref_Var_T<T, T_life> & p
+  )
+{
+  if (this != &p)
+    {
+      T_life::tao_release (this->ptr_);
+      this->ptr_ = T_life::tao_duplicate (p.ptr ());
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Objref_Var_T<T, T_life>::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Var_T<T, T_life>::operator const T *& () const
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Var_T<T, T_life>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Objref_Var_T<T, T_life>::in (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *&
+TAO_Objref_Var_T<T, T_life>::inout (void)
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *&
+TAO_Objref_Var_T<T, T_life>::out (void)
+{
+  T_life::tao_release (this->ptr_);
+  this->ptr_ = T_life::tao_nil ();
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Objref_Var_T<T, T_life>::_retn (void)
+{
+  T * val = this->ptr_;
+  this->ptr_ = T_life::tao_nil ();
+  return val;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Objref_Var_T<T, T_life>::ptr (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+void
+TAO_Objref_Var_T<T, T_life>::free (void)
+{
+  T_life::tao_release (this->ptr_);
+}
+
+template <typename T, typename T_life>
+void
+TAO_Objref_Var_T<T, T_life>::reset (T * p)
+{
+  T_life::tao_release (this->ptr_);
+  this->ptr_ = p;
+}
+
+// ******************************************************
+
+template <typename T, typename T_life>
+TAO_Objref_Out_T<T, T_life>::TAO_Objref_Out_T (T *& p)
+  : ptr_ (p)
+{
+  this->ptr_ = T_life::tao_nil ();
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Out_T<T, T_life>::TAO_Objref_Out_T (
+    TAO_Objref_Var_T<T, T_life> & p
+  )
+  : ptr_ (p.out ())
+{
+  T_life::tao_release (this->ptr_);
+  this->ptr_ = T_life::tao_nil ();
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Out_T<T, T_life>::TAO_Objref_Out_T (
+    const TAO_Objref_Out_T<T, T_life> & p
+  )
+  : ptr_ (ACE_const_cast (THIS_OUT_TYPE &, p).ptr_)
+{
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Out_T<T, T_life> &
+TAO_Objref_Out_T<T, T_life>::operator= (
+    const TAO_Objref_Out_T<T, T_life> & p
+  )
+{
+  this->ptr_ = ACE_const_cast (THIS_OUT_TYPE &, p).ptr_;
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Out_T<T, T_life> &
+TAO_Objref_Out_T<T, T_life>::operator= (
+    const TAO_Objref_Var_T<T, T_life> & p
+  )
+{
+  this->ptr_ = T_life::tao_duplicate (p.ptr ());
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Out_T<T, T_life> &
+TAO_Objref_Out_T<T, T_life>::operator= (T * p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Objref_Out_T<T, T_life>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *&
+TAO_Objref_Out_T<T, T_life>::ptr (void)
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Objref_Out_T<T, T_life>::operator-> (void)
+{
+  return this->ptr_;
+}
+
+#endif /* TAO_OBJREF_VAROUT_T_C */
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
new file mode 100644
index 00000000000..c75bed92b90
--- /dev/null
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -0,0 +1,115 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Objref_VarOut_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_OBJREF_VAROUT_T_H
+#define TAO_OBJREF_VAROUT_T_H
+
+#include "ace/pre.h"
+
+#include "tao/varbase.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/CORBA_macros.h"
+
+/**
+ * @class TAO_Objref_Var_T
+ *
+ * @brief Parametrized implementation of _var class for object references.
+ *
+ */
+
+template <typename T, typename T_life>
+class TAO_Objref_Var_T : private TAO_Base_var
+{
+public:
+  TAO_Objref_Var_T (void);
+  TAO_Objref_Var_T (T * p) : ptr_ (p) {}
+  TAO_Objref_Var_T (const TAO_Objref_Var_T<T, T_life> &);
+  ~TAO_Objref_Var_T (void);
+
+  TAO_Objref_Var_T<T, T_life> & operator= (T *);
+  TAO_Objref_Var_T<T, T_life> & operator= (
+      const TAO_Objref_Var_T<T, T_life> &
+    );
+  T * operator-> (void) const;
+
+  // Cast operators.
+  operator const T *& () const;
+  operator T *& ();
+
+  T * in (void) const;
+  T *& inout (void);
+  T *& out (void);
+  T * _retn (void);
+
+  // TAO extension.
+  T * ptr (void) const;
+
+protected:
+  T * ptr_;
+  void free (void);
+  void reset (T *);
+
+private:
+  // Unimplemented - prevents widening assignment.
+  TAO_Objref_Var_T (const TAO_Base_var &);
+  void operator= (const TAO_Base_var &);
+};
+
+/**
+ * @class TAO_Objref_Out_T
+ *
+ * @brief Parametrized implementation of _out class for object references.
+ *
+ */
+template <typename T, typename T_life>
+class TAO_Objref_Out_T
+{
+public:
+  TAO_Objref_Out_T (T *&);
+  TAO_Objref_Out_T (TAO_Objref_Var_T<T, T_life> &);
+  TAO_Objref_Out_T (const TAO_Objref_Out_T<T, T_life> &);
+
+  TAO_Objref_Out_T &operator= (const TAO_Objref_Out_T<T, T_life> &);
+  TAO_Objref_Out_T &operator= (const TAO_Objref_Var_T<T, T_life> &);
+  TAO_Objref_Out_T &operator= (T *);
+
+  // Cast operator.
+  operator T *& ();
+
+  T *& ptr (void);
+  T * operator-> (void);
+
+private:
+  typedef TAO_Objref_Out_T<T, T_life> THIS_OUT_TYPE;
+  T *& ptr_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "tao/Objref_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Objref_VarOut_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Objref_VarOut_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_OBJREF_VAROUT_T_H */
diff --git a/TAO/tao/Objref_VarOut_T.inl b/TAO/tao/Objref_VarOut_T.inl
new file mode 100644
index 00000000000..74e88caa0c5
--- /dev/null
+++ b/TAO/tao/Objref_VarOut_T.inl
@@ -0,0 +1,2 @@
+// $Id$
+
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index a2601584cae..751b981ca78 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -24,6 +24,8 @@
 
 
 #include "OctetSeqC.h"
+#include "Any_T.h"
+#include "ORB_Core.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -33,64 +35,38 @@
 #include "OctetSeqC.i"
 #endif /* !defined INLINE */
 
-#include "Any_T.h"
-#include "ORB_Core.h"
-
-#if !defined (_CORBA_OCTETSEQ_CS_)
-#define _CORBA_OCTETSEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::OctetSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::OctetSeq::OctetSeq (void)
 {}
 
 CORBA::OctetSeq::OctetSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (max)
 {}
 
 CORBA::OctetSeq::OctetSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::Octet *buffer,
+    CORBA::Octet* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::OctetSeq::OctetSeq (const OctetSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::Octet
+      >
+    (seq)
 {}
 
-CORBA::OctetSeq::~OctetSeq (void) // dtor
+CORBA::OctetSeq::~OctetSeq (void)
 {}
 
 void CORBA::OctetSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -99,7 +75,37 @@ void CORBA::OctetSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_FixedSeq_Var_T<
+      OctetSeq,
+      CORBA::Octet
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      OctetSeq,
+      OctetSeq_var,
+      CORBA::Octet
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_FixedSeq_Var_T< \
+      OctetSeq, \
+      CORBA::Octet \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      OctetSeq, \
+      OctetSeq_var, \
+      CORBA::Octet \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -108,17 +114,17 @@ static const CORBA::Long _oc_CORBA_OctetSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f63), 
-  ACE_NTOHL (0x74657453), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4f63),
+  ACE_NTOHL (0x74657453),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
     9,
-  ACE_NTOHL (0x4f637465), 
-  ACE_NTOHL (0x74536571), 
+  ACE_NTOHL (0x4f637465),
+  ACE_NTOHL (0x74536571),
   ACE_NTOHL (0x0),  // name = OctetSeq
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -146,7 +152,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -212,7 +218,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -220,27 +226,27 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
           ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence);
         if (oseq->mb ())
           return strm.write_octet_array_mb (oseq->mb ());
         else
           return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
       }
-      
+
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  
+
   return 0;
 }
 
@@ -250,7 +256,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -260,18 +266,18 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       if (ACE_BIT_DISABLED (strm.start ()->flags (),
       ACE_Message_Block::DONT_DELETE))
@@ -281,7 +287,7 @@ CORBA::Boolean operator>> (
         strm.orb_core ()->resource_factory ()->
         input_cdr_allocator_type_locked () == 1)
         {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
             ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
           oseq->replace (_tao_seq_len, strm.start ());
           oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -292,10 +298,9 @@ CORBA::Boolean operator>> (
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  
+
   return 0;
 }
-
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index b03afe024c8..33684812ef2 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -26,13 +26,15 @@
 #define _TAO_IDL_ORIG_OCTETSEQC_H_
 
 #include "ace/pre.h"
-#include "corbafwd.h"
+#include "Sequence.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Sequence.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -57,43 +59,53 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-namespace CORBA
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
 {
-#if !defined (_CORBA_OCTETSEQ_CH_)
-#define _CORBA_OCTETSEQ_CH_
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
   class OctetSeq;
-  class OctetSeq_var;
-  
-  // *************************************************************
-  // CORBA::OctetSeq
-  // *************************************************************
-  
-  class TAO_Export OctetSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_FixedSeq_Var_T<
+        OctetSeq,
+        CORBA::Octet
+      >
+    OctetSeq_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        OctetSeq,
+        OctetSeq_var,
+        CORBA::Octet
+      >
+    OctetSeq_out;
+
+  class TAO_Export OctetSeq
+    : public
+        TAO_Unbounded_Sequence<
+            CORBA::Octet
+          >
   {
   public:
-    OctetSeq (void); // default ctor
-    OctetSeq (CORBA::ULong max); // uses max size
+    OctetSeq (void);
+    OctetSeq (CORBA::ULong max);
     OctetSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::Octet *buffer, 
-      CORBA::Boolean release = 0
-    );
-    OctetSeq (const OctetSeq &); // copy ctor
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::Octet* buffer,
+        CORBA::Boolean release = 0
+      );
+    OctetSeq (const OctetSeq &);
     ~OctetSeq (void);
-    static void _tao_any_destructor (void*);
 
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef OctetSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+    static void _tao_any_destructor (void *);
 
+    typedef OctetSeq_var _var_type;
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     OctetSeq (
@@ -104,80 +116,9 @@ namespace CORBA
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OCTETSEQ___VAR_CH_)
-#define _CORBA_OCTETSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::OctetSeq_var
-  // *************************************************************
-
-  class TAO_Export OctetSeq_var
-  {
-  public:
-    OctetSeq_var (void); // default constructor
-    OctetSeq_var (OctetSeq *);
-    OctetSeq_var (const OctetSeq_var &); // copy constructor
-    OctetSeq_var (const OctetSeq &); // fixed-size base types only
-    ~OctetSeq_var (void); // destructor
-    
-    OctetSeq_var &operator= (OctetSeq *);
-    OctetSeq_var &operator= (const OctetSeq_var &);
-    OctetSeq_var &operator= (const OctetSeq &); // fixed-size base types only
-    OctetSeq *operator-> (void);
-    const OctetSeq *operator-> (void) const;
-    
-    operator const OctetSeq &() const;
-    operator OctetSeq &();
-    operator OctetSeq &() const;
-    
-    CORBA::Octet & operator[] (CORBA::ULong index);
-    const CORBA::Octet & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const OctetSeq &in (void) const;
-    OctetSeq &inout (void);
-    OctetSeq *&out (void);
-    OctetSeq *_retn (void);
-    OctetSeq *ptr (void) const;
-
-  private:
-    OctetSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OCTETSEQ___OUT_CH_)
-#define _CORBA_OCTETSEQ___OUT_CH_
-
-  class TAO_Export OctetSeq_out
-  {
-  public:
-    OctetSeq_out (OctetSeq *&);
-    OctetSeq_out (OctetSeq_var &);
-    OctetSeq_out (const OctetSeq_out &);
-    OctetSeq_out &operator= (const OctetSeq_out &);
-    OctetSeq_out &operator= (OctetSeq *);
-    operator OctetSeq *&();
-    OctetSeq *&ptr (void);
-    OctetSeq *operator-> (void);
-    CORBA::Octet & operator[] (CORBA::ULong index);
-  
-  private:
-    OctetSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const OctetSeq_var &);
-  };
-
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq;
 
 // TAO_IDL - Generated from
@@ -186,13 +127,17 @@ namespace CORBA
 }
 TAO_NAMESPACE_CLOSE // module CORBA
 
-// Proxy Broker Factory function pointer declarations.
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
@@ -218,7 +163,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "OctetSeqC.i"
@@ -234,4 +179,3 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i
index 9fcc77e584e..d0f089c4a6e 100644
--- a/TAO/tao/OctetSeqC.i
+++ b/TAO/tao/OctetSeqC.i
@@ -20,265 +20,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_CORBA_OCTETSEQ_CI_)
-#define _CORBA_OCTETSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::OctetSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::OctetSeq_var::OctetSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::OctetSeq_var::OctetSeq_var (OctetSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::OctetSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size base types only.
-ACE_INLINE
-CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq &p)
-{
-  ACE_NEW (this->ptr_, ::CORBA::OctetSeq (p));
-}
-
-ACE_INLINE
-CORBA::OctetSeq_var::~OctetSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OctetSeq_var &
-CORBA::OctetSeq_var::operator= (OctetSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq_var &
-CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          OctetSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              OctetSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              OctetSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// Fixed-size types only.
-ACE_INLINE
-::CORBA::OctetSeq_var &
-CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq &p)
-{
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::CORBA::OctetSeq (p), *this);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::OctetSeq *
-CORBA::OctetSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq *
-CORBA::OctetSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OctetSeq_var::operator const ::CORBA::OctetSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Octet &
-CORBA::OctetSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::Octet &
-CORBA::OctetSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::OctetSeq &
-CORBA::OctetSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq &
-CORBA::OctetSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq *&
-CORBA::OctetSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq *
-CORBA::OctetSeq_var::_retn (void)
-{
-  ::CORBA::OctetSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq *
-CORBA::OctetSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class CORBA::OctetSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::OctetSeq_out::OctetSeq_out (OctetSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OctetSeq_out::OctetSeq_out (OctetSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::OctetSeq_out::OctetSeq_out (const ::CORBA::OctetSeq_out &p)
-  : ptr_ (ACE_const_cast (OctetSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::OctetSeq_out &
-CORBA::OctetSeq_out::operator= (const ::CORBA::OctetSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (OctetSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq_out &
-CORBA::OctetSeq_out::operator= (OctetSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::OctetSeq_out::operator ::CORBA::OctetSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq *&
-CORBA::OctetSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::OctetSeq *
-CORBA::OctetSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Octet &
-CORBA::OctetSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 29a99422357..2de33dfc907 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -34,8 +34,6 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -51,20 +49,20 @@ static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4572726f), 
-  ACE_NTOHL (0x72436f64), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x4572726f),
+  ACE_NTOHL (0x72436f64),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
     16,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794572), 
-  ACE_NTOHL (0x726f7243), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794572),
+  ACE_NTOHL (0x726f7243),
   ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
     CORBA::tk_short,
 
@@ -87,7 +85,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PolicyError::PolicyError (void)
@@ -114,7 +112,7 @@ CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp)
 CORBA::PolicyError&
 CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp)
 {
-  this->UserException::operator= (_tao_excp);
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   this->reason = _tao_excp.reason;
   return *this;
 }
@@ -171,7 +169,7 @@ void CORBA::PolicyError::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -184,7 +182,7 @@ void CORBA::PolicyError::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -195,11 +193,10 @@ void CORBA::PolicyError::_tao_decode (
 
 CORBA::PolicyError::PolicyError (
     CORBA::PolicyErrorCode _tao_reason
-  )  
-  : CORBA::UserException (
-      "IDL:omg.org/CORBA/PolicyError:1.0",
-      "PolicyError"
-    )
+  )  : CORBA::UserException (
+        "IDL:omg.org/CORBA/PolicyError:1.0",
+        "PolicyError"
+      )
 {
   this->reason = _tao_reason;
 }
@@ -217,41 +214,41 @@ static const CORBA::Long _oc_CORBA_PolicyError[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4572726f), 
-  ACE_NTOHL (0x723a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x4572726f),
+  ACE_NTOHL (0x723a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyError:1.0
     12,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794572), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794572),
   ACE_NTOHL (0x726f7200),  // name = PolicyError
   1, // member count
     7,
-  ACE_NTOHL (0x72656173), 
+  ACE_NTOHL (0x72656173),
   ACE_NTOHL (0x6f6e0000),  // name = reason
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f506f), 
-    ACE_NTOHL (0x6c696379), 
-    ACE_NTOHL (0x4572726f), 
-    ACE_NTOHL (0x72436f64), 
-    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f506f),
+    ACE_NTOHL (0x6c696379),
+    ACE_NTOHL (0x4572726f),
+    ACE_NTOHL (0x72436f64),
+    ACE_NTOHL (0x653a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
         16,
-    ACE_NTOHL (0x506f6c69), 
-    ACE_NTOHL (0x63794572), 
-    ACE_NTOHL (0x726f7243), 
+    ACE_NTOHL (0x506f6c69),
+    ACE_NTOHL (0x63794572),
+    ACE_NTOHL (0x726f7243),
     ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
         CORBA::tk_short,
 
@@ -275,117 +272,39 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_
-
-void
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::UShort* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::UShort *old =
-        ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::UShort *tmp =
-    ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_)
-#define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::InvalidPolicies::_tao_seq_UShort
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void)
 {}
 
 CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::UShort>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::UShort
+      >
+    (max)
 {}
 
 CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::UShort *buffer,
+    CORBA::UShort* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::UShort>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::UShort
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (const _tao_seq_UShort &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::UShort>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::UShort
+      >
+    (seq)
 {}
 
-CORBA::InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) // dtor
+CORBA::InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void)
 {}
 
 void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_void_pointer)
@@ -394,9 +313,7 @@ void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_vo
   delete tmp;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::InvalidPolicies::InvalidPolicies (void)
@@ -423,7 +340,7 @@ CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_ex
 CORBA::InvalidPolicies&
 CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp)
 {
-  this->UserException::operator= (_tao_excp);
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   this->indices = _tao_excp.indices;
   return *this;
 }
@@ -480,7 +397,7 @@ void CORBA::InvalidPolicies::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -493,7 +410,7 @@ void CORBA::InvalidPolicies::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -504,8 +421,7 @@ void CORBA::InvalidPolicies::_tao_decode (
 
 CORBA::InvalidPolicies::InvalidPolicies (
     const CORBA::InvalidPolicies::_tao_seq_UShort & _tao_indices
-  )  
-  : CORBA::UserException (
+  )  : CORBA::UserException (
         "IDL:omg.org/CORBA/InvalidPolicies:1.0",
         "InvalidPolicies"
       )
@@ -526,24 +442,24 @@ static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64506f6c), 
-  ACE_NTOHL (0x69636965), 
-  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f496e),
+  ACE_NTOHL (0x76616c69),
+  ACE_NTOHL (0x64506f6c),
+  ACE_NTOHL (0x69636965),
+  ACE_NTOHL (0x733a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
     16,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696450), 
-  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696450),
+  ACE_NTOHL (0x6f6c6963),
   ACE_NTOHL (0x69657300),  // name = InvalidPolicies
   1, // member count
     8,
-  ACE_NTOHL (0x696e6469), 
+  ACE_NTOHL (0x696e6469),
   ACE_NTOHL (0x63657300),  // name = indices
     CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -577,7 +493,7 @@ TAO_NAMESPACE_END
 int CORBA::Policy::_tao_class_id = 0;
 
 CORBA::Policy_ptr
-tao_CORBA_Policy_duplicate (
+CORBA::tao_Policy_life::tao_duplicate (
     CORBA::Policy_ptr p
   )
 {
@@ -585,7 +501,7 @@ tao_CORBA_Policy_duplicate (
 }
 
 void
-tao_CORBA_Policy_release (
+CORBA::tao_Policy_life::tao_release (
     CORBA::Policy_ptr p
   )
 {
@@ -593,228 +509,64 @@ tao_CORBA_Policy_release (
 }
 
 CORBA::Policy_ptr
-tao_CORBA_Policy_nil (
+CORBA::tao_Policy_life::tao_nil (
     void
   )
 {
   return CORBA::Policy::_nil ();
 }
 
-CORBA::Policy_ptr
-tao_CORBA_Policy_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::Policy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_Policy_upcast (
-    void *src
-  )
-{
-  CORBA::Policy **tmp =
-    ACE_static_cast (CORBA::Policy **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_Policy_marshal (
+CORBA::tao_Policy_life::tao_marshal (
     CORBA::Policy_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::Policy_var
-// *************************************************************
-
-CORBA::Policy_var::Policy_var (void)
-  : ptr_ (Policy::_nil ())
-{}
-
-::CORBA::Policy_ptr
-CORBA::Policy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::Policy_var::Policy_var (const ::CORBA::Policy_var &p)
-  : TAO_Base_var (),
-    ptr_ (Policy::_duplicate (p.ptr ()))
-{}
-
-CORBA::Policy_var::~Policy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::Policy_var &
-CORBA::Policy_var::operator= (Policy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Policy_var &
-CORBA::Policy_var::operator= (const ::CORBA::Policy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::Policy_var::operator const ::CORBA::Policy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::Policy_var::operator ::CORBA::Policy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::Policy_ptr
-CORBA::Policy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Policy_ptr
-CORBA::Policy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Policy_ptr &
-CORBA::Policy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Policy_ptr &
-CORBA::Policy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Policy::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::Policy_ptr
-CORBA::Policy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::Policy_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::Policy::_nil ();
-  return val;
-}
-
-::CORBA::Policy_ptr
-CORBA::Policy_var::tao_duplicate (Policy_ptr p)
-{
-  return ::CORBA::Policy::_duplicate (p);
-}
-
-void
-CORBA::Policy_var::tao_release (Policy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::Policy_ptr
-CORBA::Policy_var::tao_nil (void)
-{
-  return ::CORBA::Policy::_nil ();
+  return p->marshal (cdr);
 }
 
-::CORBA::Policy_ptr
-CORBA::Policy_var::tao_narrow (
+CORBA::Policy_ptr
+CORBA::tao_Policy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::Policy::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::Policy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::Policy_var::tao_upcast (void *src)
+CORBA::tao_Policy_cast::tao_upcast (
+    void *src
+  )
 {
-  Policy **tmp =
-    ACE_static_cast (Policy **, src);
+  CORBA::Policy **tmp =
+    ACE_static_cast (CORBA::Policy **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::Policy_out
-// *************************************************************
-
-CORBA::Policy_out::Policy_out (Policy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::Policy::_nil ();
-}
-
-CORBA::Policy_out::Policy_out (Policy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Policy::_nil ();
-}
-
-CORBA::Policy_out::Policy_out (const ::CORBA::Policy_out &p)
-  : ptr_ (ACE_const_cast (Policy_out &, p).ptr_)
-{}
-
-::CORBA::Policy_out &
-CORBA::Policy_out::operator= (const ::CORBA::Policy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Policy_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::Policy_out &
-CORBA::Policy_out::operator= (const ::CORBA::Policy_var &p)
-{
-  this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::Policy_out &
-CORBA::Policy_out::operator= (Policy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Policy_out::operator ::CORBA::Policy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::Policy_ptr &
-CORBA::Policy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Policy_ptr
-CORBA::Policy_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::Policy,
+        CORBA::tao_Policy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::Policy,
+        CORBA::tao_Policy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::Policy, \
+        CORBA::tao_Policy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::Policy, \
+        CORBA::tao_Policy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -834,29 +586,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::PolicyType result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (const TAO_ClientRequestInfo_CORBA_Policy_policy_type_get &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Policy_policy_type_get &);
-    
+
     ::CORBA::PolicyType _result;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -869,7 +621,7 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_AR
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -881,11 +633,11 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_A
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -894,17 +646,17 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_D
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -921,29 +673,29 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Policy_ptr result);
-    
+
   private:
     TAO_ClientRequestInfo_CORBA_Policy_copy (const TAO_ClientRequestInfo_CORBA_Policy_copy &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Policy_copy &);
-    
+
     ::CORBA::Policy_ptr _result;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -956,7 +708,7 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -968,11 +720,11 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -981,17 +733,17 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -1008,10 +760,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1019,14 +771,14 @@ public:
     TAO_ClientRequestInfo_CORBA_Policy_destroy (const TAO_ClientRequestInfo_CORBA_Policy_destroy &);
     void operator= (const TAO_ClientRequestInfo_CORBA_Policy_destroy &);
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -1039,7 +791,7 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -1051,11 +803,11 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1064,7 +816,7 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -1076,7 +828,7 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 CORBA::_TAO_Policy_Proxy_Impl::_TAO_Policy_Proxy_Impl (void)
@@ -1100,12 +852,12 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
 {
   CORBA::PolicyType _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_policy_type",
@@ -1113,22 +865,22 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_policy_type_get _tao_ri (
           &_tao_call,
@@ -1136,14 +888,14 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1151,77 +903,84 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval)
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::PolicyType _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::PolicyType _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1231,59 +990,57 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -1299,12 +1056,12 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
 {
   CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ());
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "copy",
@@ -1312,22 +1069,22 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_copy _tao_ri (
           &_tao_call,
@@ -1335,14 +1092,14 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1350,78 +1107,85 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
-#endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+          else
+            {
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+#endif /* TAO_HAS_INTERCEPTORS */
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  ::CORBA::Policy_ptr _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          ::CORBA::Policy_ptr _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1431,59 +1195,57 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -1498,12 +1260,12 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -1511,22 +1273,22 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_destroy _tao_ri (
           &_tao_call,
@@ -1534,14 +1296,14 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -1549,58 +1311,66 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
+                );
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -1610,61 +1380,59 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -1715,8 +1483,8 @@ CORBA::_TAO_Policy_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::Policy::Policy (int collocated)
 {
@@ -1737,7 +1505,7 @@ CORBA::Policy::CORBA_Policy_setup_collocation (int collocated)
 CORBA::Policy::~Policy (void)
 {}
 
-void 
+void
 CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
 {
   Policy *tmp = ACE_static_cast (Policy *, _tao_void_pointer);
@@ -1754,7 +1522,7 @@ CORBA::Policy::_narrow (
     {
       return Policy::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -1763,17 +1531,17 @@ CORBA::Policy::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Policy::_nil ());
-      
+
       if (is_a == 0)
         {
           return Policy::_nil ();
         }
     }
-  
+
   return Policy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::Policy_ptr 
+CORBA::Policy_ptr
 CORBA::Policy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1783,18 +1551,18 @@ CORBA::Policy::_unchecked_narrow (
     {
       return Policy::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       Policy_ptr default_proxy = Policy::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -1812,7 +1580,7 @@ CORBA::Policy::_unchecked_narrow (
               Policy::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -1825,10 +1593,10 @@ CORBA::Policy::_unchecked_narrow (
               Policy::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           Policy_ptr,
@@ -1848,7 +1616,7 @@ CORBA::Policy::_duplicate (Policy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1873,7 +1641,7 @@ CORBA::Policy::_is_a (
     }
   else
     {
-      return this->Object::_is_a (
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1883,7 +1651,7 @@ CORBA::Policy::_is_a (
 void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, Policy)::_tao_class_id)
@@ -1902,12 +1670,12 @@ void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1916,6 +1684,12 @@ const char* CORBA::Policy::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Policy:1.0";
 }
 
+CORBA::Boolean
+CORBA::Policy::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // ****************************************************************
 CORBA::Boolean
 CORBA::Policy::_tao_encode (TAO_OutputCDR &)
@@ -1952,10 +1726,10 @@ CORBA::PolicyType CORBA::Policy::policy_type (
     CORBA::SystemException
   ))
 {
-  _TAO_Policy_Proxy_Impl &proxy = 
+  _TAO_Policy_Proxy_Impl &proxy =
     this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.policy_type (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1972,10 +1746,10 @@ CORBA::PolicyType CORBA::Policy::policy_type (
     CORBA::SystemException
   ))
 {
-  _TAO_Policy_Proxy_Impl &proxy = 
+  _TAO_Policy_Proxy_Impl &proxy =
     this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.copy (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1992,10 +1766,10 @@ void CORBA::Policy::destroy (
     CORBA::SystemException
   ))
 {
-  _TAO_Policy_Proxy_Impl &proxy = 
+  _TAO_Policy_Proxy_Impl &proxy =
     this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.destroy (
       this
       ACE_ENV_ARG_PARAMETER
@@ -2009,16 +1783,16 @@ static const CORBA::Long _oc_CORBA_Policy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
     7,
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = Policy
   };
 
@@ -2045,7 +1819,7 @@ TAO_NAMESPACE_END
 int CORBA::PolicyManager::_tao_class_id = 0;
 
 CORBA::PolicyManager_ptr
-tao_CORBA_PolicyManager_duplicate (
+CORBA::tao_PolicyManager_life::tao_duplicate (
     CORBA::PolicyManager_ptr p
   )
 {
@@ -2053,7 +1827,7 @@ tao_CORBA_PolicyManager_duplicate (
 }
 
 void
-tao_CORBA_PolicyManager_release (
+CORBA::tao_PolicyManager_life::tao_release (
     CORBA::PolicyManager_ptr p
   )
 {
@@ -2061,15 +1835,24 @@ tao_CORBA_PolicyManager_release (
 }
 
 CORBA::PolicyManager_ptr
-tao_CORBA_PolicyManager_nil (
+CORBA::tao_PolicyManager_life::tao_nil (
     void
   )
 {
   return CORBA::PolicyManager::_nil ();
 }
 
+CORBA::Boolean
+CORBA::tao_PolicyManager_life::tao_marshal (
+    CORBA::PolicyManager_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 CORBA::PolicyManager_ptr
-tao_CORBA_PolicyManager_narrow (
+CORBA::tao_PolicyManager_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2078,7 +1861,7 @@ tao_CORBA_PolicyManager_narrow (
 }
 
 CORBA::Object *
-tao_CORBA_PolicyManager_upcast (
+CORBA::tao_PolicyManager_cast::tao_upcast (
     void *src
   )
 {
@@ -2087,205 +1870,32 @@ tao_CORBA_PolicyManager_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_CORBA_PolicyManager_marshal (
-    CORBA::PolicyManager_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::PolicyManager_var
-// *************************************************************
-
-CORBA::PolicyManager_var::PolicyManager_var (void)
-  : ptr_ (PolicyManager::_nil ())
-{}
-
-::CORBA::PolicyManager_ptr
-CORBA::PolicyManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::PolicyManager_var::PolicyManager_var (const ::CORBA::PolicyManager_var &p)
-  : TAO_Base_var (),
-    ptr_ (PolicyManager::_duplicate (p.ptr ()))
-{}
-
-CORBA::PolicyManager_var::~PolicyManager_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::PolicyManager_var &
-CORBA::PolicyManager_var::operator= (PolicyManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::PolicyManager_var &
-CORBA::PolicyManager_var::operator= (const ::CORBA::PolicyManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::PolicyManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::PolicyManager_var::operator const ::CORBA::PolicyManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::PolicyManager_var::operator ::CORBA::PolicyManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyManager_ptr
-CORBA::PolicyManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyManager_ptr
-CORBA::PolicyManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyManager_ptr &
-CORBA::PolicyManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyManager_ptr &
-CORBA::PolicyManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::PolicyManager::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::PolicyManager_ptr
-CORBA::PolicyManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::PolicyManager_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::PolicyManager::_nil ();
-  return val;
-}
-
-::CORBA::PolicyManager_ptr
-CORBA::PolicyManager_var::tao_duplicate (PolicyManager_ptr p)
-{
-  return ::CORBA::PolicyManager::_duplicate (p);
-}
-
-void
-CORBA::PolicyManager_var::tao_release (PolicyManager_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::PolicyManager_ptr
-CORBA::PolicyManager_var::tao_nil (void)
-{
-  return ::CORBA::PolicyManager::_nil ();
-}
-
-::CORBA::PolicyManager_ptr
-CORBA::PolicyManager_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::CORBA::PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-CORBA::PolicyManager_var::tao_upcast (void *src)
-{
-  PolicyManager **tmp =
-    ACE_static_cast (PolicyManager **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::PolicyManager,
+        CORBA::tao_PolicyManager_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::PolicyManager,
+        CORBA::tao_PolicyManager_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::PolicyManager, \
+        CORBA::tao_PolicyManager_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::PolicyManager, \
+        CORBA::tao_PolicyManager_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::PolicyManager_out
-// *************************************************************
-
-CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::PolicyManager::_nil ();
-}
-
-CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::PolicyManager::_nil ();
-}
-
-CORBA::PolicyManager_out::PolicyManager_out (const ::CORBA::PolicyManager_out &p)
-  : ptr_ (ACE_const_cast (PolicyManager_out &, p).ptr_)
-{}
-
-::CORBA::PolicyManager_out &
-CORBA::PolicyManager_out::operator= (const ::CORBA::PolicyManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (PolicyManager_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::PolicyManager_out &
-CORBA::PolicyManager_out::operator= (const ::CORBA::PolicyManager_var &p)
-{
-  this->ptr_ = ::CORBA::PolicyManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::PolicyManager_out &
-CORBA::PolicyManager_out::operator= (PolicyManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::PolicyManager_out::operator ::CORBA::PolicyManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyManager_ptr &
-CORBA::PolicyManager_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyManager_ptr
-CORBA::PolicyManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::PolicyManager::PolicyManager (void)
 {}
@@ -2293,7 +1903,7 @@ CORBA::PolicyManager::PolicyManager (void)
 CORBA::PolicyManager::~PolicyManager (void)
 {}
 
-void 
+void
 CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyManager *tmp = ACE_static_cast (PolicyManager *, _tao_void_pointer);
@@ -2309,7 +1919,7 @@ CORBA::PolicyManager::_narrow (
   return PolicyManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::PolicyManager_ptr 
+CORBA::PolicyManager_ptr
 CORBA::PolicyManager::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2319,7 +1929,7 @@ CORBA::PolicyManager::_unchecked_narrow (
     {
       return PolicyManager::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           PolicyManager_ptr,
@@ -2339,14 +1949,14 @@ CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *CORBA::PolicyManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id)
@@ -2365,12 +1975,12 @@ void *CORBA::PolicyManager::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2379,6 +1989,12 @@ const char* CORBA::PolicyManager::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PolicyManager:1.0";
 }
 
+CORBA::Boolean
+CORBA::PolicyManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2386,19 +2002,19 @@ static const CORBA::Long _oc_CORBA_PolicyManager[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x4d616e61),
+  ACE_NTOHL (0x6765723a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0
     14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794d61), 
-  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794d61),
+  ACE_NTOHL (0x6e616765),
   ACE_NTOHL (0x72000000),  // name = PolicyManager
   };
 
@@ -2425,7 +2041,7 @@ TAO_NAMESPACE_END
 int CORBA::PolicyCurrent::_tao_class_id = 0;
 
 CORBA::PolicyCurrent_ptr
-tao_CORBA_PolicyCurrent_duplicate (
+CORBA::tao_PolicyCurrent_life::tao_duplicate (
     CORBA::PolicyCurrent_ptr p
   )
 {
@@ -2433,7 +2049,7 @@ tao_CORBA_PolicyCurrent_duplicate (
 }
 
 void
-tao_CORBA_PolicyCurrent_release (
+CORBA::tao_PolicyCurrent_life::tao_release (
     CORBA::PolicyCurrent_ptr p
   )
 {
@@ -2441,15 +2057,24 @@ tao_CORBA_PolicyCurrent_release (
 }
 
 CORBA::PolicyCurrent_ptr
-tao_CORBA_PolicyCurrent_nil (
+CORBA::tao_PolicyCurrent_life::tao_nil (
     void
   )
 {
   return CORBA::PolicyCurrent::_nil ();
 }
 
+CORBA::Boolean
+CORBA::tao_PolicyCurrent_life::tao_marshal (
+    CORBA::PolicyCurrent_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 CORBA::PolicyCurrent_ptr
-tao_CORBA_PolicyCurrent_narrow (
+CORBA::tao_PolicyCurrent_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2458,7 +2083,7 @@ tao_CORBA_PolicyCurrent_narrow (
 }
 
 CORBA::Object *
-tao_CORBA_PolicyCurrent_upcast (
+CORBA::tao_PolicyCurrent_cast::tao_upcast (
     void *src
   )
 {
@@ -2467,205 +2092,32 @@ tao_CORBA_PolicyCurrent_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_CORBA_PolicyCurrent_marshal (
-    CORBA::PolicyCurrent_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::PolicyCurrent_var
-// *************************************************************
-
-CORBA::PolicyCurrent_var::PolicyCurrent_var (void)
-  : ptr_ (PolicyCurrent::_nil ())
-{}
-
-::CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::PolicyCurrent_var::PolicyCurrent_var (const ::CORBA::PolicyCurrent_var &p)
-  : TAO_Base_var (),
-    ptr_ (PolicyCurrent::_duplicate (p.ptr ()))
-{}
-
-CORBA::PolicyCurrent_var::~PolicyCurrent_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::PolicyCurrent_var &
-CORBA::PolicyCurrent_var::operator= (PolicyCurrent_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::PolicyCurrent_var &
-CORBA::PolicyCurrent_var::operator= (const ::CORBA::PolicyCurrent_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::PolicyCurrent::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::PolicyCurrent_var::operator const ::CORBA::PolicyCurrent_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::PolicyCurrent_var::operator ::CORBA::PolicyCurrent_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyCurrent_ptr &
-CORBA::PolicyCurrent_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyCurrent_ptr &
-CORBA::PolicyCurrent_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::PolicyCurrent::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::PolicyCurrent_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::PolicyCurrent::_nil ();
-  return val;
-}
-
-::CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent_var::tao_duplicate (PolicyCurrent_ptr p)
-{
-  return ::CORBA::PolicyCurrent::_duplicate (p);
-}
-
-void
-CORBA::PolicyCurrent_var::tao_release (PolicyCurrent_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent_var::tao_nil (void)
-{
-  return ::CORBA::PolicyCurrent::_nil ();
-}
-
-::CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::CORBA::PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-CORBA::PolicyCurrent_var::tao_upcast (void *src)
-{
-  PolicyCurrent **tmp =
-    ACE_static_cast (PolicyCurrent **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::PolicyCurrent,
+        CORBA::tao_PolicyCurrent_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::PolicyCurrent,
+        CORBA::tao_PolicyCurrent_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::PolicyCurrent, \
+        CORBA::tao_PolicyCurrent_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::PolicyCurrent, \
+        CORBA::tao_PolicyCurrent_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::PolicyCurrent_out
-// *************************************************************
-
-CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::PolicyCurrent::_nil ();
-}
-
-CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::PolicyCurrent::_nil ();
-}
-
-CORBA::PolicyCurrent_out::PolicyCurrent_out (const ::CORBA::PolicyCurrent_out &p)
-  : ptr_ (ACE_const_cast (PolicyCurrent_out &, p).ptr_)
-{}
-
-::CORBA::PolicyCurrent_out &
-CORBA::PolicyCurrent_out::operator= (const ::CORBA::PolicyCurrent_out &p)
-{
-  this->ptr_ = ACE_const_cast (PolicyCurrent_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::PolicyCurrent_out &
-CORBA::PolicyCurrent_out::operator= (const ::CORBA::PolicyCurrent_var &p)
-{
-  this->ptr_ = ::CORBA::PolicyCurrent::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::PolicyCurrent_out &
-CORBA::PolicyCurrent_out::operator= (PolicyCurrent_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::PolicyCurrent_out::operator ::CORBA::PolicyCurrent_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyCurrent_ptr &
-CORBA::PolicyCurrent_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::PolicyCurrent_ptr
-CORBA::PolicyCurrent_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::PolicyCurrent::PolicyCurrent (void)
 {}
@@ -2673,7 +2125,7 @@ CORBA::PolicyCurrent::PolicyCurrent (void)
 CORBA::PolicyCurrent::~PolicyCurrent (void)
 {}
 
-void 
+void
 CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyCurrent *tmp = ACE_static_cast (PolicyCurrent *, _tao_void_pointer);
@@ -2689,7 +2141,7 @@ CORBA::PolicyCurrent::_narrow (
   return PolicyCurrent::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::PolicyCurrent_ptr 
+CORBA::PolicyCurrent_ptr
 CORBA::PolicyCurrent::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2699,7 +2151,7 @@ CORBA::PolicyCurrent::_unchecked_narrow (
     {
       return PolicyCurrent::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           PolicyCurrent_ptr,
@@ -2719,14 +2171,14 @@ CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *CORBA::PolicyCurrent::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, PolicyCurrent)::_tao_class_id)
@@ -2773,12 +2225,12 @@ void *CORBA::PolicyCurrent::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2787,6 +2239,12 @@ const char* CORBA::PolicyCurrent::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
 }
 
+CORBA::Boolean
+CORBA::PolicyCurrent::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2794,19 +2252,19 @@ static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x656e743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0
     14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794375), 
-  ACE_NTOHL (0x7272656e), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794375),
+  ACE_NTOHL (0x7272656e),
   ACE_NTOHL (0x74000000),  // name = PolicyCurrent
   };
 
@@ -2827,7 +2285,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2889,10 +2347,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<CORBA::PolicyError>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyError>
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyError \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -2954,7 +2412,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -3120,7 +2578,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 #if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_
 #define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_
@@ -3131,13 +2589,13 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-  
+
   return 0;
 }
 
@@ -3147,7 +2605,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -3157,27 +2615,27 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-  
+
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -3196,12 +2654,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       CORBA::Policy::_unchecked_narrow (
@@ -3218,4 +2676,3 @@ CORBA::Boolean operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index fc295057577..29a87fadf5f 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -26,18 +26,14 @@
 #define _TAO_IDL_ORIG_POLICYC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "CurrentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "CurrentC.h"
 #include "Policy_ForwardC.h"
-#include "Exception.h"
 #include "Remote_Object_Proxy_Impl.h"
-#include "Encodable.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -67,62 +63,62 @@
 
 TAO_NAMESPACE  CORBA
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyErrorCode;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short BAD_POLICY = 0;
-  
+
+  const CORBA::PolicyErrorCode BAD_POLICY = 0;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short UNSUPPORTED_POLICY = 1;
-  
+
+  const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short BAD_POLICY_TYPE = 2;
-  
+
+  const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short BAD_POLICY_VALUE = 3;
-  
+
+  const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Short UNSUPPORTED_POLICY_VALUE = 4;
-  
+
+  const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_POLICYERROR_CH_)
 #define _CORBA_POLICYERROR_CH_
-  
+
   class TAO_Export PolicyError : public CORBA::UserException
   {
   public:
-    
+
     CORBA::PolicyErrorCode reason;
     PolicyError (void);
     PolicyError (const PolicyError &);
     ~PolicyError (void);
 
     PolicyError &operator= (const PolicyError &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static PolicyError *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -134,143 +130,73 @@ TAO_NAMESPACE  CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     PolicyError (
         ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
-  
+
   class TAO_Export InvalidPolicies : public CORBA::UserException
   {
   public:
-    
-    
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_
-    
-    class TAO_Export _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void);
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          CORBA::UShort *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (
-          const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs
-        );
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &operator= (
-          const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void);
-      
-      // = Accessors.
-      CORBA::UShort &operator[] (CORBA::ULong i);
-      const CORBA::UShort &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static CORBA::UShort *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA::UShort *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA::UShort *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::UShort *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::UShort *data,
-          CORBA::Boolean release
-        );
-    };
 
-#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_)
-#define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-    
-    class _tao_seq_UShort;
-    
-    // *************************************************************
-    // CORBA::InvalidPolicies::_tao_seq_UShort
-    // *************************************************************
-    
-    class TAO_Export _tao_seq_UShort : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::UShort>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
+    class TAO_Export _tao_seq_UShort
+      : public
+          TAO_Unbounded_Sequence<
+              CORBA::UShort
+            >
     {
     public:
       _tao_seq_UShort (void);
       _tao_seq_UShort (CORBA::ULong max);
       _tao_seq_UShort (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          CORBA::UShort *buffer, 
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA::UShort* buffer,
           CORBA::Boolean release = 0
         );
       _tao_seq_UShort (const _tao_seq_UShort &);
       ~_tao_seq_UShort (void);
-      
-      static void _tao_any_destructor (void*);
-      
-      
+
+      static void _tao_any_destructor (void *);
+
+
     };
 
-#endif /* end #if !defined */
-    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
-    
+
     typedef _tao_seq_UShort _indices_seq;
     _tao_seq_UShort indices;
     InvalidPolicies (void);
@@ -278,9 +204,9 @@ TAO_NAMESPACE  CORBA
     ~InvalidPolicies (void);
 
     InvalidPolicies &operator= (const InvalidPolicies &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static InvalidPolicies *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -292,197 +218,145 @@ TAO_NAMESPACE  CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     InvalidPolicies (
         const _tao_seq_UShort & _tao_indices
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_POLICY__ODDS_N_ENDS_CH_)
+#define _CORBA_POLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_POLICY___PTR_CH_)
-#define _CORBA_POLICY___PTR_CH_
-  
   class Policy;
   typedef Policy *Policy_ptr;
+  struct tao_Policy_life;
+  typedef TAO_Objref_Var_T<Policy, tao_Policy_life> Policy_var;
+  typedef TAO_Objref_Out_T<Policy, tao_Policy_life> Policy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICY___VAR_CH_)
-#define _CORBA_POLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export Policy_var : public TAO_Base_var
+  struct TAO_Export tao_Policy_life
   {
-  public:
-    Policy_var (void); // default constructor
-    Policy_var (Policy_ptr p) : ptr_ (p) {} 
-    Policy_var (const Policy_var &); // copy constructor
-    ~Policy_var (void); // destructor
-    
-    Policy_var &operator= (Policy_ptr);
-    Policy_var &operator= (const Policy_var &);
-    Policy_ptr operator-> (void) const;
-    
-    operator const Policy_ptr &() const;
-    operator Policy_ptr &();
-    // in, inout, out, _retn 
-    Policy_ptr in (void) const;
-    Policy_ptr &inout (void);
-    Policy_ptr &out (void);
-    Policy_ptr _retn (void);
-    Policy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Policy_ptr tao_duplicate (Policy_ptr);
     static void tao_release (Policy_ptr);
     static Policy_ptr tao_nil (void);
-    static Policy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Policy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Policy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Policy_var (const TAO_Base_var &rhs);
-    Policy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICY___OUT_CH_)
-#define _CORBA_POLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export Policy_out
+  struct TAO_Export tao_Policy_cast
   {
-  public:
-    Policy_out (Policy_ptr &);
-    Policy_out (Policy_var &);
-    Policy_out (const Policy_out &);
-    Policy_out &operator= (const Policy_out &);
-    Policy_out &operator= (const Policy_var &);
-    Policy_out &operator= (Policy_ptr);
-    operator Policy_ptr &();
-    Policy_ptr &ptr (void);
-    Policy_ptr operator-> (void);
-  
-  private:
-    Policy_ptr &ptr_;
+    static Policy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
-  
+
   class _TAO_Policy_Proxy_Impl;
   class _TAO_Policy_Remote_Proxy_Impl;
   class _TAO_Policy_Proxy_Broker;
   class _TAO_Policy_Remote_Proxy_Broker;
-  
+
   class TAO_Export Policy
     : public virtual CORBA::Object
-    // ****************************************************************
-    , public virtual TAO_Encodable
-    // ****************************************************************
   {
   public:
     typedef Policy_ptr _ptr_type;
     typedef Policy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static Policy_ptr _duplicate (Policy_ptr obj);
-    
+
     static Policy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Policy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Policy_ptr _nil (void)
       {
         return (Policy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -495,51 +369,51 @@ TAO_NAMESPACE  CORBA
 
   private:
     _TAO_Policy_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-  
+
   protected:
     Policy (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Policy_setup_collocation (int collocated);
-    
+
     Policy (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Policy (void);
-    
+
     friend class _TAO_Policy_Remote_Proxy_Impl;
     friend class _TAO_Policy_ThruPOA_Proxy_Impl;
     friend class _TAO_Policy_Direct_Proxy_Impl;
-  
+
   private:
     Policy (const Policy &);
     void operator= (const Policy &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_Export _TAO_Policy_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_Policy_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::PolicyType policy_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -547,10 +421,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual ::CORBA::Policy_ptr copy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -558,10 +432,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -569,35 +443,35 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_Policy_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_Export _TAO_Policy_Remote_Proxy_Impl
     : public virtual _TAO_Policy_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_Policy_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_Policy_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::PolicyType policy_type (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -605,10 +479,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual ::CORBA::Policy_ptr copy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -616,10 +490,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -628,23 +502,23 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_Export _TAO_Policy_Proxy_Broker
   {
   public:
@@ -653,147 +527,98 @@ TAO_NAMESPACE  CORBA
         Policy *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_Policy_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_Export _TAO_Policy_Remote_Proxy_Broker
     : public virtual _TAO_Policy_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_Policy_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_Policy_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_Policy_Proxy_Impl &select_proxy (
         Policy *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_Policy_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Policy_Remote_Proxy_Broker *the_TAO_Policy_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_POLICYMANAGER__ODDS_N_ENDS_CH_)
+#define _CORBA_POLICYMANAGER__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_POLICYMANAGER___PTR_CH_)
-#define _CORBA_POLICYMANAGER___PTR_CH_
-  
   class PolicyManager;
   typedef PolicyManager *PolicyManager_ptr;
+  struct tao_PolicyManager_life;
+  typedef TAO_Objref_Var_T<PolicyManager, tao_PolicyManager_life> PolicyManager_var;
+  typedef TAO_Objref_Out_T<PolicyManager, tao_PolicyManager_life> PolicyManager_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICYMANAGER___VAR_CH_)
-#define _CORBA_POLICYMANAGER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export PolicyManager_var : public TAO_Base_var
+  struct TAO_Export tao_PolicyManager_life
   {
-  public:
-    PolicyManager_var (void); // default constructor
-    PolicyManager_var (PolicyManager_ptr p) : ptr_ (p) {} 
-    PolicyManager_var (const PolicyManager_var &); // copy constructor
-    ~PolicyManager_var (void); // destructor
-    
-    PolicyManager_var &operator= (PolicyManager_ptr);
-    PolicyManager_var &operator= (const PolicyManager_var &);
-    PolicyManager_ptr operator-> (void) const;
-    
-    operator const PolicyManager_ptr &() const;
-    operator PolicyManager_ptr &();
-    // in, inout, out, _retn 
-    PolicyManager_ptr in (void) const;
-    PolicyManager_ptr &inout (void);
-    PolicyManager_ptr &out (void);
-    PolicyManager_ptr _retn (void);
-    PolicyManager_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static PolicyManager_ptr tao_duplicate (PolicyManager_ptr);
     static void tao_release (PolicyManager_ptr);
     static PolicyManager_ptr tao_nil (void);
-    static PolicyManager_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        PolicyManager_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PolicyManager_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PolicyManager_var (const TAO_Base_var &rhs);
-    PolicyManager_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICYMANAGER___OUT_CH_)
-#define _CORBA_POLICYMANAGER___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export PolicyManager_out
+  struct TAO_Export tao_PolicyManager_cast
   {
-  public:
-    PolicyManager_out (PolicyManager_ptr &);
-    PolicyManager_out (PolicyManager_var &);
-    PolicyManager_out (const PolicyManager_out &);
-    PolicyManager_out &operator= (const PolicyManager_out &);
-    PolicyManager_out &operator= (const PolicyManager_var &);
-    PolicyManager_out &operator= (PolicyManager_ptr);
-    operator PolicyManager_ptr &();
-    PolicyManager_ptr &ptr (void);
-    PolicyManager_ptr operator-> (void);
-  
-  private:
-    PolicyManager_ptr &ptr_;
+    static PolicyManager_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
-  
+
   class TAO_Export PolicyManager
     : public virtual CORBA::Object
   {
@@ -801,30 +626,30 @@ TAO_NAMESPACE  CORBA
     typedef PolicyManager_ptr _ptr_type;
     typedef PolicyManager_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static PolicyManager_ptr _duplicate (PolicyManager_ptr obj);
-    
+
     static PolicyManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyManager_ptr _nil (void)
       {
         return (PolicyManager_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -832,10 +657,10 @@ TAO_NAMESPACE  CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
@@ -845,120 +670,71 @@ TAO_NAMESPACE  CORBA
         CORBA::SystemException
         , CORBA::InvalidPolicies
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     PolicyManager (void);
     virtual ~PolicyManager (void);
-    
+
   private:
     PolicyManager (const PolicyManager &);
     void operator= (const PolicyManager &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_CORBA_POLICYCURRENT__ODDS_N_ENDS_CH_)
+#define _CORBA_POLICYCURRENT__ODDS_N_ENDS_CH_
 
-#if !defined (_CORBA_POLICYCURRENT___PTR_CH_)
-#define _CORBA_POLICYCURRENT___PTR_CH_
-  
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
+  struct tao_PolicyCurrent_life;
+  typedef TAO_Objref_Var_T<PolicyCurrent, tao_PolicyCurrent_life> PolicyCurrent_var;
+  typedef TAO_Objref_Out_T<PolicyCurrent, tao_PolicyCurrent_life> PolicyCurrent_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICYCURRENT___VAR_CH_)
-#define _CORBA_POLICYCURRENT___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export PolicyCurrent_var : public TAO_Base_var
+  struct TAO_Export tao_PolicyCurrent_life
   {
-  public:
-    PolicyCurrent_var (void); // default constructor
-    PolicyCurrent_var (PolicyCurrent_ptr p) : ptr_ (p) {} 
-    PolicyCurrent_var (const PolicyCurrent_var &); // copy constructor
-    ~PolicyCurrent_var (void); // destructor
-    
-    PolicyCurrent_var &operator= (PolicyCurrent_ptr);
-    PolicyCurrent_var &operator= (const PolicyCurrent_var &);
-    PolicyCurrent_ptr operator-> (void) const;
-    
-    operator const PolicyCurrent_ptr &() const;
-    operator PolicyCurrent_ptr &();
-    // in, inout, out, _retn 
-    PolicyCurrent_ptr in (void) const;
-    PolicyCurrent_ptr &inout (void);
-    PolicyCurrent_ptr &out (void);
-    PolicyCurrent_ptr _retn (void);
-    PolicyCurrent_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static PolicyCurrent_ptr tao_duplicate (PolicyCurrent_ptr);
     static void tao_release (PolicyCurrent_ptr);
     static PolicyCurrent_ptr tao_nil (void);
-    static PolicyCurrent_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        PolicyCurrent_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PolicyCurrent_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PolicyCurrent_var (const TAO_Base_var &rhs);
-    PolicyCurrent_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICYCURRENT___OUT_CH_)
-#define _CORBA_POLICYCURRENT___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export PolicyCurrent_out
+  struct TAO_Export tao_PolicyCurrent_cast
   {
-  public:
-    PolicyCurrent_out (PolicyCurrent_ptr &);
-    PolicyCurrent_out (PolicyCurrent_var &);
-    PolicyCurrent_out (const PolicyCurrent_out &);
-    PolicyCurrent_out &operator= (const PolicyCurrent_out &);
-    PolicyCurrent_out &operator= (const PolicyCurrent_var &);
-    PolicyCurrent_out &operator= (PolicyCurrent_ptr);
-    operator PolicyCurrent_ptr &();
-    PolicyCurrent_ptr &ptr (void);
-    PolicyCurrent_ptr operator-> (void);
-  
-  private:
-    PolicyCurrent_ptr &ptr_;
+    static PolicyCurrent_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYCURRENT_CH_)
 #define _CORBA_POLICYCURRENT_CH_
-  
+
   class TAO_Export PolicyCurrent
     : public virtual CORBA::PolicyManager,
       public virtual CORBA::Current
@@ -967,49 +743,49 @@ TAO_NAMESPACE  CORBA
     typedef PolicyCurrent_ptr _ptr_type;
     typedef PolicyCurrent_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj);
-    
+
     static PolicyCurrent_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyCurrent_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyCurrent_ptr _nil (void)
       {
         return (PolicyCurrent_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     PolicyCurrent (void);
     virtual ~PolicyCurrent (void);
-    
+
   private:
     PolicyCurrent (const PolicyCurrent &);
     void operator= (const PolicyCurrent &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyCurrent;
 
 // TAO_IDL - Generated from
@@ -1112,7 +888,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "PolicyC.i"
@@ -1128,4 +904,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index 81f7cb2234a..9a7ef92de5e 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -20,219 +20,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_
-
-ACE_INLINE
-CORBA::UShort *
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size)
-{
-  CORBA::UShort *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::UShort[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void)
-{
-}
-
-ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::UShort *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (
-    const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::UShort *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->maximum_);
-      CORBA::UShort * const tmp2 =
-        ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::UShort *tmp =
-            ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::UShort *tmp1 =
-    ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
-  CORBA::UShort * const tmp2 =
-    ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::UShort &
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::UShort* tmp =
-    ACE_reinterpret_cast (CORBA::UShort*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::UShort &
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::UShort * const tmp =
-    ACE_reinterpret_cast (CORBA::UShort* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::UShort *
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::UShort *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::UShort*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::UShort*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::UShort *
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::UShort * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::UShort *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::UShort *tmp =
-        ACE_reinterpret_cast (CORBA::UShort*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
@@ -245,18 +32,11 @@ CORBA::Policy::Policy (
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
-  : Object (objref, _tao_collocated, servant)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)
 {
   this->CORBA_Policy_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::Policy::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -276,13 +56,6 @@ TAO::Any_Impl_T<CORBA::Policy>::to_object (
 #if !defined (_CORBA_POLICYMANAGER___CI_)
 #define _CORBA_POLICYMANAGER___CI_
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::PolicyManager::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -317,14 +90,6 @@ TAO::Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &)
 
 #if !defined (_CORBA_POLICYCURRENT___CI_)
 #define _CORBA_POLICYCURRENT___CI_
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::PolicyCurrent::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -355,7 +120,7 @@ TAO::Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -422,7 +187,7 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -482,4 +247,3 @@ TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CORBA::Policy_ptr &
   );
-
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index f38eaac0be1..35b8c3fd867 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -25,14 +25,6 @@
 
 #include "Policy_ForwardC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -49,18 +41,18 @@ static const CORBA::Long _oc_CORBA_PolicyType[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
     11,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795479), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795479),
   ACE_NTOHL (0x70650000),  // name = PolicyType
     CORBA::tk_ulong,
 
@@ -84,159 +76,47 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Policy **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::Policy **old = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = tao_CORBA_Policy_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tao_CORBA_Policy_release (tmp[i]);
-      tmp[i] = tao_CORBA_Policy_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      tao_CORBA_Policy_release (tmp[i]);
-      tmp[i] = tao_CORBA_Policy_nil ();
-    }
-}
-
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target);
-  *tmp = tao_CORBA_Policy_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_upcast (void *src) const
-{
-  return tao_CORBA_Policy_upcast (src);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_POLICYLIST_CS_)
-#define _CORBA_POLICYLIST_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::PolicyList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::PolicyList::PolicyList (void)
 {}
 
 CORBA::PolicyList::PolicyList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_PolicyList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::Policy,
+        CORBA::Policy_var,
+        CORBA::tao_Policy_life,
+        CORBA::tao_Policy_cast
+      >
+    (max)
 {}
 
 CORBA::PolicyList::PolicyList (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::Policy_ptr *buffer,
+    CORBA::Policy_ptr* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_PolicyList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::Policy,
+        CORBA::Policy_var,
+        CORBA::tao_Policy_life,
+        CORBA::tao_Policy_cast
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::PolicyList::PolicyList (const PolicyList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_CORBA_PolicyList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Object_Sequence<
+        CORBA::Policy,
+        CORBA::Policy_var,
+        CORBA::tao_Policy_life,
+        CORBA::tao_Policy_cast
+      >
+    (seq)
 {}
 
-CORBA::PolicyList::~PolicyList (void) // dtor
+CORBA::PolicyList::~PolicyList (void)
 {}
 
 void CORBA::PolicyList::_tao_any_destructor (void *_tao_void_pointer)
@@ -245,363 +125,334 @@ void CORBA::PolicyList::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::PolicyList,
+      TAO_Object_Manager<
+          CORBA::Policy,
+          CORBA::Policy_var,
+          CORBA::tao_Policy_life
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::PolicyList,
+      CORBA::PolicyList_var,
+      TAO_Object_Manager<
+          CORBA::Policy,
+          CORBA::Policy_var,
+          CORBA::tao_Policy_life
+        >
+    >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_CORBA_PolicyList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
-    11,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794c69), 
-  ACE_NTOHL (0x73740000),  // name = PolicyList
-    CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    52, // encapsulation length
+# pragma instantiate \
+    TAO_MngSeq_Var_T< \
+        CORBA::PolicyList, \
+        TAO_Object_Manager< \
+            CORBA::Policy, \
+            CORBA::Policy_var, \
+            CORBA::tao_Policy_life \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::PolicyList, \
+        CORBA::PolicyList_var, \
+        TAO_Object_Manager< \
+            CORBA::Policy, \
+            CORBA::Policy_var, \
+            CORBA::tao_Policy_life \
+          > \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+  static const CORBA::Long _oc_CORBA_PolicyList[] =
+  {
+        TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f506f),
+    ACE_NTOHL (0x6c696379),
+    ACE_NTOHL (0x4c697374),
+    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
+        11,
+    ACE_NTOHL (0x506f6c69),
+    ACE_NTOHL (0x63794c69),
+    ACE_NTOHL (0x73740000),  // name = PolicyList
+        CORBA::tk_sequence, // typecode kind
+    68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      29,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
-            7,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63790000),  // name = Policy
-      
-    0U,
+      CORBA::tk_objref, // typecode kind
+      52, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        29,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f506f),
+        ACE_NTOHL (0x6c696379),
+        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
+                7,
+        ACE_NTOHL (0x506f6c69),
+        ACE_NTOHL (0x63790000),  // name = Policy
+
+      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyList),
-    (char *) &_oc_CORBA_PolicyList,
-    0,
-    sizeof (CORBA::PolicyList)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PolicyList,
-    &_tc_TAO_tc_CORBA_PolicyList
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ULong* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old =
-        ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ULong *tmp =
-    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_POLICYTYPESEQ_CS_)
-#define _CORBA_POLICYTYPESEQ_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::PolicyTypeSeq
-// *************************************************************
-
-CORBA::PolicyTypeSeq::PolicyTypeSeq (void)
-{}
-
-CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-CORBA::PolicyTypeSeq::PolicyTypeSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-CORBA::PolicyTypeSeq::~PolicyTypeSeq (void) // dtor
-{}
-
-void CORBA::PolicyTypeSeq::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PolicyTypeSeq *tmp = ACE_static_cast (PolicyTypeSeq*, _tao_void_pointer);
-  delete tmp;
-}
+  static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
+      CORBA::tk_alias,
+      sizeof (_oc_CORBA_PolicyList),
+      (char *) &_oc_CORBA_PolicyList,
+      0,
+      sizeof (CORBA::PolicyList)
+    );
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (CORBA)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_PolicyList,
+      &_tc_TAO_tc_CORBA_PolicyList
+    )
+  TAO_NAMESPACE_END
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
+
+  CORBA::PolicyTypeSeq::PolicyTypeSeq (void)
+  {}
+
+  CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max)
+    : TAO_Unbounded_Sequence<
+          CORBA::PolicyType
+        >
+      (max)
+  {}
+
+  CORBA::PolicyTypeSeq::PolicyTypeSeq (
+      CORBA::ULong max,
+      CORBA::ULong length,
+      CORBA::ULong* buffer,
+      CORBA::Boolean release
+    )
+    : TAO_Unbounded_Sequence<
+          CORBA::PolicyType
+        >
+      (max, length, buffer, release)
+  {}
+
+  CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq)
+    : TAO_Unbounded_Sequence<
+          CORBA::PolicyType
+        >
+      (seq)
+  {}
+
+  CORBA::PolicyTypeSeq::~PolicyTypeSeq (void)
+  {}
+
+  void CORBA::PolicyTypeSeq::_tao_any_destructor (void *_tao_void_pointer)
+  {
+    PolicyTypeSeq *tmp = ACE_static_cast (PolicyTypeSeq*, _tao_void_pointer);
+    delete tmp;
+  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO_FixedSeq_Var_T<
+        PolicyTypeSeq,
+        CORBA::PolicyType
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        PolicyTypeSeq,
+        PolicyTypeSeq_var,
+        CORBA::PolicyType
+      >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795479), 
-  ACE_NTOHL (0x70655365), 
-  ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    64, // encapsulation length
+  # pragma instantiate \
+    TAO_FixedSeq_Var_T< \
+        PolicyTypeSeq, \
+        CORBA::PolicyType \
+      >
+
+  # pragma instantiate \
+    TAO_Seq_Out_T< \
+        PolicyTypeSeq, \
+        PolicyTypeSeq_var, \
+        CORBA::PolicyType \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+  static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
+  {
+        TAO_ENCAP_BYTE_ORDER, // byte order
+    36,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f506f),
+    ACE_NTOHL (0x6c696379),
+    ACE_NTOHL (0x54797065),
+    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
+        14,
+    ACE_NTOHL (0x506f6c69),
+    ACE_NTOHL (0x63795479),
+    ACE_NTOHL (0x70655365),
+    ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
+        CORBA::tk_sequence, // typecode kind
+    80, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x54797065), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-            11,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63795479), 
-      ACE_NTOHL (0x70650000),  // name = PolicyType
-            CORBA::tk_ulong,
-
-
-    0U,
+      CORBA::tk_alias, // typecode kind for typedefs
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f506f),
+        ACE_NTOHL (0x6c696379),
+        ACE_NTOHL (0x54797065),
+        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
+                11,
+        ACE_NTOHL (0x506f6c69),
+        ACE_NTOHL (0x63795479),
+        ACE_NTOHL (0x70650000),  // name = PolicyType
+                CORBA::tk_ulong,
+
+
+      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyTypeSeq),
-    (char *) &_oc_CORBA_PolicyTypeSeq,
-    0,
-    sizeof (CORBA::PolicyTypeSeq)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_PolicyTypeSeq,
-    &_tc_TAO_tc_CORBA_PolicyTypeSeq
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_SetOverrideType[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x744f7665), 
-  ACE_NTOHL (0x72726964), 
-  ACE_NTOHL (0x65547970), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0
-  16,
-  ACE_NTOHL (0x5365744f), 
-  ACE_NTOHL (0x76657272), 
-  ACE_NTOHL (0x69646554), 
-  ACE_NTOHL (0x79706500),  // name = SetOverrideType
-  2, // member count
-  13,
-  ACE_NTOHL (0x5345545f), 
-  ACE_NTOHL (0x4f564552), 
-  ACE_NTOHL (0x52494445), 
-  ACE_NTOHL (0x0),  // name = SET_OVERRIDE
-  13,
-  ACE_NTOHL (0x4144445f), 
-  ACE_NTOHL (0x4f564552), 
-  ACE_NTOHL (0x52494445), 
-  ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_SetOverrideType),
-    (char *) &_oc_CORBA_SetOverrideType,
-    0,
-    sizeof (CORBA::SetOverrideType)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_SetOverrideType,
-    &_tc_TAO_tc_CORBA_SetOverrideType
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
-      _tao_any,
-      CORBA::PolicyList::_tao_any_destructor,
-      CORBA::_tc_PolicyList,
-      _tao_elem
+  static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
+      CORBA::tk_alias,
+      sizeof (_oc_CORBA_PolicyTypeSeq),
+      (char *) &_oc_CORBA_PolicyTypeSeq,
+      0,
+      sizeof (CORBA::PolicyTypeSeq)
     );
-}
 
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
-      _tao_any,
-      CORBA::PolicyList::_tao_any_destructor,
-      CORBA::_tc_PolicyList,
-      _tao_elem
-    );
-}
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (CORBA)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_PolicyTypeSeq,
+      &_tc_TAO_tc_CORBA_PolicyTypeSeq
+    )
+  TAO_NAMESPACE_END
 
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyList *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const CORBA::PolicyList *&,
-      _tao_elem
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+  static const CORBA::Long _oc_CORBA_SetOverrideType[] =
+  {
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5365),
+    ACE_NTOHL (0x744f7665),
+    ACE_NTOHL (0x72726964),
+    ACE_NTOHL (0x65547970),
+    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0
+    16,
+    ACE_NTOHL (0x5365744f),
+    ACE_NTOHL (0x76657272),
+    ACE_NTOHL (0x69646554),
+    ACE_NTOHL (0x79706500),  // name = SetOverrideType
+    2, // member count
+    13,
+    ACE_NTOHL (0x5345545f),
+    ACE_NTOHL (0x4f564552),
+    ACE_NTOHL (0x52494445),
+    ACE_NTOHL (0x0),  // name = SET_OVERRIDE
+    13,
+    ACE_NTOHL (0x4144445f),
+    ACE_NTOHL (0x4f564552),
+    ACE_NTOHL (0x52494445),
+    ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
+    };
+
+  static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
+      CORBA::tk_enum,
+      sizeof (_oc_CORBA_SetOverrideType),
+      (char *) &_oc_CORBA_SetOverrideType,
+      0,
+      sizeof (CORBA::SetOverrideType)
     );
-}
 
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (CORBA)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_SetOverrideType,
+      &_tc_TAO_tc_CORBA_SetOverrideType
+    )
+  TAO_NAMESPACE_END
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
+
+  // Copying insertion.
+  void operator<<= (
+      CORBA::Any &_tao_any,
+      const CORBA::PolicyList &_tao_elem
+    )
+  {
+    TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
         _tao_any,
         CORBA::PolicyList::_tao_any_destructor,
         CORBA::_tc_PolicyList,
         _tao_elem
       );
-}
+  }
+
+  // Non-copying insertion.
+  void operator<<= (
+      CORBA::Any &_tao_any,
+      CORBA::PolicyList *_tao_elem
+    )
+  {
+    TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
+        _tao_any,
+        CORBA::PolicyList::_tao_any_destructor,
+        CORBA::_tc_PolicyList,
+        _tao_elem
+      );
+  }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
@@ -610,7 +461,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyList>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -675,157 +526,156 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SetOverrideType _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
-      _tao_any,
-      CORBA::_tc_SetOverrideType,
-      _tao_elem
-    );
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::SetOverrideType &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
+  void operator<<= (
+      CORBA::Any &_tao_any,
+      CORBA::SetOverrideType _tao_elem
+    )
+  {
+    TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
         _tao_any,
         CORBA::_tc_SetOverrideType,
-        _tao_elem 
+        _tao_elem
       );
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PolicyList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag =
-            tao_CORBA_Policy_marshal (_tao_sequence[i].in (), strm);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PolicyList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PolicyTypeSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PolicyTypeSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-  
-  return 0;
-}
-
+  }
+
+  CORBA::Boolean operator>>= (
+      const CORBA::Any &_tao_any,
+      CORBA::SetOverrideType &_tao_elem
+    )
+  {
+    return
+      TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
+          _tao_any,
+          CORBA::_tc_SetOverrideType,
+          _tao_elem
+        );
+  }
+
+  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+      defined (ACE_HAS_GNU_REPO)
+    template class TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  # pragma instantiate TAO::Any_Basic_Impl_T<CORBA::SetOverrideType \>
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
+
+  CORBA::Boolean operator<< (
+      TAO_OutputCDR &strm,
+      const CORBA::PolicyList &_tao_sequence
+    )
+  {
+    CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+
+    if (strm << _tao_seq_len)
+      {
+        // Encode all elements.
+        CORBA::Boolean _tao_marshal_flag = 1;
+
+        for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+          {
+            _tao_marshal_flag =
+              CORBA::tao_Policy_life::tao_marshal (_tao_sequence[i].in (), strm);
+          }
+
+        return _tao_marshal_flag;
+      }
+
+    return 0;
+  }
+
+    CORBA::Boolean operator>> (
+      TAO_InputCDR &strm,
+      CORBA::PolicyList &_tao_sequence
+    )
+  {
+    CORBA::ULong _tao_seq_len;
+
+    if (strm >> _tao_seq_len)
+      {
+        // Add a check to the length of the sequence
+        // to make sure it does not exceed the length
+        // of the stream. (See bug 58.)
+        if (_tao_seq_len > strm.length ())
+          {
+            return 0;
+          }
+
+        // Set the length of the sequence.
+        _tao_sequence.length (_tao_seq_len);
+
+        // If length is 0 we return true.
+        if (0 >= _tao_seq_len)
+          {
+            return 1;
+          }
+
+        // Retrieve all the elements.
+        CORBA::Boolean _tao_marshal_flag = 1;
+
+        for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+          {
+            _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+          }
+
+        return _tao_marshal_flag;
+      }
+
+    return 0;
+  }
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
+
+  CORBA::Boolean operator<< (
+      TAO_OutputCDR &strm,
+      const CORBA::PolicyTypeSeq &_tao_sequence
+    )
+  {
+    CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+
+    if (strm << _tao_seq_len)
+      {
+        // Encode all elements.
+        return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+
+    return 0;
+  }
+
+    CORBA::Boolean operator>> (
+      TAO_InputCDR &strm,
+      CORBA::PolicyTypeSeq &_tao_sequence
+    )
+  {
+    CORBA::ULong _tao_seq_len;
+
+    if (strm >> _tao_seq_len)
+      {
+        // Add a check to the length of the sequence
+        // to make sure it does not exceed the length
+        // of the stream. (See bug 58.)
+        if (_tao_seq_len > strm.length ())
+          {
+            return 0;
+          }
+
+        // Set the length of the sequence.
+        _tao_sequence.length (_tao_seq_len);
+
+        // If length is 0 we return true.
+        if (0 >= _tao_seq_len)
+          {
+            return 1;
+          }
+
+        // Retrieve all the elements.
+        return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+      }
+
+    return 0;
+  }
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 2713a0ea7b0..5b1cb921925 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -26,16 +26,16 @@
 #define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/Sequence.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "Sequence.h"
-#include "CDR.h"
-#include "varbase.h"
+#include "tao/CDR.h"
+#include "tao/Objref_VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -65,473 +65,173 @@
 
 TAO_NAMESPACE  CORBA
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class Policy;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566
 
-#if !defined (_CORBA_POLICY___PTR_CH_)
-#define _CORBA_POLICY___PTR_CH_
-  
-  typedef Policy *Policy_ptr;
+#if !defined (_CORBA_POLICY__ODDS_N_ENDS_CH_)
+#define _CORBA_POLICY__ODDS_N_ENDS_CH_
 
-#endif /* end #if !defined */
+  class Policy;
+  typedef Policy *Policy_ptr;
+  struct tao_Policy_life;
+  typedef TAO_Objref_Var_T<Policy, tao_Policy_life> Policy_var;
+  typedef TAO_Objref_Out_T<Policy, tao_Policy_life> Policy_out;
 
-#if !defined (_CORBA_POLICY___VAR_CH_)
-#define _CORBA_POLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export Policy_var : public TAO_Base_var
+  struct TAO_Export tao_Policy_life
   {
-  public:
-    Policy_var (void); // default constructor
-    Policy_var (Policy_ptr p) : ptr_ (p) {} 
-    Policy_var (const Policy_var &); // copy constructor
-    ~Policy_var (void); // destructor
-    
-    Policy_var &operator= (Policy_ptr);
-    Policy_var &operator= (const Policy_var &);
-    Policy_ptr operator-> (void) const;
-    
-    operator const Policy_ptr &() const;
-    operator Policy_ptr &();
-    // in, inout, out, _retn 
-    Policy_ptr in (void) const;
-    Policy_ptr &inout (void);
-    Policy_ptr &out (void);
-    Policy_ptr _retn (void);
-    Policy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Policy_ptr tao_duplicate (Policy_ptr);
     static void tao_release (Policy_ptr);
     static Policy_ptr tao_nil (void);
-    static Policy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Policy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Policy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Policy_var (const TAO_Base_var &rhs);
-    Policy_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICY___OUT_CH_)
-#define _CORBA_POLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export Policy_out
-  {
-  public:
-    Policy_out (Policy_ptr &);
-    Policy_out (Policy_var &);
-    Policy_out (const Policy_out &);
-    Policy_out &operator= (const Policy_out &);
-    Policy_out &operator= (const Policy_var &);
-    Policy_out &operator= (Policy_ptr);
-    operator Policy_ptr &();
-    Policy_ptr &ptr (void);
-    Policy_ptr operator-> (void);
-  
-  private:
-    Policy_ptr &ptr_;
   };
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_
-  
-  class TAO_Export _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
-    : public TAO_Unbounded_Base_Sequence
+  struct TAO_Export tao_Policy_cast
   {
-  public:
-    _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        Policy* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (
-        const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &operator= (
-        const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static Policy **allocbuf (CORBA::ULong nelems);
-    static void freebuf (Policy **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    Policy* *get_buffer (CORBA::Boolean orphan = 0);
-    const Policy* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static Policy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_POLICYLIST_CH_)
-#define _CORBA_POLICYLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class PolicyList;
-  class PolicyList_var;
-  
-  // *************************************************************
-  // CORBA::PolicyList
-  // *************************************************************
-  
-  class TAO_Export PolicyList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<Policy,Policy_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        PolicyList,
+        TAO_Object_Manager<
+            CORBA::Policy,
+            CORBA::Policy_var,
+            CORBA::tao_Policy_life
+          >
+      >
+    PolicyList_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        PolicyList,
+        PolicyList_var,
+        TAO_Object_Manager<
+            CORBA::Policy,
+            CORBA::Policy_var,
+            CORBA::tao_Policy_life
+          >
+      >
+    PolicyList_out;
+
+  class TAO_Export PolicyList
+    : public
+        TAO_Unbounded_Object_Sequence<
+            CORBA::Policy,
+            CORBA::Policy_var,
+            CORBA::tao_Policy_life,
+            CORBA::tao_Policy_cast
+          >
   {
   public:
     PolicyList (void);
     PolicyList (CORBA::ULong max);
     PolicyList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        Policy_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        Policy_ptr* buffer,
         CORBA::Boolean release = 0
       );
     PolicyList (const PolicyList &);
     ~PolicyList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef PolicyList_var _var_type;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_POLICYLIST___VAR_CH_)
-#define _CORBA_POLICYLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::PolicyList_var
-  // *************************************************************
-  
-  class TAO_Export PolicyList_var
-  {
-  public:
-    PolicyList_var (void);
-    PolicyList_var (PolicyList *);
-    PolicyList_var (const PolicyList_var &);
-    ~PolicyList_var (void);
-    
-    PolicyList_var &operator= (PolicyList *);
-    PolicyList_var &operator= (const PolicyList_var &);
-    PolicyList *operator-> (void);
-    const PolicyList *operator-> (void) const;
-    
-    operator const PolicyList &() const;
-    operator PolicyList &();
-    operator PolicyList &() const;
-    
-    // Variable-size base types only.
-    operator PolicyList *&();
-    
-    TAO_Object_Manager<Policy, Policy_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const PolicyList &in (void) const;
-    PolicyList &inout (void);
-    PolicyList *&out (void);
-    PolicyList *_retn (void);
-    PolicyList *ptr (void) const;
-  
-  private:
-    PolicyList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICYLIST___OUT_CH_)
-#define _CORBA_POLICYLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export PolicyList_out
-  {
-  public:
-    PolicyList_out (PolicyList *&);
-    PolicyList_out (PolicyList_var &);
-    PolicyList_out (const PolicyList_out &);
-    PolicyList_out &operator= (const PolicyList_out &);
-    PolicyList_out &operator= (PolicyList *);
-    operator PolicyList *&();
-    PolicyList *&ptr (void);
-    PolicyList *operator-> (void);
-    TAO_Object_Manager<Policy, Policy_var> operator[] (CORBA::ULong index);
-  
-  private:
-    PolicyList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const PolicyList_var &);
+    typedef PolicyList_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_
-  
-  class TAO_Export _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void);
-    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA::ULong *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
-        const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
-      );
-    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &operator= (
-        const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void);
-    
-    // = Accessors.
-    CORBA::ULong &operator[] (CORBA::ULong i);
-    const CORBA::ULong &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static CORBA::ULong *allocbuf (CORBA::ULong size);
-    static void freebuf (CORBA::ULong *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA::ULong *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong *data,
-        CORBA::Boolean release
-      );
-  };
 
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList;
 
-#if !defined (_CORBA_POLICYTYPESEQ_CH_)
-#define _CORBA_POLICYTYPESEQ_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class PolicyTypeSeq;
-  class PolicyTypeSeq_var;
-  
-  // *************************************************************
-  // CORBA::PolicyTypeSeq
-  // *************************************************************
-  
-  class TAO_Export PolicyTypeSeq : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_FixedSeq_Var_T<
+        PolicyTypeSeq,
+        CORBA::PolicyType
+      >
+    PolicyTypeSeq_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        PolicyTypeSeq,
+        PolicyTypeSeq_var,
+        CORBA::PolicyType
+      >
+    PolicyTypeSeq_out;
+
+  class TAO_Export PolicyTypeSeq
+    : public
+        TAO_Unbounded_Sequence<
+            CORBA::PolicyType
+          >
   {
   public:
     PolicyTypeSeq (void);
     PolicyTypeSeq (CORBA::ULong max);
     PolicyTypeSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::ULong *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::ULong* buffer,
         CORBA::Boolean release = 0
       );
     PolicyTypeSeq (const PolicyTypeSeq &);
     ~PolicyTypeSeq (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef PolicyTypeSeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYTYPESEQ___VAR_CH_)
-#define _CORBA_POLICYTYPESEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::PolicyTypeSeq_var
-  // *************************************************************
-  
-  class TAO_Export PolicyTypeSeq_var
-  {
-  public:
-    PolicyTypeSeq_var (void);
-    PolicyTypeSeq_var (PolicyTypeSeq *);
-    PolicyTypeSeq_var (const PolicyTypeSeq_var &);
-    
-    // Fixed-size base types only.
-    PolicyTypeSeq_var (const PolicyTypeSeq &);
-    
-    ~PolicyTypeSeq_var (void);
-    
-    PolicyTypeSeq_var &operator= (PolicyTypeSeq *);
-    PolicyTypeSeq_var &operator= (const PolicyTypeSeq_var &);
-    
-    // Fixed-size base types only.
-    PolicyTypeSeq_var &operator= (const PolicyTypeSeq &);
-    
-    PolicyTypeSeq *operator-> (void);
-    const PolicyTypeSeq *operator-> (void) const;
-    
-    operator const PolicyTypeSeq &() const;
-    operator PolicyTypeSeq &();
-    operator PolicyTypeSeq &() const;
-    PolicyType & operator[] (CORBA::ULong index);
-    const PolicyType & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const PolicyTypeSeq &in (void) const;
-    PolicyTypeSeq &inout (void);
-    PolicyTypeSeq *&out (void);
-    PolicyTypeSeq *_retn (void);
-    PolicyTypeSeq *ptr (void) const;
-  
-  private:
-    PolicyTypeSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_POLICYTYPESEQ___OUT_CH_)
-#define _CORBA_POLICYTYPESEQ___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_Export PolicyTypeSeq_out
-  {
-  public:
-    PolicyTypeSeq_out (PolicyTypeSeq *&);
-    PolicyTypeSeq_out (PolicyTypeSeq_var &);
-    PolicyTypeSeq_out (const PolicyTypeSeq_out &);
-    PolicyTypeSeq_out &operator= (const PolicyTypeSeq_out &);
-    PolicyTypeSeq_out &operator= (PolicyTypeSeq *);
-    operator PolicyTypeSeq *&();
-    PolicyTypeSeq *&ptr (void);
-    PolicyTypeSeq *operator-> (void);
-    PolicyType & operator[] (CORBA::ULong index);
-  
-  private:
-    PolicyTypeSeq *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const PolicyTypeSeq_var &);
+    typedef PolicyTypeSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum SetOverrideType
   {
     SET_OVERRIDE,
     ADD_OVERRIDE
   };
-  
+
   typedef SetOverrideType &SetOverrideType_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType;
 
 // TAO_IDL - Generated from
@@ -541,50 +241,6 @@ TAO_NAMESPACE  CORBA
 TAO_NAMESPACE_CLOSE // module CORBA
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:103
-
-// External declarations for undefined interface
-
-// CORBA::Policy
-TAO_Export
-CORBA::Policy_ptr
-tao_CORBA_Policy_duplicate (
-    CORBA::Policy_ptr
-  );
-
-TAO_Export
-void
-tao_CORBA_Policy_release (
-    CORBA::Policy_ptr
-  );
-
-TAO_Export
-CORBA::Policy_ptr
-tao_CORBA_Policy_nil (
-    void
-  );
-
-TAO_Export
-CORBA::Policy_ptr
-tao_CORBA_Policy_narrow (
-    CORBA::Object *
-    ACE_ENV_ARG_DECL_NOT_USED
-  );
-
-TAO_Export
-CORBA::Object *
-tao_CORBA_Policy_upcast (
-    void *
-  );
-
-TAO_Export
-CORBA::Boolean
-tao_CORBA_Policy_marshal (
-    CORBA::Policy_ptr,
-    TAO_OutputCDR &
-  );
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
@@ -671,7 +327,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "Policy_ForwardC.i"
@@ -687,4 +343,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/Policy_ForwardC.i b/TAO/tao/Policy_ForwardC.i
index 6da5cf38028..2a094345f0a 100644
--- a/TAO/tao/Policy_ForwardC.i
+++ b/TAO/tao/Policy_ForwardC.i
@@ -20,910 +20,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_
-
-ACE_INLINE
-CORBA::Policy **
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong nelems)
-{
-  CORBA::Policy **buf = 0;
-  
-  ACE_NEW_RETURN (buf, CORBA::Policy*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = tao_CORBA_Policy_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA::Policy **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::Policy* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList(
-    const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::Policy **tmp1 =
-        _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
-      CORBA::Policy ** const tmp2 =
-        ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = tao_CORBA_Policy_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList &
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (
-    const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      CORBA::Policy **tmp =
-        ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tao_CORBA_Policy_release (tmp[i]);
-          tmp[i] = tao_CORBA_Policy_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::Policy **tmp1 =
-    ACE_reinterpret_cast (CORBA::Policy **, this->buffer_);
-  
-  CORBA::Policy ** const tmp2 =
-    ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = tao_CORBA_Policy_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  CORBA::Policy ** const tmp =
-    ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-CORBA::Policy* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Policy **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::Policy**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::Policy**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::Policy* *
-CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Policy ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_POLICYLIST_CI_)
-#define _CORBA_POLICYLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::PolicyList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::PolicyList_var::PolicyList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::PolicyList_var::PolicyList_var (PolicyList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::PolicyList_var::PolicyList_var (const ::CORBA::PolicyList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::PolicyList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::PolicyList_var::~PolicyList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyList_var &
-CORBA::PolicyList_var::operator= (PolicyList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::PolicyList_var &
-CORBA::PolicyList_var::operator= (const ::CORBA::PolicyList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PolicyList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PolicyList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PolicyList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::PolicyList *
-CORBA::PolicyList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyList *
-CORBA::PolicyList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyList_var::operator const ::CORBA::PolicyList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyList_var::operator ::CORBA::PolicyList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyList_var::operator ::CORBA::PolicyList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::PolicyList_var::operator ::CORBA::PolicyList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
-CORBA::PolicyList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::PolicyList &
-CORBA::PolicyList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyList &
-CORBA::PolicyList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyList *&
-CORBA::PolicyList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyList *
-CORBA::PolicyList_var::_retn (void)
-{
-  ::CORBA::PolicyList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::PolicyList *
-CORBA::PolicyList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class CORBA::PolicyList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::PolicyList_out::PolicyList_out (PolicyList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::PolicyList_out::PolicyList_out (PolicyList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::PolicyList_out::PolicyList_out (const ::CORBA::PolicyList_out &p)
-  : ptr_ (ACE_const_cast (PolicyList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::PolicyList_out &
-CORBA::PolicyList_out::operator= (const ::CORBA::PolicyList_out &p)
-{
-  this->ptr_ = ACE_const_cast (PolicyList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::PolicyList_out &
-CORBA::PolicyList_out::operator= (PolicyList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::PolicyList_out::operator ::CORBA::PolicyList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyList *&
-CORBA::PolicyList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyList *
-CORBA::PolicyList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var>
-CORBA::PolicyList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_
-
-ACE_INLINE
-CORBA::ULong *
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (CORBA::ULong size)
-{
-  CORBA::ULong *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (
-    const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ULong *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->maximum_);
-      CORBA::ULong * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ULong *tmp =
-            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ULong *tmp1 =
-    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  CORBA::ULong * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ULong &
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong* tmp =
-    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ULong &
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong * const tmp =
-    ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ULong *
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ULong *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ULong *
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp =
-        ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_POLICYTYPESEQ_CI_)
-#define _CORBA_POLICYTYPESEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::PolicyTypeSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (PolicyTypeSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::PolicyTypeSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size base types only.
-ACE_INLINE
-CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq &p)
-{
-  ACE_NEW (this->ptr_, ::CORBA::PolicyTypeSeq (p));
-}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_var::~PolicyTypeSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_var &
-CORBA::PolicyTypeSeq_var::operator= (PolicyTypeSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq_var &
-CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PolicyTypeSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PolicyTypeSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PolicyTypeSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// Fixed-size types only.
-ACE_INLINE
-::CORBA::PolicyTypeSeq_var &
-CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq &p)
-{
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::PolicyTypeSeq *
-CORBA::PolicyTypeSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq *
-CORBA::PolicyTypeSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_var::operator const ::CORBA::PolicyTypeSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyType &
-CORBA::PolicyTypeSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::PolicyType &
-CORBA::PolicyTypeSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::PolicyType &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::CORBA::PolicyTypeSeq &
-CORBA::PolicyTypeSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq &
-CORBA::PolicyTypeSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq *&
-CORBA::PolicyTypeSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq *
-CORBA::PolicyTypeSeq_var::_retn (void)
-{
-  ::CORBA::PolicyTypeSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq *
-CORBA::PolicyTypeSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class CORBA::PolicyTypeSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (const ::CORBA::PolicyTypeSeq_out &p)
-  : ptr_ (ACE_const_cast (PolicyTypeSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq_out &
-CORBA::PolicyTypeSeq_out::operator= (const ::CORBA::PolicyTypeSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (PolicyTypeSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq_out &
-CORBA::PolicyTypeSeq_out::operator= (PolicyTypeSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::PolicyTypeSeq_out::operator ::CORBA::PolicyTypeSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq *&
-CORBA::PolicyTypeSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::PolicyTypeSeq *
-CORBA::PolicyTypeSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::PolicyType &
-CORBA::PolicyTypeSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index c7ac789610e..6ee351cd664 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -37,8 +37,6 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -53,7 +51,7 @@
 int CORBA::Pollable::_tao_class_id = 0;
 
 CORBA::Pollable_ptr
-tao_CORBA_Pollable_duplicate (
+CORBA::tao_Pollable_life::tao_duplicate (
     CORBA::Pollable_ptr p
   )
 {
@@ -61,7 +59,7 @@ tao_CORBA_Pollable_duplicate (
 }
 
 void
-tao_CORBA_Pollable_release (
+CORBA::tao_Pollable_life::tao_release (
     CORBA::Pollable_ptr p
   )
 {
@@ -69,231 +67,67 @@ tao_CORBA_Pollable_release (
 }
 
 CORBA::Pollable_ptr
-tao_CORBA_Pollable_nil (
+CORBA::tao_Pollable_life::tao_nil (
     void
   )
 {
   return CORBA::Pollable::_nil ();
 }
 
-CORBA::Pollable_ptr
-tao_CORBA_Pollable_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_Pollable_upcast (
-    void *src
-  )
-{
-  CORBA::Pollable **tmp =
-    ACE_static_cast (CORBA::Pollable **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_Pollable_marshal (
+CORBA::tao_Pollable_life::tao_marshal (
     CORBA::Pollable_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::Pollable_var
-// *************************************************************
-
-CORBA::Pollable_var::Pollable_var (void)
-  : ptr_ (Pollable::_nil ())
-{}
-
-::CORBA::Pollable_ptr
-CORBA::Pollable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::Pollable_var::Pollable_var (const ::CORBA::Pollable_var &p)
-  : TAO_Base_var (),
-    ptr_ (Pollable::_duplicate (p.ptr ()))
-{}
-
-CORBA::Pollable_var::~Pollable_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::Pollable_var &
-CORBA::Pollable_var::operator= (Pollable_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Pollable_var &
-CORBA::Pollable_var::operator= (const ::CORBA::Pollable_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::Pollable::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::Pollable_var::operator const ::CORBA::Pollable_ptr &() const // cast
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-CORBA::Pollable_var::operator ::CORBA::Pollable_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::Pollable_ptr
-CORBA::Pollable_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Pollable_ptr
-CORBA::Pollable_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::Pollable_ptr &
-CORBA::Pollable_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Pollable_ptr &
-CORBA::Pollable_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Pollable::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::Pollable_ptr
-CORBA::Pollable_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::Pollable_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::Pollable::_nil ();
-  return val;
-}
-
-::CORBA::Pollable_ptr
-CORBA::Pollable_var::tao_duplicate (Pollable_ptr p)
-{
-  return ::CORBA::Pollable::_duplicate (p);
-}
-
-void
-CORBA::Pollable_var::tao_release (Pollable_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::Pollable_ptr
-CORBA::Pollable_var::tao_nil (void)
-{
-  return ::CORBA::Pollable::_nil ();
-}
-
-::CORBA::Pollable_ptr
-CORBA::Pollable_var::tao_narrow (
+CORBA::Pollable_ptr
+CORBA::tao_Pollable_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::Pollable_var::tao_upcast (void *src)
+CORBA::tao_Pollable_cast::tao_upcast (
+    void *src
+  )
 {
-  Pollable **tmp =
-    ACE_static_cast (Pollable **, src);
+  CORBA::Pollable **tmp =
+    ACE_static_cast (CORBA::Pollable **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::Pollable_out
-// *************************************************************
-
-CORBA::Pollable_out::Pollable_out (Pollable_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::Pollable::_nil ();
-}
-
-CORBA::Pollable_out::Pollable_out (Pollable_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::Pollable::_nil ();
-}
-
-CORBA::Pollable_out::Pollable_out (const ::CORBA::Pollable_out &p)
-  : ptr_ (ACE_const_cast (Pollable_out &, p).ptr_)
-{}
-
-::CORBA::Pollable_out &
-CORBA::Pollable_out::operator= (const ::CORBA::Pollable_out &p)
-{
-  this->ptr_ = ACE_const_cast (Pollable_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::Pollable_out &
-CORBA::Pollable_out::operator= (const ::CORBA::Pollable_var &p)
-{
-  this->ptr_ = ::CORBA::Pollable::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::Pollable_out &
-CORBA::Pollable_out::operator= (Pollable_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::Pollable_out::operator ::CORBA::Pollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::Pollable_ptr &
-CORBA::Pollable_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::Pollable_ptr
-CORBA::Pollable_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::Pollable,
+        CORBA::tao_Pollable_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::Pollable,
+        CORBA::tao_Pollable_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::Pollable, \
+        CORBA::tao_Pollable_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::Pollable, \
+        CORBA::tao_Pollable_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::Pollable::Pollable (void)
 {}
@@ -380,13 +214,19 @@ const char* CORBA::Pollable::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Pollable:1.0";
 }
 
+CORBA::Boolean
+CORBA::Pollable::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::DIIPollable::_tao_class_id = 0;
 
 CORBA::DIIPollable_ptr
-tao_CORBA_DIIPollable_duplicate (
+CORBA::tao_DIIPollable_life::tao_duplicate (
     CORBA::DIIPollable_ptr p
   )
 {
@@ -394,7 +234,7 @@ tao_CORBA_DIIPollable_duplicate (
 }
 
 void
-tao_CORBA_DIIPollable_release (
+CORBA::tao_DIIPollable_life::tao_release (
     CORBA::DIIPollable_ptr p
   )
 {
@@ -402,231 +242,67 @@ tao_CORBA_DIIPollable_release (
 }
 
 CORBA::DIIPollable_ptr
-tao_CORBA_DIIPollable_nil (
+CORBA::tao_DIIPollable_life::tao_nil (
     void
   )
 {
   return CORBA::DIIPollable::_nil ();
 }
 
-CORBA::DIIPollable_ptr
-tao_CORBA_DIIPollable_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_DIIPollable_upcast (
-    void *src
-  )
-{
-  CORBA::DIIPollable **tmp =
-    ACE_static_cast (CORBA::DIIPollable **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_DIIPollable_marshal (
+CORBA::tao_DIIPollable_life::tao_marshal (
     CORBA::DIIPollable_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::DIIPollable_var
-// *************************************************************
-
-CORBA::DIIPollable_var::DIIPollable_var (void)
-  : ptr_ (DIIPollable::_nil ())
-{}
-
-::CORBA::DIIPollable_ptr
-CORBA::DIIPollable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::DIIPollable_var::DIIPollable_var (const ::CORBA::DIIPollable_var &p)
-  : TAO_Base_var (),
-    ptr_ (DIIPollable::_duplicate (p.ptr ()))
-{}
-
-CORBA::DIIPollable_var::~DIIPollable_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::DIIPollable_var &
-CORBA::DIIPollable_var::operator= (DIIPollable_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::DIIPollable_var &
-CORBA::DIIPollable_var::operator= (const ::CORBA::DIIPollable_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::DIIPollable::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::DIIPollable_var::operator const ::CORBA::DIIPollable_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::DIIPollable_var::operator ::CORBA::DIIPollable_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::DIIPollable_ptr
-CORBA::DIIPollable_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::DIIPollable_ptr
-CORBA::DIIPollable_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::DIIPollable_ptr &
-CORBA::DIIPollable_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::DIIPollable_ptr &
-CORBA::DIIPollable_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::DIIPollable::_nil ();
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::DIIPollable_ptr
-CORBA::DIIPollable_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::DIIPollable_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::DIIPollable::_nil ();
-  return val;
-}
-
-::CORBA::DIIPollable_ptr
-CORBA::DIIPollable_var::tao_duplicate (DIIPollable_ptr p)
-{
-  return ::CORBA::DIIPollable::_duplicate (p);
-}
-
-void
-CORBA::DIIPollable_var::tao_release (DIIPollable_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::DIIPollable_ptr
-CORBA::DIIPollable_var::tao_nil (void)
-{
-  return ::CORBA::DIIPollable::_nil ();
-}
-
-::CORBA::DIIPollable_ptr
-CORBA::DIIPollable_var::tao_narrow (
+CORBA::DIIPollable_ptr
+CORBA::tao_DIIPollable_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::DIIPollable_var::tao_upcast (void *src)
+CORBA::tao_DIIPollable_cast::tao_upcast (
+    void *src
+  )
 {
-  DIIPollable **tmp =
-    ACE_static_cast (DIIPollable **, src);
+  CORBA::DIIPollable **tmp =
+    ACE_static_cast (CORBA::DIIPollable **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::DIIPollable_out
-// *************************************************************
-
-CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::DIIPollable::_nil ();
-}
-
-CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::DIIPollable::_nil ();
-}
-
-CORBA::DIIPollable_out::DIIPollable_out (const ::CORBA::DIIPollable_out &p)
-  : ptr_ (ACE_const_cast (DIIPollable_out &, p).ptr_)
-{}
-
-::CORBA::DIIPollable_out &
-CORBA::DIIPollable_out::operator= (const ::CORBA::DIIPollable_out &p)
-{
-  this->ptr_ = ACE_const_cast (DIIPollable_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::DIIPollable_out &
-CORBA::DIIPollable_out::operator= (const ::CORBA::DIIPollable_var &p)
-{
-  this->ptr_ = ::CORBA::DIIPollable::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::DIIPollable_out &
-CORBA::DIIPollable_out::operator= (DIIPollable_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::DIIPollable_out::operator ::CORBA::DIIPollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::DIIPollable_ptr &
-CORBA::DIIPollable_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::DIIPollable_ptr
-CORBA::DIIPollable_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::DIIPollable,
+        CORBA::tao_DIIPollable_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::DIIPollable,
+        CORBA::tao_DIIPollable_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::DIIPollable, \
+        CORBA::tao_DIIPollable_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::DIIPollable, \
+        CORBA::tao_DIIPollable_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::DIIPollable::DIIPollable (void)
 {}
@@ -727,13 +403,19 @@ const char* CORBA::DIIPollable::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DIIPollable:1.0";
 }
 
+CORBA::Boolean
+CORBA::DIIPollable::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int CORBA::PollableSet::_tao_class_id = 0;
 
 CORBA::PollableSet_ptr
-tao_CORBA_PollableSet_duplicate (
+CORBA::tao_PollableSet_life::tao_duplicate (
     CORBA::PollableSet_ptr p
   )
 {
@@ -741,7 +423,7 @@ tao_CORBA_PollableSet_duplicate (
 }
 
 void
-tao_CORBA_PollableSet_release (
+CORBA::tao_PollableSet_life::tao_release (
     CORBA::PollableSet_ptr p
   )
 {
@@ -749,231 +431,67 @@ tao_CORBA_PollableSet_release (
 }
 
 CORBA::PollableSet_ptr
-tao_CORBA_PollableSet_nil (
+CORBA::tao_PollableSet_life::tao_nil (
     void
   )
 {
   return CORBA::PollableSet::_nil ();
 }
 
-CORBA::PollableSet_ptr
-tao_CORBA_PollableSet_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_CORBA_PollableSet_upcast (
-    void *src
-  )
-{
-  CORBA::PollableSet **tmp =
-    ACE_static_cast (CORBA::PollableSet **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_CORBA_PollableSet_marshal (
+CORBA::tao_PollableSet_life::tao_marshal (
     CORBA::PollableSet_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::PollableSet_var
-// *************************************************************
-
-CORBA::PollableSet_var::PollableSet_var (void)
-  : ptr_ (PollableSet::_nil ())
-{}
-
-::CORBA::PollableSet_ptr
-CORBA::PollableSet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::PollableSet_var::PollableSet_var (const ::CORBA::PollableSet_var &p)
-  : TAO_Base_var (),
-    ptr_ (PollableSet::_duplicate (p.ptr ()))
-{}
-
-CORBA::PollableSet_var::~PollableSet_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::PollableSet_var &
-CORBA::PollableSet_var::operator= (PollableSet_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::PollableSet_var &
-CORBA::PollableSet_var::operator= (const ::CORBA::PollableSet_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::PollableSet::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::PollableSet_var::operator const ::CORBA::PollableSet_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::PollableSet_var::operator ::CORBA::PollableSet_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::PollableSet_ptr
-CORBA::PollableSet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::PollableSet_ptr
-CORBA::PollableSet_var::in (void) const
-{
-  return this->ptr_;
+  return p->marshal (cdr);
 }
 
-::CORBA::PollableSet_ptr &
-CORBA::PollableSet_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::PollableSet_ptr &
-CORBA::PollableSet_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::PollableSet::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::PollableSet_ptr
-CORBA::PollableSet_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::PollableSet_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::PollableSet::_nil ();
-  return val;
-}
-
-::CORBA::PollableSet_ptr
-CORBA::PollableSet_var::tao_duplicate (PollableSet_ptr p)
-{
-  return ::CORBA::PollableSet::_duplicate (p);
-}
-
-void
-CORBA::PollableSet_var::tao_release (PollableSet_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::PollableSet_ptr
-CORBA::PollableSet_var::tao_nil (void)
-{
-  return ::CORBA::PollableSet::_nil ();
-}
-
-::CORBA::PollableSet_ptr
-CORBA::PollableSet_var::tao_narrow (
+CORBA::PollableSet_ptr
+CORBA::tao_PollableSet_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-CORBA::PollableSet_var::tao_upcast (void *src)
+CORBA::tao_PollableSet_cast::tao_upcast (
+    void *src
+  )
 {
-  PollableSet **tmp =
-    ACE_static_cast (PollableSet **, src);
+  CORBA::PollableSet **tmp =
+    ACE_static_cast (CORBA::PollableSet **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::PollableSet_out
-// *************************************************************
-
-CORBA::PollableSet_out::PollableSet_out (PollableSet_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::PollableSet::_nil ();
-}
-
-CORBA::PollableSet_out::PollableSet_out (PollableSet_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::PollableSet::_nil ();
-}
-
-CORBA::PollableSet_out::PollableSet_out (const ::CORBA::PollableSet_out &p)
-  : ptr_ (ACE_const_cast (PollableSet_out &, p).ptr_)
-{}
-
-::CORBA::PollableSet_out &
-CORBA::PollableSet_out::operator= (const ::CORBA::PollableSet_out &p)
-{
-  this->ptr_ = ACE_const_cast (PollableSet_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::PollableSet_out &
-CORBA::PollableSet_out::operator= (const ::CORBA::PollableSet_var &p)
-{
-  this->ptr_ = ::CORBA::PollableSet::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::PollableSet_out &
-CORBA::PollableSet_out::operator= (PollableSet_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::PollableSet_out::operator ::CORBA::PollableSet_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::PollableSet_ptr &
-CORBA::PollableSet_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::PollableSet_ptr
-CORBA::PollableSet_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::PollableSet,
+        CORBA::tao_PollableSet_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::PollableSet,
+        CORBA::tao_PollableSet_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::PollableSet, \
+        CORBA::tao_PollableSet_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::PollableSet, \
+        CORBA::tao_PollableSet_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::PollableSet::PollableSet (void)
 {}
@@ -1060,6 +578,12 @@ const char* CORBA::PollableSet::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/PollableSet:1.0";
 }
 
+CORBA::Boolean
+CORBA::PollableSet::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
@@ -1086,7 +610,7 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::Polla
 CORBA::PollableSet::NoPossiblePollable&
 CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
 {
-  this->UserException::operator= (_tao_excp);
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -1171,7 +695,7 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet
 CORBA::PollableSet::UnknownPollable&
 CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
 {
-  this->UserException::operator= (_tao_excp);
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -1228,7 +752,7 @@ void CORBA::PollableSet::UnknownPollable::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-#endif /* TAO_HAS_AMI_POLLER == 1 */
 
+#endif /* TAO_HAS_AMI_POLLER == 1 */
 
 
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index e82096e2673..fda74bd19fc 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -26,7 +26,7 @@
 #define _TAO_IDL_ORIG_POLLABLEC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "Exception.h"
 
 #if (TAO_HAS_AMI_POLLER == 1)
 
@@ -34,8 +34,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "Exception.h"
 #include "Object.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -68,174 +66,75 @@ TAO_NAMESPACE  CORBA
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class PollableSet;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_POLLABLESET___PTR_CH_)
-#define _CORBA_POLLABLESET___PTR_CH_
+#if !defined (_CORBA_POLLABLESET__ODDS_N_ENDS_CH_)
+#define _CORBA_POLLABLESET__ODDS_N_ENDS_CH_
   
+  class PollableSet;
   typedef PollableSet *PollableSet_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLLABLESET___VAR_CH_)
-#define _CORBA_POLLABLESET___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  struct tao_PollableSet_life;
+  typedef TAO_Objref_Var_T<PollableSet, tao_PollableSet_life> PollableSet_var;
+  typedef TAO_Objref_Out_T<PollableSet, tao_PollableSet_life> PollableSet_out;
   
-  class TAO_Export PollableSet_var : public TAO_Base_var
+  struct TAO_Export tao_PollableSet_life
   {
-  public:
-    PollableSet_var (void); // default constructor
-    PollableSet_var (PollableSet_ptr p) : ptr_ (p) {} 
-    PollableSet_var (const PollableSet_var &); // copy constructor
-    ~PollableSet_var (void); // destructor
-    
-    PollableSet_var &operator= (PollableSet_ptr);
-    PollableSet_var &operator= (const PollableSet_var &);
-    PollableSet_ptr operator-> (void) const;
-    
-    operator const PollableSet_ptr &() const;
-    operator PollableSet_ptr &();
-    // in, inout, out, _retn 
-    PollableSet_ptr in (void) const;
-    PollableSet_ptr &inout (void);
-    PollableSet_ptr &out (void);
-    PollableSet_ptr _retn (void);
-    PollableSet_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static PollableSet_ptr tao_duplicate (PollableSet_ptr);
     static void tao_release (PollableSet_ptr);
     static PollableSet_ptr tao_nil (void);
-    static PollableSet_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        PollableSet_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PollableSet_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PollableSet_var (const TAO_Base_var &rhs);
-    PollableSet_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLLABLESET___OUT_CH_)
-#define _CORBA_POLLABLESET___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export PollableSet_out
+  struct TAO_Export tao_PollableSet_cast
   {
-  public:
-    PollableSet_out (PollableSet_ptr &);
-    PollableSet_out (PollableSet_var &);
-    PollableSet_out (const PollableSet_out &);
-    PollableSet_out &operator= (const PollableSet_out &);
-    PollableSet_out &operator= (const PollableSet_var &);
-    PollableSet_out &operator= (PollableSet_ptr);
-    operator PollableSet_ptr &();
-    PollableSet_ptr &ptr (void);
-    PollableSet_ptr operator-> (void);
-  
-  private:
-    PollableSet_ptr &ptr_;
+    static PollableSet_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_POLLABLE___PTR_CH_)
-#define _CORBA_POLLABLE___PTR_CH_
+#if !defined (_CORBA_POLLABLE__ODDS_N_ENDS_CH_)
+#define _CORBA_POLLABLE__ODDS_N_ENDS_CH_
   
   class Pollable;
   typedef Pollable *Pollable_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLLABLE___VAR_CH_)
-#define _CORBA_POLLABLE___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  struct tao_Pollable_life;
+  typedef TAO_Objref_Var_T<Pollable, tao_Pollable_life> Pollable_var;
+  typedef TAO_Objref_Out_T<Pollable, tao_Pollable_life> Pollable_out;
   
-  class TAO_Export Pollable_var : public TAO_Base_var
+  struct TAO_Export tao_Pollable_life
   {
-  public:
-    Pollable_var (void); // default constructor
-    Pollable_var (Pollable_ptr p) : ptr_ (p) {} 
-    Pollable_var (const Pollable_var &); // copy constructor
-    ~Pollable_var (void); // destructor
-    
-    Pollable_var &operator= (Pollable_ptr);
-    Pollable_var &operator= (const Pollable_var &);
-    Pollable_ptr operator-> (void) const;
-    
-    operator const Pollable_ptr &() const;
-    operator Pollable_ptr &();
-    // in, inout, out, _retn 
-    Pollable_ptr in (void) const;
-    Pollable_ptr &inout (void);
-    Pollable_ptr &out (void);
-    Pollable_ptr _retn (void);
-    Pollable_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Pollable_ptr tao_duplicate (Pollable_ptr);
     static void tao_release (Pollable_ptr);
     static Pollable_ptr tao_nil (void);
-    static Pollable_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Pollable_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Pollable_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Pollable_var (const TAO_Base_var &rhs);
-    Pollable_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLLABLE___OUT_CH_)
-#define _CORBA_POLLABLE___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export Pollable_out
+  struct TAO_Export tao_Pollable_cast
   {
-  public:
-    Pollable_out (Pollable_ptr &);
-    Pollable_out (Pollable_var &);
-    Pollable_out (const Pollable_out &);
-    Pollable_out &operator= (const Pollable_out &);
-    Pollable_out &operator= (const Pollable_var &);
-    Pollable_out &operator= (Pollable_ptr);
-    operator Pollable_ptr &();
-    Pollable_ptr &ptr (void);
-    Pollable_ptr operator-> (void);
-  
-  private:
-    Pollable_ptr &ptr_;
+    static Pollable_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLLABLE_CH_)
 #define _CORBA_POLLABLE_CH_
@@ -290,7 +189,7 @@ TAO_NAMESPACE  CORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -300,7 +199,7 @@ TAO_NAMESPACE  CORBA
   protected:
     Pollable (void);
     virtual ~Pollable (void);
-    
+  
   private:
     Pollable (const Pollable &);
     void operator= (const Pollable &);
@@ -309,90 +208,41 @@ TAO_NAMESPACE  CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_DIIPOLLABLE___PTR_CH_)
-#define _CORBA_DIIPOLLABLE___PTR_CH_
+#if !defined (_CORBA_DIIPOLLABLE__ODDS_N_ENDS_CH_)
+#define _CORBA_DIIPOLLABLE__ODDS_N_ENDS_CH_
   
   class DIIPollable;
   typedef DIIPollable *DIIPollable_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_DIIPOLLABLE___VAR_CH_)
-#define _CORBA_DIIPOLLABLE___VAR_CH_
+  struct tao_DIIPollable_life;
+  typedef TAO_Objref_Var_T<DIIPollable, tao_DIIPollable_life> DIIPollable_var;
+  typedef TAO_Objref_Out_T<DIIPollable, tao_DIIPollable_life> DIIPollable_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export DIIPollable_var : public TAO_Base_var
+  struct TAO_Export tao_DIIPollable_life
   {
-  public:
-    DIIPollable_var (void); // default constructor
-    DIIPollable_var (DIIPollable_ptr p) : ptr_ (p) {} 
-    DIIPollable_var (const DIIPollable_var &); // copy constructor
-    ~DIIPollable_var (void); // destructor
-    
-    DIIPollable_var &operator= (DIIPollable_ptr);
-    DIIPollable_var &operator= (const DIIPollable_var &);
-    DIIPollable_ptr operator-> (void) const;
-    
-    operator const DIIPollable_ptr &() const;
-    operator DIIPollable_ptr &();
-    // in, inout, out, _retn 
-    DIIPollable_ptr in (void) const;
-    DIIPollable_ptr &inout (void);
-    DIIPollable_ptr &out (void);
-    DIIPollable_ptr _retn (void);
-    DIIPollable_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static DIIPollable_ptr tao_duplicate (DIIPollable_ptr);
     static void tao_release (DIIPollable_ptr);
     static DIIPollable_ptr tao_nil (void);
-    static DIIPollable_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        DIIPollable_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    DIIPollable_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    DIIPollable_var (const TAO_Base_var &rhs);
-    DIIPollable_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_DIIPOLLABLE___OUT_CH_)
-#define _CORBA_DIIPOLLABLE___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export DIIPollable_out
+  struct TAO_Export tao_DIIPollable_cast
   {
-  public:
-    DIIPollable_out (DIIPollable_ptr &);
-    DIIPollable_out (DIIPollable_var &);
-    DIIPollable_out (const DIIPollable_out &);
-    DIIPollable_out &operator= (const DIIPollable_out &);
-    DIIPollable_out &operator= (const DIIPollable_var &);
-    DIIPollable_out &operator= (DIIPollable_ptr);
-    operator DIIPollable_ptr &();
-    DIIPollable_ptr &ptr (void);
-    DIIPollable_ptr operator-> (void);
-  
-  private:
-    DIIPollable_ptr &ptr_;
+    static DIIPollable_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_DIIPOLLABLE_CH_)
 #define _CORBA_DIIPOLLABLE_CH_
@@ -426,7 +276,7 @@ TAO_NAMESPACE  CORBA
     
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -436,7 +286,7 @@ TAO_NAMESPACE  CORBA
   protected:
     DIIPollable (void);
     virtual ~DIIPollable (void);
-    
+  
   private:
     DIIPollable (const DIIPollable &);
     void operator= (const DIIPollable &);
@@ -445,90 +295,7 @@ TAO_NAMESPACE  CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_CORBA_POLLABLESET___PTR_CH_)
-#define _CORBA_POLLABLESET___PTR_CH_
-  
-  class PollableSet;
-  typedef PollableSet *PollableSet_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLLABLESET___VAR_CH_)
-#define _CORBA_POLLABLESET___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export PollableSet_var : public TAO_Base_var
-  {
-  public:
-    PollableSet_var (void); // default constructor
-    PollableSet_var (PollableSet_ptr p) : ptr_ (p) {} 
-    PollableSet_var (const PollableSet_var &); // copy constructor
-    ~PollableSet_var (void); // destructor
-    
-    PollableSet_var &operator= (PollableSet_ptr);
-    PollableSet_var &operator= (const PollableSet_var &);
-    PollableSet_ptr operator-> (void) const;
-    
-    operator const PollableSet_ptr &() const;
-    operator PollableSet_ptr &();
-    // in, inout, out, _retn 
-    PollableSet_ptr in (void) const;
-    PollableSet_ptr &inout (void);
-    PollableSet_ptr &out (void);
-    PollableSet_ptr _retn (void);
-    PollableSet_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static PollableSet_ptr tao_duplicate (PollableSet_ptr);
-    static void tao_release (PollableSet_ptr);
-    static PollableSet_ptr tao_nil (void);
-    static PollableSet_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PollableSet_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PollableSet_var (const TAO_Base_var &rhs);
-    PollableSet_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLLABLESET___OUT_CH_)
-#define _CORBA_POLLABLESET___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export PollableSet_out
-  {
-  public:
-    PollableSet_out (PollableSet_ptr &);
-    PollableSet_out (PollableSet_var &);
-    PollableSet_out (const PollableSet_out &);
-    PollableSet_out &operator= (const PollableSet_out &);
-    PollableSet_out &operator= (const PollableSet_var &);
-    PollableSet_out &operator= (PollableSet_ptr);
-    operator PollableSet_ptr &();
-    PollableSet_ptr &ptr (void);
-    PollableSet_ptr operator-> (void);
-  
-  private:
-    PollableSet_ptr &ptr_;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLLABLESET_CH_)
 #define _CORBA_POLLABLESET_CH_
@@ -695,7 +462,7 @@ TAO_NAMESPACE  CORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -705,10 +472,6 @@ TAO_NAMESPACE  CORBA
   protected:
     PollableSet (void);
     virtual ~PollableSet (void);
-    
-    friend class _TAO_PollableSet_Remote_Proxy_Impl;
-    friend class _TAO_PollableSet_ThruPOA_Proxy_Impl;
-    friend class _TAO_PollableSet_Direct_Proxy_Impl;
   
   private:
     PollableSet (const PollableSet &);
@@ -734,7 +497,7 @@ TAO_NAMESPACE_CLOSE // module CORBA
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "PollableC.i"
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
index 437f3407c58..042e3d1523b 100644
--- a/TAO/tao/PollableC.i
+++ b/TAO/tao/PollableC.i
@@ -26,13 +26,6 @@
 #if !defined (_CORBA_POLLABLE___CI_)
 #define _CORBA_POLLABLE___CI_
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::Pollable::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -41,13 +34,6 @@ CORBA::Pollable::marshal (TAO_OutputCDR &)
 #if !defined (_CORBA_DIIPOLLABLE___CI_)
 #define _CORBA_DIIPOLLABLE___CI_
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::DIIPollable::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -56,12 +42,5 @@ CORBA::DIIPollable::marshal (TAO_OutputCDR &)
 #if !defined (_CORBA_POLLABLESET___CI_)
 #define _CORBA_POLLABLESET___CI_
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::PollableSet::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 791953a53d9..e299ce1c9ce 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -50,7 +49,7 @@
 int PortableInterceptor::Interceptor::_tao_class_id = 0;
 
 PortableInterceptor::Interceptor_ptr
-tao_PortableInterceptor_Interceptor_duplicate (
+PortableInterceptor::tao_Interceptor_life::tao_duplicate (
     PortableInterceptor::Interceptor_ptr p
   )
 {
@@ -58,7 +57,7 @@ tao_PortableInterceptor_Interceptor_duplicate (
 }
 
 void
-tao_PortableInterceptor_Interceptor_release (
+PortableInterceptor::tao_Interceptor_life::tao_release (
     PortableInterceptor::Interceptor_ptr p
   )
 {
@@ -66,15 +65,24 @@ tao_PortableInterceptor_Interceptor_release (
 }
 
 PortableInterceptor::Interceptor_ptr
-tao_PortableInterceptor_Interceptor_nil (
+PortableInterceptor::tao_Interceptor_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::Interceptor::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_Interceptor_life::tao_marshal (
+    PortableInterceptor::Interceptor_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::Interceptor_ptr
-tao_PortableInterceptor_Interceptor_narrow (
+PortableInterceptor::tao_Interceptor_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -83,7 +91,7 @@ tao_PortableInterceptor_Interceptor_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_Interceptor_upcast (
+PortableInterceptor::tao_Interceptor_cast::tao_upcast (
     void *src
   )
 {
@@ -92,205 +100,32 @@ tao_PortableInterceptor_Interceptor_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_Interceptor_marshal (
-    PortableInterceptor::Interceptor_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::Interceptor_var
-// *************************************************************
-
-PortableInterceptor::Interceptor_var::Interceptor_var (void)
-  : ptr_ (Interceptor::_nil ())
-{}
-
-::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p)
-  : TAO_Base_var (),
-    ptr_ (Interceptor::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::Interceptor_var::~Interceptor_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::Interceptor_var &
-PortableInterceptor::Interceptor_var::operator= (Interceptor_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::Interceptor_var &
-PortableInterceptor::Interceptor_var::operator= (const ::PortableInterceptor::Interceptor_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::Interceptor::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Interceptor_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Interceptor_ptr &
-PortableInterceptor::Interceptor_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Interceptor_ptr &
-PortableInterceptor::Interceptor_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::Interceptor_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
-  return val;
-}
-
-::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::tao_duplicate (Interceptor_ptr p)
-{
-  return ::PortableInterceptor::Interceptor::_duplicate (p);
-}
-
-void
-PortableInterceptor::Interceptor_var::tao_release (Interceptor_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::tao_nil (void)
-{
-  return ::PortableInterceptor::Interceptor::_nil ();
-}
-
-::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::Interceptor_var::tao_upcast (void *src)
-{
-  Interceptor **tmp =
-    ACE_static_cast (Interceptor **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::Interceptor,
+        PortableInterceptor::tao_Interceptor_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::Interceptor,
+        PortableInterceptor::tao_Interceptor_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::Interceptor, \
+        PortableInterceptor::tao_Interceptor_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::Interceptor, \
+        PortableInterceptor::tao_Interceptor_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::Interceptor_out
-// *************************************************************
-
-PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
-}
-
-PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
-}
-
-PortableInterceptor::Interceptor_out::Interceptor_out (const ::PortableInterceptor::Interceptor_out &p)
-  : ptr_ (ACE_const_cast (Interceptor_out &, p).ptr_)
-{}
-
-::PortableInterceptor::Interceptor_out &
-PortableInterceptor::Interceptor_out::operator= (const ::PortableInterceptor::Interceptor_out &p)
-{
-  this->ptr_ = ACE_const_cast (Interceptor_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::Interceptor_out &
-PortableInterceptor::Interceptor_out::operator= (const ::PortableInterceptor::Interceptor_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::Interceptor::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::Interceptor_out &
-PortableInterceptor::Interceptor_out::operator= (Interceptor_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::Interceptor_out::operator ::PortableInterceptor::Interceptor_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Interceptor_ptr &
-PortableInterceptor::Interceptor_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::Interceptor::Interceptor (void)
 {}
@@ -298,7 +133,7 @@ PortableInterceptor::Interceptor::Interceptor (void)
 PortableInterceptor::Interceptor::~Interceptor (void)
 {}
 
-void 
+void
 PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   Interceptor *tmp = ACE_static_cast (Interceptor *, _tao_void_pointer);
@@ -314,7 +149,7 @@ PortableInterceptor::Interceptor::_narrow (
   return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::Interceptor_ptr 
+PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -324,7 +159,7 @@ PortableInterceptor::Interceptor::_unchecked_narrow (
     {
       return Interceptor::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           Interceptor_ptr,
@@ -344,14 +179,14 @@ PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
@@ -370,12 +205,12 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -384,6 +219,12 @@ const char* PortableInterceptor::Interceptor::_interface_repository_id (void) co
   return "IDL:omg.org/PortableInterceptor/Interceptor:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -391,21 +232,21 @@ static const CORBA::Long _oc_PortableInterceptor_Interceptor[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f723a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Interceptor:1.0
     12,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
   ACE_NTOHL (0x746f7200),  // name = Interceptor
   };
 
@@ -426,7 +267,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
@@ -512,7 +353,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -525,7 +366,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -559,31 +400,47 @@ static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x73743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ForwardRequest:1.0
     15,
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   2, // member count
     8,
-  ACE_NTOHL (0x666f7277), 
+  ACE_NTOHL (0x666f7277),
   ACE_NTOHL (0x61726400),  // name = forward
-      10,
-  ACE_NTOHL (0x7065726d), 
-  ACE_NTOHL (0x616e656e), 
+    CORBA::tk_objref,
+  52, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    29,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f62),
+    ACE_NTOHL (0x6a656374),
+    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
+        7,
+    ACE_NTOHL (0x4f626a65),
+    ACE_NTOHL (0x63740000),  // name = Object
+
+  10,
+  ACE_NTOHL (0x7065726d),
+  ACE_NTOHL (0x616e656e),
   ACE_NTOHL (0x74000000),  // name = permanent
     CORBA::tk_boolean,
 
@@ -613,21 +470,21 @@ static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x7475733a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
+  ACE_NTOHL (0x7475733a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ReplyStatus:1.0
     12,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
   ACE_NTOHL (0x74757300),  // name = ReplyStatus
     CORBA::tk_short,
 
@@ -657,19 +514,19 @@ static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x536c6f74), 
-  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x536c6f74),
+  ACE_NTOHL (0x49643a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/SlotId:1.0
     7,
-  ACE_NTOHL (0x536c6f74), 
+  ACE_NTOHL (0x536c6f74),
   ACE_NTOHL (0x49640000),  // name = SlotId
     CORBA::tk_ulong,
 
@@ -692,7 +549,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
@@ -774,7 +631,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -787,7 +644,7 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -804,21 +661,21 @@ static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696453), 
-  ACE_NTOHL (0x6c6f743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696453),
+  ACE_NTOHL (0x6c6f743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/InvalidSlot:1.0
     12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696453), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696453),
   ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
   0, // member count
   };
@@ -846,7 +703,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::Current::_tao_class_id = 0;
 
 PortableInterceptor::Current_ptr
-tao_PortableInterceptor_Current_duplicate (
+PortableInterceptor::tao_Current_life::tao_duplicate (
     PortableInterceptor::Current_ptr p
   )
 {
@@ -854,7 +711,7 @@ tao_PortableInterceptor_Current_duplicate (
 }
 
 void
-tao_PortableInterceptor_Current_release (
+PortableInterceptor::tao_Current_life::tao_release (
     PortableInterceptor::Current_ptr p
   )
 {
@@ -862,15 +719,24 @@ tao_PortableInterceptor_Current_release (
 }
 
 PortableInterceptor::Current_ptr
-tao_PortableInterceptor_Current_nil (
+PortableInterceptor::tao_Current_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::Current::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_Current_life::tao_marshal (
+    PortableInterceptor::Current_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::Current_ptr
-tao_PortableInterceptor_Current_narrow (
+PortableInterceptor::tao_Current_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -879,7 +745,7 @@ tao_PortableInterceptor_Current_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_Current_upcast (
+PortableInterceptor::tao_Current_cast::tao_upcast (
     void *src
   )
 {
@@ -888,205 +754,32 @@ tao_PortableInterceptor_Current_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_Current_marshal (
-    PortableInterceptor::Current_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::Current_var
-// *************************************************************
-
-PortableInterceptor::Current_var::Current_var (void)
-  : ptr_ (Current::_nil ())
-{}
-
-::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::Current_var::Current_var (const ::PortableInterceptor::Current_var &p)
-  : TAO_Base_var (),
-    ptr_ (Current::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::Current_var::~Current_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::Current_var &
-PortableInterceptor::Current_var::operator= (Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::Current_var &
-PortableInterceptor::Current_var::operator= (const ::PortableInterceptor::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Current_ptr &
-PortableInterceptor::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Current_ptr &
-PortableInterceptor::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::Current::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::Current_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::Current::_nil ();
-  return val;
-}
-
-::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::tao_duplicate (Current_ptr p)
-{
-  return ::PortableInterceptor::Current::_duplicate (p);
-}
-
-void
-PortableInterceptor::Current_var::tao_release (Current_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::tao_nil (void)
-{
-  return ::PortableInterceptor::Current::_nil ();
-}
-
-::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::Current_var::tao_upcast (void *src)
-{
-  Current **tmp =
-    ACE_static_cast (Current **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::Current,
+        PortableInterceptor::tao_Current_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::Current,
+        PortableInterceptor::tao_Current_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::Current, \
+        PortableInterceptor::tao_Current_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::Current, \
+        PortableInterceptor::tao_Current_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::Current_out
-// *************************************************************
-
-PortableInterceptor::Current_out::Current_out (Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::Current::_nil ();
-}
-
-PortableInterceptor::Current_out::Current_out (Current_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::Current::_nil ();
-}
-
-PortableInterceptor::Current_out::Current_out (const ::PortableInterceptor::Current_out &p)
-  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
-{}
-
-::PortableInterceptor::Current_out &
-PortableInterceptor::Current_out::operator= (const ::PortableInterceptor::Current_out &p)
-{
-  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::Current_out &
-PortableInterceptor::Current_out::operator= (const ::PortableInterceptor::Current_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::Current_out &
-PortableInterceptor::Current_out::operator= (Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::Current_out::operator ::PortableInterceptor::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Current_ptr &
-PortableInterceptor::Current_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::Current::Current (void)
 {}
@@ -1094,7 +787,7 @@ PortableInterceptor::Current::Current (void)
 PortableInterceptor::Current::~Current (void)
 {}
 
-void 
+void
 PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
@@ -1110,7 +803,7 @@ PortableInterceptor::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::Current_ptr 
+PortableInterceptor::Current_ptr
 PortableInterceptor::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1120,7 +813,7 @@ PortableInterceptor::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           Current_ptr,
@@ -1140,14 +833,14 @@ PortableInterceptor::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, Current)::_tao_class_id)
@@ -1180,12 +873,12 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1194,6 +887,12 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const
   return "IDL:omg.org/PortableInterceptor/Current:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1201,19 +900,19 @@ static const CORBA::Long _oc_PortableInterceptor_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x656e743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Current:1.0
     8,
-  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x43757272),
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -1240,7 +939,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::RequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::RequestInfo_ptr
-tao_PortableInterceptor_RequestInfo_duplicate (
+PortableInterceptor::tao_RequestInfo_life::tao_duplicate (
     PortableInterceptor::RequestInfo_ptr p
   )
 {
@@ -1248,7 +947,7 @@ tao_PortableInterceptor_RequestInfo_duplicate (
 }
 
 void
-tao_PortableInterceptor_RequestInfo_release (
+PortableInterceptor::tao_RequestInfo_life::tao_release (
     PortableInterceptor::RequestInfo_ptr p
   )
 {
@@ -1256,15 +955,24 @@ tao_PortableInterceptor_RequestInfo_release (
 }
 
 PortableInterceptor::RequestInfo_ptr
-tao_PortableInterceptor_RequestInfo_nil (
+PortableInterceptor::tao_RequestInfo_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::RequestInfo::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_RequestInfo_life::tao_marshal (
+    PortableInterceptor::RequestInfo_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::RequestInfo_ptr
-tao_PortableInterceptor_RequestInfo_narrow (
+PortableInterceptor::tao_RequestInfo_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1273,7 +981,7 @@ tao_PortableInterceptor_RequestInfo_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_RequestInfo_upcast (
+PortableInterceptor::tao_RequestInfo_cast::tao_upcast (
     void *src
   )
 {
@@ -1282,205 +990,32 @@ tao_PortableInterceptor_RequestInfo_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_RequestInfo_marshal (
-    PortableInterceptor::RequestInfo_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::RequestInfo_var
-// *************************************************************
-
-PortableInterceptor::RequestInfo_var::RequestInfo_var (void)
-  : ptr_ (RequestInfo::_nil ())
-{}
-
-::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::RequestInfo_var::RequestInfo_var (const ::PortableInterceptor::RequestInfo_var &p)
-  : TAO_Base_var (),
-    ptr_ (RequestInfo::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::RequestInfo_var::~RequestInfo_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::RequestInfo_var &
-PortableInterceptor::RequestInfo_var::operator= (RequestInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::RequestInfo_var &
-PortableInterceptor::RequestInfo_var::operator= (const ::PortableInterceptor::RequestInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::RequestInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::RequestInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::RequestInfo_ptr &
-PortableInterceptor::RequestInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::RequestInfo_ptr &
-PortableInterceptor::RequestInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::RequestInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
-  return val;
-}
-
-::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::tao_duplicate (RequestInfo_ptr p)
-{
-  return ::PortableInterceptor::RequestInfo::_duplicate (p);
-}
-
-void
-PortableInterceptor::RequestInfo_var::tao_release (RequestInfo_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::tao_nil (void)
-{
-  return ::PortableInterceptor::RequestInfo::_nil ();
-}
-
-::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::RequestInfo_var::tao_upcast (void *src)
-{
-  RequestInfo **tmp =
-    ACE_static_cast (RequestInfo **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::RequestInfo,
+        PortableInterceptor::tao_RequestInfo_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::RequestInfo,
+        PortableInterceptor::tao_RequestInfo_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::RequestInfo, \
+        PortableInterceptor::tao_RequestInfo_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::RequestInfo, \
+        PortableInterceptor::tao_RequestInfo_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::RequestInfo_out
-// *************************************************************
-
-PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
-}
-
-PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
-}
-
-PortableInterceptor::RequestInfo_out::RequestInfo_out (const ::PortableInterceptor::RequestInfo_out &p)
-  : ptr_ (ACE_const_cast (RequestInfo_out &, p).ptr_)
-{}
-
-::PortableInterceptor::RequestInfo_out &
-PortableInterceptor::RequestInfo_out::operator= (const ::PortableInterceptor::RequestInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestInfo_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::RequestInfo_out &
-PortableInterceptor::RequestInfo_out::operator= (const ::PortableInterceptor::RequestInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::RequestInfo_out &
-PortableInterceptor::RequestInfo_out::operator= (RequestInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::RequestInfo_out::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::RequestInfo_ptr &
-PortableInterceptor::RequestInfo_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::RequestInfo::RequestInfo (void)
 {}
@@ -1488,7 +1023,7 @@ PortableInterceptor::RequestInfo::RequestInfo (void)
 PortableInterceptor::RequestInfo::~RequestInfo (void)
 {}
 
-void 
+void
 PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestInfo *tmp = ACE_static_cast (RequestInfo *, _tao_void_pointer);
@@ -1504,7 +1039,7 @@ PortableInterceptor::RequestInfo::_narrow (
   return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::RequestInfo_ptr 
+PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1514,7 +1049,7 @@ PortableInterceptor::RequestInfo::_unchecked_narrow (
     {
       return RequestInfo::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RequestInfo_ptr,
@@ -1534,14 +1069,14 @@ PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
@@ -1560,12 +1095,12 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1574,6 +1109,12 @@ const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) co
   return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1581,21 +1122,21 @@ static const CORBA::Long _oc_PortableInterceptor_RequestInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737449), 
-  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737449),
+  ACE_NTOHL (0x6e666f3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/RequestInfo:1.0
     12,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737449), 
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737449),
   ACE_NTOHL (0x6e666f00),  // name = RequestInfo
   };
 
@@ -1622,7 +1163,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::ClientRequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::ClientRequestInfo_ptr
-tao_PortableInterceptor_ClientRequestInfo_duplicate (
+PortableInterceptor::tao_ClientRequestInfo_life::tao_duplicate (
     PortableInterceptor::ClientRequestInfo_ptr p
   )
 {
@@ -1630,7 +1171,7 @@ tao_PortableInterceptor_ClientRequestInfo_duplicate (
 }
 
 void
-tao_PortableInterceptor_ClientRequestInfo_release (
+PortableInterceptor::tao_ClientRequestInfo_life::tao_release (
     PortableInterceptor::ClientRequestInfo_ptr p
   )
 {
@@ -1638,15 +1179,24 @@ tao_PortableInterceptor_ClientRequestInfo_release (
 }
 
 PortableInterceptor::ClientRequestInfo_ptr
-tao_PortableInterceptor_ClientRequestInfo_nil (
+PortableInterceptor::tao_ClientRequestInfo_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::ClientRequestInfo::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_ClientRequestInfo_life::tao_marshal (
+    PortableInterceptor::ClientRequestInfo_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::ClientRequestInfo_ptr
-tao_PortableInterceptor_ClientRequestInfo_narrow (
+PortableInterceptor::tao_ClientRequestInfo_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1655,7 +1205,7 @@ tao_PortableInterceptor_ClientRequestInfo_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_ClientRequestInfo_upcast (
+PortableInterceptor::tao_ClientRequestInfo_cast::tao_upcast (
     void *src
   )
 {
@@ -1664,205 +1214,32 @@ tao_PortableInterceptor_ClientRequestInfo_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_ClientRequestInfo_marshal (
-    PortableInterceptor::ClientRequestInfo_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::ClientRequestInfo_var
-// *************************************************************
-
-PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void)
-  : ptr_ (ClientRequestInfo::_nil ())
-{}
-
-::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (const ::PortableInterceptor::ClientRequestInfo_var &p)
-  : TAO_Base_var (),
-    ptr_ (ClientRequestInfo::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::ClientRequestInfo_var::~ClientRequestInfo_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::ClientRequestInfo_var &
-PortableInterceptor::ClientRequestInfo_var::operator= (ClientRequestInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInfo_var &
-PortableInterceptor::ClientRequestInfo_var::operator= (const ::PortableInterceptor::ClientRequestInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor::ClientRequestInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr &
-PortableInterceptor::ClientRequestInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr &
-PortableInterceptor::ClientRequestInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ClientRequestInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
-  return val;
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::tao_duplicate (ClientRequestInfo_ptr p)
-{
-  return ::PortableInterceptor::ClientRequestInfo::_duplicate (p);
-}
-
-void
-PortableInterceptor::ClientRequestInfo_var::tao_release (ClientRequestInfo_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::tao_nil (void)
-{
-  return ::PortableInterceptor::ClientRequestInfo::_nil ();
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::ClientRequestInfo_var::tao_upcast (void *src)
-{
-  ClientRequestInfo **tmp =
-    ACE_static_cast (ClientRequestInfo **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::ClientRequestInfo,
+        PortableInterceptor::tao_ClientRequestInfo_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::ClientRequestInfo,
+        PortableInterceptor::tao_ClientRequestInfo_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::ClientRequestInfo, \
+        PortableInterceptor::tao_ClientRequestInfo_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::ClientRequestInfo, \
+        PortableInterceptor::tao_ClientRequestInfo_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::ClientRequestInfo_out
-// *************************************************************
-
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
-}
-
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
-}
-
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (const ::PortableInterceptor::ClientRequestInfo_out &p)
-  : ptr_ (ACE_const_cast (ClientRequestInfo_out &, p).ptr_)
-{}
-
-::PortableInterceptor::ClientRequestInfo_out &
-PortableInterceptor::ClientRequestInfo_out::operator= (const ::PortableInterceptor::ClientRequestInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (ClientRequestInfo_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInfo_out &
-PortableInterceptor::ClientRequestInfo_out::operator= (const ::PortableInterceptor::ClientRequestInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInfo_out &
-PortableInterceptor::ClientRequestInfo_out::operator= (ClientRequestInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInfo_out::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr &
-PortableInterceptor::ClientRequestInfo_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 {}
@@ -1870,7 +1247,7 @@ PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
 {}
 
-void 
+void
 PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientRequestInfo *tmp = ACE_static_cast (ClientRequestInfo *, _tao_void_pointer);
@@ -1886,7 +1263,7 @@ PortableInterceptor::ClientRequestInfo::_narrow (
   return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ClientRequestInfo_ptr 
+PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1896,7 +1273,7 @@ PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
     {
       return ClientRequestInfo::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ClientRequestInfo_ptr,
@@ -1916,14 +1293,14 @@ PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInfo)::_tao_class_id)
@@ -1956,12 +1333,12 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1970,6 +1347,12 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo
   return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1977,25 +1360,25 @@ static const CORBA::Long _oc_PortableInterceptor_ClientRequestInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e66),
+  ACE_NTOHL (0x6f3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0
     18,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e66),
   ACE_NTOHL (0x6f000000),  // name = ClientRequestInfo
   };
 
@@ -2022,7 +1405,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::ServerRequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::ServerRequestInfo_ptr
-tao_PortableInterceptor_ServerRequestInfo_duplicate (
+PortableInterceptor::tao_ServerRequestInfo_life::tao_duplicate (
     PortableInterceptor::ServerRequestInfo_ptr p
   )
 {
@@ -2030,7 +1413,7 @@ tao_PortableInterceptor_ServerRequestInfo_duplicate (
 }
 
 void
-tao_PortableInterceptor_ServerRequestInfo_release (
+PortableInterceptor::tao_ServerRequestInfo_life::tao_release (
     PortableInterceptor::ServerRequestInfo_ptr p
   )
 {
@@ -2038,15 +1421,24 @@ tao_PortableInterceptor_ServerRequestInfo_release (
 }
 
 PortableInterceptor::ServerRequestInfo_ptr
-tao_PortableInterceptor_ServerRequestInfo_nil (
+PortableInterceptor::tao_ServerRequestInfo_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_ServerRequestInfo_life::tao_marshal (
+    PortableInterceptor::ServerRequestInfo_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::ServerRequestInfo_ptr
-tao_PortableInterceptor_ServerRequestInfo_narrow (
+PortableInterceptor::tao_ServerRequestInfo_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2055,7 +1447,7 @@ tao_PortableInterceptor_ServerRequestInfo_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_ServerRequestInfo_upcast (
+PortableInterceptor::tao_ServerRequestInfo_cast::tao_upcast (
     void *src
   )
 {
@@ -2064,205 +1456,32 @@ tao_PortableInterceptor_ServerRequestInfo_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_ServerRequestInfo_marshal (
-    PortableInterceptor::ServerRequestInfo_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::ServerRequestInfo_var
-// *************************************************************
-
-PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void)
-  : ptr_ (ServerRequestInfo::_nil ())
-{}
-
-::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (const ::PortableInterceptor::ServerRequestInfo_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServerRequestInfo::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::ServerRequestInfo_var::~ServerRequestInfo_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::ServerRequestInfo_var &
-PortableInterceptor::ServerRequestInfo_var::operator= (ServerRequestInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInfo_var &
-PortableInterceptor::ServerRequestInfo_var::operator= (const ::PortableInterceptor::ServerRequestInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor::ServerRequestInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr &
-PortableInterceptor::ServerRequestInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr &
-PortableInterceptor::ServerRequestInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ServerRequestInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
-  return val;
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::tao_duplicate (ServerRequestInfo_ptr p)
-{
-  return ::PortableInterceptor::ServerRequestInfo::_duplicate (p);
-}
-
-void
-PortableInterceptor::ServerRequestInfo_var::tao_release (ServerRequestInfo_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::tao_nil (void)
-{
-  return ::PortableInterceptor::ServerRequestInfo::_nil ();
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::ServerRequestInfo_var::tao_upcast (void *src)
-{
-  ServerRequestInfo **tmp =
-    ACE_static_cast (ServerRequestInfo **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::ServerRequestInfo,
+        PortableInterceptor::tao_ServerRequestInfo_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::ServerRequestInfo,
+        PortableInterceptor::tao_ServerRequestInfo_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::ServerRequestInfo, \
+        PortableInterceptor::tao_ServerRequestInfo_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::ServerRequestInfo, \
+        PortableInterceptor::tao_ServerRequestInfo_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::ServerRequestInfo_out
-// *************************************************************
-
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
-}
-
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
-}
-
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (const ::PortableInterceptor::ServerRequestInfo_out &p)
-  : ptr_ (ACE_const_cast (ServerRequestInfo_out &, p).ptr_)
-{}
-
-::PortableInterceptor::ServerRequestInfo_out &
-PortableInterceptor::ServerRequestInfo_out::operator= (const ::PortableInterceptor::ServerRequestInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerRequestInfo_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInfo_out &
-PortableInterceptor::ServerRequestInfo_out::operator= (const ::PortableInterceptor::ServerRequestInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInfo_out &
-PortableInterceptor::ServerRequestInfo_out::operator= (ServerRequestInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInfo_out::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr &
-PortableInterceptor::ServerRequestInfo_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 {}
@@ -2270,7 +1489,7 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
 {}
 
-void 
+void
 PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerRequestInfo *tmp = ACE_static_cast (ServerRequestInfo *, _tao_void_pointer);
@@ -2286,7 +1505,7 @@ PortableInterceptor::ServerRequestInfo::_narrow (
   return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ServerRequestInfo_ptr 
+PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2296,7 +1515,7 @@ PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
     {
       return ServerRequestInfo::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ServerRequestInfo_ptr,
@@ -2316,14 +1535,14 @@ PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInfo)::_tao_class_id)
@@ -2356,12 +1575,12 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2370,6 +1589,12 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
   return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2377,25 +1602,25 @@ static const CORBA::Long _oc_PortableInterceptor_ServerRequestInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e66),
+  ACE_NTOHL (0x6f3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0
     18,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e66),
   ACE_NTOHL (0x6f000000),  // name = ServerRequestInfo
   };
 
@@ -2422,7 +1647,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::ClientRequestInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::ClientRequestInterceptor_ptr
-tao_PortableInterceptor_ClientRequestInterceptor_duplicate (
+PortableInterceptor::tao_ClientRequestInterceptor_life::tao_duplicate (
     PortableInterceptor::ClientRequestInterceptor_ptr p
   )
 {
@@ -2430,7 +1655,7 @@ tao_PortableInterceptor_ClientRequestInterceptor_duplicate (
 }
 
 void
-tao_PortableInterceptor_ClientRequestInterceptor_release (
+PortableInterceptor::tao_ClientRequestInterceptor_life::tao_release (
     PortableInterceptor::ClientRequestInterceptor_ptr p
   )
 {
@@ -2438,15 +1663,24 @@ tao_PortableInterceptor_ClientRequestInterceptor_release (
 }
 
 PortableInterceptor::ClientRequestInterceptor_ptr
-tao_PortableInterceptor_ClientRequestInterceptor_nil (
+PortableInterceptor::tao_ClientRequestInterceptor_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::ClientRequestInterceptor::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_ClientRequestInterceptor_life::tao_marshal (
+    PortableInterceptor::ClientRequestInterceptor_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::ClientRequestInterceptor_ptr
-tao_PortableInterceptor_ClientRequestInterceptor_narrow (
+PortableInterceptor::tao_ClientRequestInterceptor_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2455,7 +1689,7 @@ tao_PortableInterceptor_ClientRequestInterceptor_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_ClientRequestInterceptor_upcast (
+PortableInterceptor::tao_ClientRequestInterceptor_cast::tao_upcast (
     void *src
   )
 {
@@ -2464,205 +1698,32 @@ tao_PortableInterceptor_ClientRequestInterceptor_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_ClientRequestInterceptor_marshal (
-    PortableInterceptor::ClientRequestInterceptor_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::ClientRequestInterceptor_var
-// *************************************************************
-
-PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void)
-  : ptr_ (ClientRequestInterceptor::_nil ())
-{}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
-  : TAO_Base_var (),
-    ptr_ (ClientRequestInterceptor::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::ClientRequestInterceptor_var::~ClientRequestInterceptor_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::ClientRequestInterceptor_var &
-PortableInterceptor::ClientRequestInterceptor_var::operator= (ClientRequestInterceptor_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInterceptor_var &
-PortableInterceptor::ClientRequestInterceptor_var::operator= (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInterceptor::ClientRequestInterceptor_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr &
-PortableInterceptor::ClientRequestInterceptor_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr &
-PortableInterceptor::ClientRequestInterceptor_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ClientRequestInterceptor_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-  return val;
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::tao_duplicate (ClientRequestInterceptor_ptr p)
-{
-  return ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p);
-}
-
-void
-PortableInterceptor::ClientRequestInterceptor_var::tao_release (ClientRequestInterceptor_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::tao_nil (void)
-{
-  return ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::ClientRequestInterceptor_var::tao_upcast (void *src)
-{
-  ClientRequestInterceptor **tmp =
-    ACE_static_cast (ClientRequestInterceptor **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::ClientRequestInterceptor,
+        PortableInterceptor::tao_ClientRequestInterceptor_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::ClientRequestInterceptor,
+        PortableInterceptor::tao_ClientRequestInterceptor_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::ClientRequestInterceptor, \
+        PortableInterceptor::tao_ClientRequestInterceptor_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::ClientRequestInterceptor, \
+        PortableInterceptor::tao_ClientRequestInterceptor_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::ClientRequestInterceptor_out
-// *************************************************************
-
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-}
-
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-}
-
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (const ::PortableInterceptor::ClientRequestInterceptor_out &p)
-  : ptr_ (ACE_const_cast (ClientRequestInterceptor_out &, p).ptr_)
-{}
-
-::PortableInterceptor::ClientRequestInterceptor_out &
-PortableInterceptor::ClientRequestInterceptor_out::operator= (const ::PortableInterceptor::ClientRequestInterceptor_out &p)
-{
-  this->ptr_ = ACE_const_cast (ClientRequestInterceptor_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInterceptor_out &
-PortableInterceptor::ClientRequestInterceptor_out::operator= (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInterceptor_out &
-PortableInterceptor::ClientRequestInterceptor_out::operator= (ClientRequestInterceptor_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ClientRequestInterceptor_out::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr &
-PortableInterceptor::ClientRequestInterceptor_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 {}
@@ -2670,7 +1731,7 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
 {}
 
-void 
+void
 PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientRequestInterceptor *tmp = ACE_static_cast (ClientRequestInterceptor *, _tao_void_pointer);
@@ -2686,7 +1747,7 @@ PortableInterceptor::ClientRequestInterceptor::_narrow (
   return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ClientRequestInterceptor_ptr 
+PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2696,7 +1757,7 @@ PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     {
       return ClientRequestInterceptor::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ClientRequestInterceptor_ptr,
@@ -2716,14 +1777,14 @@ PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestIntercep
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInterceptor)::_tao_class_id)
@@ -2756,12 +1817,12 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2770,6 +1831,12 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository
   return "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2777,29 +1844,29 @@ static const CORBA::Long _oc_PortableInterceptor_ClientRequestInterceptor[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   61,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726365),
+  ACE_NTOHL (0x70746f72),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0
     25,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726365),
+  ACE_NTOHL (0x70746f72),
   ACE_NTOHL (0x0),  // name = ClientRequestInterceptor
   };
 
@@ -2826,7 +1893,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::ServerRequestInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-tao_PortableInterceptor_ServerRequestInterceptor_duplicate (
+PortableInterceptor::tao_ServerRequestInterceptor_life::tao_duplicate (
     PortableInterceptor::ServerRequestInterceptor_ptr p
   )
 {
@@ -2834,7 +1901,7 @@ tao_PortableInterceptor_ServerRequestInterceptor_duplicate (
 }
 
 void
-tao_PortableInterceptor_ServerRequestInterceptor_release (
+PortableInterceptor::tao_ServerRequestInterceptor_life::tao_release (
     PortableInterceptor::ServerRequestInterceptor_ptr p
   )
 {
@@ -2842,15 +1909,24 @@ tao_PortableInterceptor_ServerRequestInterceptor_release (
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
-tao_PortableInterceptor_ServerRequestInterceptor_nil (
+PortableInterceptor::tao_ServerRequestInterceptor_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_ServerRequestInterceptor_life::tao_marshal (
+    PortableInterceptor::ServerRequestInterceptor_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::ServerRequestInterceptor_ptr
-tao_PortableInterceptor_ServerRequestInterceptor_narrow (
+PortableInterceptor::tao_ServerRequestInterceptor_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2859,7 +1935,7 @@ tao_PortableInterceptor_ServerRequestInterceptor_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_ServerRequestInterceptor_upcast (
+PortableInterceptor::tao_ServerRequestInterceptor_cast::tao_upcast (
     void *src
   )
 {
@@ -2868,205 +1944,32 @@ tao_PortableInterceptor_ServerRequestInterceptor_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_ServerRequestInterceptor_marshal (
-    PortableInterceptor::ServerRequestInterceptor_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::ServerRequestInterceptor_var
-// *************************************************************
-
-PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void)
-  : ptr_ (ServerRequestInterceptor::_nil ())
-{}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServerRequestInterceptor::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::ServerRequestInterceptor_var::~ServerRequestInterceptor_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::ServerRequestInterceptor_var &
-PortableInterceptor::ServerRequestInterceptor_var::operator= (ServerRequestInterceptor_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInterceptor_var &
-PortableInterceptor::ServerRequestInterceptor_var::operator= (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInterceptor::ServerRequestInterceptor_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr &
-PortableInterceptor::ServerRequestInterceptor_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr &
-PortableInterceptor::ServerRequestInterceptor_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ServerRequestInterceptor_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-  return val;
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::tao_duplicate (ServerRequestInterceptor_ptr p)
-{
-  return ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p);
-}
-
-void
-PortableInterceptor::ServerRequestInterceptor_var::tao_release (ServerRequestInterceptor_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::tao_nil (void)
-{
-  return ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::ServerRequestInterceptor_var::tao_upcast (void *src)
-{
-  ServerRequestInterceptor **tmp =
-    ACE_static_cast (ServerRequestInterceptor **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::ServerRequestInterceptor,
+        PortableInterceptor::tao_ServerRequestInterceptor_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::ServerRequestInterceptor,
+        PortableInterceptor::tao_ServerRequestInterceptor_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::ServerRequestInterceptor, \
+        PortableInterceptor::tao_ServerRequestInterceptor_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::ServerRequestInterceptor, \
+        PortableInterceptor::tao_ServerRequestInterceptor_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::ServerRequestInterceptor_out
-// *************************************************************
-
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-}
-
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-}
-
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (const ::PortableInterceptor::ServerRequestInterceptor_out &p)
-  : ptr_ (ACE_const_cast (ServerRequestInterceptor_out &, p).ptr_)
-{}
-
-::PortableInterceptor::ServerRequestInterceptor_out &
-PortableInterceptor::ServerRequestInterceptor_out::operator= (const ::PortableInterceptor::ServerRequestInterceptor_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerRequestInterceptor_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInterceptor_out &
-PortableInterceptor::ServerRequestInterceptor_out::operator= (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInterceptor_out &
-PortableInterceptor::ServerRequestInterceptor_out::operator= (ServerRequestInterceptor_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ServerRequestInterceptor_out::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr &
-PortableInterceptor::ServerRequestInterceptor_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 {}
@@ -3074,7 +1977,7 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
-void 
+void
 PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerRequestInterceptor *tmp = ACE_static_cast (ServerRequestInterceptor *, _tao_void_pointer);
@@ -3090,7 +1993,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
   return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ServerRequestInterceptor_ptr 
+PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3100,7 +2003,7 @@ PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     {
       return ServerRequestInterceptor::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ServerRequestInterceptor_ptr,
@@ -3120,14 +2023,14 @@ PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestIntercep
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInterceptor)::_tao_class_id)
@@ -3160,12 +2063,12 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3174,6 +2077,12 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository
   return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3181,29 +2090,29 @@ static const CORBA::Long _oc_PortableInterceptor_ServerRequestInterceptor[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   61,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726365),
+  ACE_NTOHL (0x70746f72),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0
     25,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726365),
+  ACE_NTOHL (0x70746f72),
   ACE_NTOHL (0x0),  // name = ServerRequestInterceptor
   };
 
@@ -3230,7 +2139,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::IORInfo::_tao_class_id = 0;
 
 PortableInterceptor::IORInfo_ptr
-tao_PortableInterceptor_IORInfo_duplicate (
+PortableInterceptor::tao_IORInfo_life::tao_duplicate (
     PortableInterceptor::IORInfo_ptr p
   )
 {
@@ -3238,7 +2147,7 @@ tao_PortableInterceptor_IORInfo_duplicate (
 }
 
 void
-tao_PortableInterceptor_IORInfo_release (
+PortableInterceptor::tao_IORInfo_life::tao_release (
     PortableInterceptor::IORInfo_ptr p
   )
 {
@@ -3246,15 +2155,24 @@ tao_PortableInterceptor_IORInfo_release (
 }
 
 PortableInterceptor::IORInfo_ptr
-tao_PortableInterceptor_IORInfo_nil (
+PortableInterceptor::tao_IORInfo_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::IORInfo::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_IORInfo_life::tao_marshal (
+    PortableInterceptor::IORInfo_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::IORInfo_ptr
-tao_PortableInterceptor_IORInfo_narrow (
+PortableInterceptor::tao_IORInfo_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3263,7 +2181,7 @@ tao_PortableInterceptor_IORInfo_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_IORInfo_upcast (
+PortableInterceptor::tao_IORInfo_cast::tao_upcast (
     void *src
   )
 {
@@ -3272,205 +2190,32 @@ tao_PortableInterceptor_IORInfo_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_IORInfo_marshal (
-    PortableInterceptor::IORInfo_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::IORInfo_var
-// *************************************************************
-
-PortableInterceptor::IORInfo_var::IORInfo_var (void)
-  : ptr_ (IORInfo::_nil ())
-{}
-
-::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::IORInfo_var::IORInfo_var (const ::PortableInterceptor::IORInfo_var &p)
-  : TAO_Base_var (),
-    ptr_ (IORInfo::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::IORInfo_var::~IORInfo_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::IORInfo_var &
-PortableInterceptor::IORInfo_var::operator= (IORInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::IORInfo_var &
-PortableInterceptor::IORInfo_var::operator= (const ::PortableInterceptor::IORInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::IORInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInfo_ptr &
-PortableInterceptor::IORInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInfo_ptr &
-PortableInterceptor::IORInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::IORInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
-  return val;
-}
-
-::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::tao_duplicate (IORInfo_ptr p)
-{
-  return ::PortableInterceptor::IORInfo::_duplicate (p);
-}
-
-void
-PortableInterceptor::IORInfo_var::tao_release (IORInfo_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::tao_nil (void)
-{
-  return ::PortableInterceptor::IORInfo::_nil ();
-}
-
-::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::IORInfo_var::tao_upcast (void *src)
-{
-  IORInfo **tmp =
-    ACE_static_cast (IORInfo **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::IORInfo,
+        PortableInterceptor::tao_IORInfo_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::IORInfo,
+        PortableInterceptor::tao_IORInfo_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::IORInfo, \
+        PortableInterceptor::tao_IORInfo_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::IORInfo, \
+        PortableInterceptor::tao_IORInfo_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::IORInfo_out
-// *************************************************************
-
-PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
-}
-
-PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
-}
-
-PortableInterceptor::IORInfo_out::IORInfo_out (const ::PortableInterceptor::IORInfo_out &p)
-  : ptr_ (ACE_const_cast (IORInfo_out &, p).ptr_)
-{}
-
-::PortableInterceptor::IORInfo_out &
-PortableInterceptor::IORInfo_out::operator= (const ::PortableInterceptor::IORInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (IORInfo_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::IORInfo_out &
-PortableInterceptor::IORInfo_out::operator= (const ::PortableInterceptor::IORInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::IORInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::IORInfo_out &
-PortableInterceptor::IORInfo_out::operator= (IORInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::IORInfo_out::operator ::PortableInterceptor::IORInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInfo_ptr &
-PortableInterceptor::IORInfo_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::IORInfo::IORInfo (void)
 {}
@@ -3478,7 +2223,7 @@ PortableInterceptor::IORInfo::IORInfo (void)
 PortableInterceptor::IORInfo::~IORInfo (void)
 {}
 
-void 
+void
 PortableInterceptor::IORInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   IORInfo *tmp = ACE_static_cast (IORInfo *, _tao_void_pointer);
@@ -3494,7 +2239,7 @@ PortableInterceptor::IORInfo::_narrow (
   return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::IORInfo_ptr 
+PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3504,7 +2249,7 @@ PortableInterceptor::IORInfo::_unchecked_narrow (
     {
       return IORInfo::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           IORInfo_ptr,
@@ -3524,14 +2269,14 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, IORInfo)::_tao_class_id)
@@ -3550,12 +2295,12 @@ void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3564,6 +2309,12 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
   return "IDL:omg.org/PortableInterceptor/IORInfo:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3571,19 +2322,19 @@ static const CORBA::Long _oc_PortableInterceptor_IORInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x494f5249), 
-  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x494f5249),
+  ACE_NTOHL (0x6e666f3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/IORInfo:1.0
     8,
-  ACE_NTOHL (0x494f5249), 
+  ACE_NTOHL (0x494f5249),
   ACE_NTOHL (0x6e666f00),  // name = IORInfo
   };
 
@@ -3610,7 +2361,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::IORInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::IORInterceptor_ptr
-tao_PortableInterceptor_IORInterceptor_duplicate (
+PortableInterceptor::tao_IORInterceptor_life::tao_duplicate (
     PortableInterceptor::IORInterceptor_ptr p
   )
 {
@@ -3618,7 +2369,7 @@ tao_PortableInterceptor_IORInterceptor_duplicate (
 }
 
 void
-tao_PortableInterceptor_IORInterceptor_release (
+PortableInterceptor::tao_IORInterceptor_life::tao_release (
     PortableInterceptor::IORInterceptor_ptr p
   )
 {
@@ -3626,15 +2377,24 @@ tao_PortableInterceptor_IORInterceptor_release (
 }
 
 PortableInterceptor::IORInterceptor_ptr
-tao_PortableInterceptor_IORInterceptor_nil (
+PortableInterceptor::tao_IORInterceptor_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::IORInterceptor::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_IORInterceptor_life::tao_marshal (
+    PortableInterceptor::IORInterceptor_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::IORInterceptor_ptr
-tao_PortableInterceptor_IORInterceptor_narrow (
+PortableInterceptor::tao_IORInterceptor_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3643,7 +2403,7 @@ tao_PortableInterceptor_IORInterceptor_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_IORInterceptor_upcast (
+PortableInterceptor::tao_IORInterceptor_cast::tao_upcast (
     void *src
   )
 {
@@ -3652,205 +2412,32 @@ tao_PortableInterceptor_IORInterceptor_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_IORInterceptor_marshal (
-    PortableInterceptor::IORInterceptor_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::IORInterceptor_var
-// *************************************************************
-
-PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void)
-  : ptr_ (IORInterceptor::_nil ())
-{}
-
-::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::IORInterceptor_var::IORInterceptor_var (const ::PortableInterceptor::IORInterceptor_var &p)
-  : TAO_Base_var (),
-    ptr_ (IORInterceptor::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::IORInterceptor_var::~IORInterceptor_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::IORInterceptor_var &
-PortableInterceptor::IORInterceptor_var::operator= (IORInterceptor_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::IORInterceptor_var &
-PortableInterceptor::IORInterceptor_var::operator= (const ::PortableInterceptor::IORInterceptor_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::IORInterceptor::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::IORInterceptor_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInterceptor_ptr &
-PortableInterceptor::IORInterceptor_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInterceptor_ptr &
-PortableInterceptor::IORInterceptor_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::IORInterceptor_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
-  return val;
-}
-
-::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::tao_duplicate (IORInterceptor_ptr p)
-{
-  return ::PortableInterceptor::IORInterceptor::_duplicate (p);
-}
-
-void
-PortableInterceptor::IORInterceptor_var::tao_release (IORInterceptor_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::tao_nil (void)
-{
-  return ::PortableInterceptor::IORInterceptor::_nil ();
-}
-
-::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::IORInterceptor_var::tao_upcast (void *src)
-{
-  IORInterceptor **tmp =
-    ACE_static_cast (IORInterceptor **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::IORInterceptor,
+        PortableInterceptor::tao_IORInterceptor_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::IORInterceptor,
+        PortableInterceptor::tao_IORInterceptor_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::IORInterceptor, \
+        PortableInterceptor::tao_IORInterceptor_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::IORInterceptor, \
+        PortableInterceptor::tao_IORInterceptor_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::IORInterceptor_out
-// *************************************************************
-
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
-}
-
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
-}
-
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (const ::PortableInterceptor::IORInterceptor_out &p)
-  : ptr_ (ACE_const_cast (IORInterceptor_out &, p).ptr_)
-{}
-
-::PortableInterceptor::IORInterceptor_out &
-PortableInterceptor::IORInterceptor_out::operator= (const ::PortableInterceptor::IORInterceptor_out &p)
-{
-  this->ptr_ = ACE_const_cast (IORInterceptor_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::IORInterceptor_out &
-PortableInterceptor::IORInterceptor_out::operator= (const ::PortableInterceptor::IORInterceptor_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::IORInterceptor_out &
-PortableInterceptor::IORInterceptor_out::operator= (IORInterceptor_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::IORInterceptor_out::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInterceptor_ptr &
-PortableInterceptor::IORInterceptor_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::IORInterceptor::IORInterceptor (void)
 {}
@@ -3858,7 +2445,7 @@ PortableInterceptor::IORInterceptor::IORInterceptor (void)
 PortableInterceptor::IORInterceptor::~IORInterceptor (void)
 {}
 
-void 
+void
 PortableInterceptor::IORInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   IORInterceptor *tmp = ACE_static_cast (IORInterceptor *, _tao_void_pointer);
@@ -3874,7 +2461,7 @@ PortableInterceptor::IORInterceptor::_narrow (
   return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::IORInterceptor_ptr 
+PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3884,7 +2471,7 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow (
     {
       return IORInterceptor::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           IORInterceptor_ptr,
@@ -3904,14 +2491,14 @@ PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, IORInterceptor)::_tao_class_id)
@@ -3944,12 +2531,12 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3958,6 +2545,12 @@ const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void)
   return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3965,23 +2558,23 @@ static const CORBA::Long _oc_PortableInterceptor_IORInterceptor[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x494f5249), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x63657074), 
-  ACE_NTOHL (0x6f723a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x494f5249),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x6f723a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/IORInterceptor:1.0
     15,
-  ACE_NTOHL (0x494f5249), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x494f5249),
+  ACE_NTOHL (0x6e746572),
+  ACE_NTOHL (0x63657074),
   ACE_NTOHL (0x6f720000),  // name = IORInterceptor
   };
 
@@ -4008,7 +2601,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::PolicyFactory::_tao_class_id = 0;
 
 PortableInterceptor::PolicyFactory_ptr
-tao_PortableInterceptor_PolicyFactory_duplicate (
+PortableInterceptor::tao_PolicyFactory_life::tao_duplicate (
     PortableInterceptor::PolicyFactory_ptr p
   )
 {
@@ -4016,7 +2609,7 @@ tao_PortableInterceptor_PolicyFactory_duplicate (
 }
 
 void
-tao_PortableInterceptor_PolicyFactory_release (
+PortableInterceptor::tao_PolicyFactory_life::tao_release (
     PortableInterceptor::PolicyFactory_ptr p
   )
 {
@@ -4024,15 +2617,24 @@ tao_PortableInterceptor_PolicyFactory_release (
 }
 
 PortableInterceptor::PolicyFactory_ptr
-tao_PortableInterceptor_PolicyFactory_nil (
+PortableInterceptor::tao_PolicyFactory_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::PolicyFactory::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_PolicyFactory_life::tao_marshal (
+    PortableInterceptor::PolicyFactory_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::PolicyFactory_ptr
-tao_PortableInterceptor_PolicyFactory_narrow (
+PortableInterceptor::tao_PolicyFactory_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -4041,7 +2643,7 @@ tao_PortableInterceptor_PolicyFactory_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_PolicyFactory_upcast (
+PortableInterceptor::tao_PolicyFactory_cast::tao_upcast (
     void *src
   )
 {
@@ -4050,205 +2652,32 @@ tao_PortableInterceptor_PolicyFactory_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_PolicyFactory_marshal (
-    PortableInterceptor::PolicyFactory_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::PolicyFactory_var
-// *************************************************************
-
-PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void)
-  : ptr_ (PolicyFactory::_nil ())
-{}
-
-::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::PolicyFactory_var::PolicyFactory_var (const ::PortableInterceptor::PolicyFactory_var &p)
-  : TAO_Base_var (),
-    ptr_ (PolicyFactory::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::PolicyFactory_var::~PolicyFactory_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::PolicyFactory_var &
-PortableInterceptor::PolicyFactory_var::operator= (PolicyFactory_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::PolicyFactory_var &
-PortableInterceptor::PolicyFactory_var::operator= (const ::PortableInterceptor::PolicyFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::PolicyFactory::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::PolicyFactory_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::PolicyFactory_ptr &
-PortableInterceptor::PolicyFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::PolicyFactory_ptr &
-PortableInterceptor::PolicyFactory_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::PolicyFactory_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
-  return val;
-}
-
-::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::tao_duplicate (PolicyFactory_ptr p)
-{
-  return ::PortableInterceptor::PolicyFactory::_duplicate (p);
-}
-
-void
-PortableInterceptor::PolicyFactory_var::tao_release (PolicyFactory_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::tao_nil (void)
-{
-  return ::PortableInterceptor::PolicyFactory::_nil ();
-}
-
-::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::PolicyFactory_var::tao_upcast (void *src)
-{
-  PolicyFactory **tmp =
-    ACE_static_cast (PolicyFactory **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::PolicyFactory,
+        PortableInterceptor::tao_PolicyFactory_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::PolicyFactory,
+        PortableInterceptor::tao_PolicyFactory_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::PolicyFactory, \
+        PortableInterceptor::tao_PolicyFactory_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::PolicyFactory, \
+        PortableInterceptor::tao_PolicyFactory_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::PolicyFactory_out
-// *************************************************************
-
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
-}
-
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
-}
-
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (const ::PortableInterceptor::PolicyFactory_out &p)
-  : ptr_ (ACE_const_cast (PolicyFactory_out &, p).ptr_)
-{}
-
-::PortableInterceptor::PolicyFactory_out &
-PortableInterceptor::PolicyFactory_out::operator= (const ::PortableInterceptor::PolicyFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (PolicyFactory_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::PolicyFactory_out &
-PortableInterceptor::PolicyFactory_out::operator= (const ::PortableInterceptor::PolicyFactory_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::PolicyFactory_out &
-PortableInterceptor::PolicyFactory_out::operator= (PolicyFactory_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::PolicyFactory_out::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::PolicyFactory_ptr &
-PortableInterceptor::PolicyFactory_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::PolicyFactory::PolicyFactory (void)
 {}
@@ -4256,7 +2685,7 @@ PortableInterceptor::PolicyFactory::PolicyFactory (void)
 PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 {}
 
-void 
+void
 PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyFactory *tmp = ACE_static_cast (PolicyFactory *, _tao_void_pointer);
@@ -4272,7 +2701,7 @@ PortableInterceptor::PolicyFactory::_narrow (
   return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::PolicyFactory_ptr 
+PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4282,7 +2711,7 @@ PortableInterceptor::PolicyFactory::_unchecked_narrow (
     {
       return PolicyFactory::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           PolicyFactory_ptr,
@@ -4302,7 +2731,7 @@ PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4321,7 +2750,7 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
 void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, PolicyFactory)::_tao_class_id)
@@ -4340,12 +2769,12 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4354,6 +2783,12 @@ const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void)
   return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4361,23 +2796,23 @@ static const CORBA::Long _oc_PortableInterceptor_PolicyFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794661), 
-  ACE_NTOHL (0x63746f72), 
-  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794661),
+  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x793a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/PolicyFactory:1.0
     14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794661), 
-  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794661),
+  ACE_NTOHL (0x63746f72),
   ACE_NTOHL (0x79000000),  // name = PolicyFactory
   };
 
@@ -4404,7 +2839,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::ORBInitInfo::_tao_class_id = 0;
 
 PortableInterceptor::ORBInitInfo_ptr
-tao_PortableInterceptor_ORBInitInfo_duplicate (
+PortableInterceptor::tao_ORBInitInfo_life::tao_duplicate (
     PortableInterceptor::ORBInitInfo_ptr p
   )
 {
@@ -4412,7 +2847,7 @@ tao_PortableInterceptor_ORBInitInfo_duplicate (
 }
 
 void
-tao_PortableInterceptor_ORBInitInfo_release (
+PortableInterceptor::tao_ORBInitInfo_life::tao_release (
     PortableInterceptor::ORBInitInfo_ptr p
   )
 {
@@ -4420,15 +2855,24 @@ tao_PortableInterceptor_ORBInitInfo_release (
 }
 
 PortableInterceptor::ORBInitInfo_ptr
-tao_PortableInterceptor_ORBInitInfo_nil (
+PortableInterceptor::tao_ORBInitInfo_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::ORBInitInfo::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_ORBInitInfo_life::tao_marshal (
+    PortableInterceptor::ORBInitInfo_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::ORBInitInfo_ptr
-tao_PortableInterceptor_ORBInitInfo_narrow (
+PortableInterceptor::tao_ORBInitInfo_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -4437,7 +2881,7 @@ tao_PortableInterceptor_ORBInitInfo_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_ORBInitInfo_upcast (
+PortableInterceptor::tao_ORBInitInfo_cast::tao_upcast (
     void *src
   )
 {
@@ -4446,205 +2890,32 @@ tao_PortableInterceptor_ORBInitInfo_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_ORBInitInfo_marshal (
-    PortableInterceptor::ORBInitInfo_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::ORBInitInfo_var
-// *************************************************************
-
-PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void)
-  : ptr_ (ORBInitInfo::_nil ())
-{}
-
-::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (const ::PortableInterceptor::ORBInitInfo_var &p)
-  : TAO_Base_var (),
-    ptr_ (ORBInitInfo::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::ORBInitInfo_var::~ORBInitInfo_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::ORBInitInfo_var &
-PortableInterceptor::ORBInitInfo_var::operator= (ORBInitInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ORBInitInfo_var &
-PortableInterceptor::ORBInitInfo_var::operator= (const ::PortableInterceptor::ORBInitInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ORBInitInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBInitInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitInfo_ptr &
-PortableInterceptor::ORBInitInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitInfo_ptr &
-PortableInterceptor::ORBInitInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ORBInitInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
-  return val;
-}
-
-::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::tao_duplicate (ORBInitInfo_ptr p)
-{
-  return ::PortableInterceptor::ORBInitInfo::_duplicate (p);
-}
-
-void
-PortableInterceptor::ORBInitInfo_var::tao_release (ORBInitInfo_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::tao_nil (void)
-{
-  return ::PortableInterceptor::ORBInitInfo::_nil ();
-}
-
-::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::ORBInitInfo_var::tao_upcast (void *src)
-{
-  ORBInitInfo **tmp =
-    ACE_static_cast (ORBInitInfo **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::ORBInitInfo,
+        PortableInterceptor::tao_ORBInitInfo_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::ORBInitInfo,
+        PortableInterceptor::tao_ORBInitInfo_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::ORBInitInfo, \
+        PortableInterceptor::tao_ORBInitInfo_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::ORBInitInfo, \
+        PortableInterceptor::tao_ORBInitInfo_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::ORBInitInfo_out
-// *************************************************************
-
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
-}
-
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
-}
-
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (const ::PortableInterceptor::ORBInitInfo_out &p)
-  : ptr_ (ACE_const_cast (ORBInitInfo_out &, p).ptr_)
-{}
-
-::PortableInterceptor::ORBInitInfo_out &
-PortableInterceptor::ORBInitInfo_out::operator= (const ::PortableInterceptor::ORBInitInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (ORBInitInfo_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::ORBInitInfo_out &
-PortableInterceptor::ORBInitInfo_out::operator= (const ::PortableInterceptor::ORBInitInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::ORBInitInfo_out &
-PortableInterceptor::ORBInitInfo_out::operator= (ORBInitInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ORBInitInfo_out::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitInfo_ptr &
-PortableInterceptor::ORBInitInfo_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 {}
@@ -4652,7 +2923,7 @@ PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
 {}
 
-void 
+void
 PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ORBInitInfo *tmp = ACE_static_cast (ORBInitInfo *, _tao_void_pointer);
@@ -4668,7 +2939,7 @@ PortableInterceptor::ORBInitInfo::_narrow (
   return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ORBInitInfo_ptr 
+PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4678,7 +2949,7 @@ PortableInterceptor::ORBInitInfo::_unchecked_narrow (
     {
       return ORBInitInfo::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ORBInitInfo_ptr,
@@ -4698,14 +2969,14 @@ PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitInfo)::_tao_class_id)
@@ -4724,12 +2995,12 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4738,6 +3009,12 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co
   return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4745,26 +3022,26 @@ static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_ObjectId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f2f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f2f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744964),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0
     9,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744964),
   ACE_NTOHL (0x0),  // name = ObjectId
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -4779,7 +3056,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (
 ::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_ObjectId =
   &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
@@ -4898,32 +3175,32 @@ static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_DuplicateName[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   62,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f2f), 
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
-  ACE_NTOHL (0x654e616d), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f2f),
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
+  ACE_NTOHL (0x654e616d),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0
     14,
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
-  ACE_NTOHL (0x654e616d), 
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
+  ACE_NTOHL (0x654e616d),
   ACE_NTOHL (0x65000000),  // name = DuplicateName
   1, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -4938,7 +3215,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName
 ::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
   &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
@@ -5040,24 +3317,24 @@ static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_InvalidName[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f2f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69644e), 
-  ACE_NTOHL (0x616d653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f2f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69644e),
+  ACE_NTOHL (0x616d653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0
     12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69644e), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69644e),
   ACE_NTOHL (0x616d6500),  // name = InvalidName
   0, // member count
   };
@@ -5080,21 +3357,21 @@ static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0
     12,
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
   ACE_NTOHL (0x6e666f00),  // name = ORBInitInfo
   };
 
@@ -5121,7 +3398,7 @@ TAO_NAMESPACE_END
 int PortableInterceptor::ORBInitializer::_tao_class_id = 0;
 
 PortableInterceptor::ORBInitializer_ptr
-tao_PortableInterceptor_ORBInitializer_duplicate (
+PortableInterceptor::tao_ORBInitializer_life::tao_duplicate (
     PortableInterceptor::ORBInitializer_ptr p
   )
 {
@@ -5129,7 +3406,7 @@ tao_PortableInterceptor_ORBInitializer_duplicate (
 }
 
 void
-tao_PortableInterceptor_ORBInitializer_release (
+PortableInterceptor::tao_ORBInitializer_life::tao_release (
     PortableInterceptor::ORBInitializer_ptr p
   )
 {
@@ -5137,15 +3414,24 @@ tao_PortableInterceptor_ORBInitializer_release (
 }
 
 PortableInterceptor::ORBInitializer_ptr
-tao_PortableInterceptor_ORBInitializer_nil (
+PortableInterceptor::tao_ORBInitializer_life::tao_nil (
     void
   )
 {
   return PortableInterceptor::ORBInitializer::_nil ();
 }
 
+CORBA::Boolean
+PortableInterceptor::tao_ORBInitializer_life::tao_marshal (
+    PortableInterceptor::ORBInitializer_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableInterceptor::ORBInitializer_ptr
-tao_PortableInterceptor_ORBInitializer_narrow (
+PortableInterceptor::tao_ORBInitializer_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -5154,7 +3440,7 @@ tao_PortableInterceptor_ORBInitializer_narrow (
 }
 
 CORBA::Object *
-tao_PortableInterceptor_ORBInitializer_upcast (
+PortableInterceptor::tao_ORBInitializer_cast::tao_upcast (
     void *src
   )
 {
@@ -5163,205 +3449,32 @@ tao_PortableInterceptor_ORBInitializer_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableInterceptor_ORBInitializer_marshal (
-    PortableInterceptor::ORBInitializer_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableInterceptor::ORBInitializer_var
-// *************************************************************
-
-PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void)
-  : ptr_ (ORBInitializer::_nil ())
-{}
-
-::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ORBInitializer_var::ORBInitializer_var (const ::PortableInterceptor::ORBInitializer_var &p)
-  : TAO_Base_var (),
-    ptr_ (ORBInitializer::_duplicate (p.ptr ()))
-{}
-
-PortableInterceptor::ORBInitializer_var::~ORBInitializer_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableInterceptor::ORBInitializer_var &
-PortableInterceptor::ORBInitializer_var::operator= (ORBInitializer_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ORBInitializer_var &
-PortableInterceptor::ORBInitializer_var::operator= (const ::PortableInterceptor::ORBInitializer_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ORBInitializer::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::ORBInitializer_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitializer_ptr &
-PortableInterceptor::ORBInitializer_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitializer_ptr &
-PortableInterceptor::ORBInitializer_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ORBInitializer_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
-  return val;
-}
-
-::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::tao_duplicate (ORBInitializer_ptr p)
-{
-  return ::PortableInterceptor::ORBInitializer::_duplicate (p);
-}
-
-void
-PortableInterceptor::ORBInitializer_var::tao_release (ORBInitializer_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::tao_nil (void)
-{
-  return ::PortableInterceptor::ORBInitializer::_nil ();
-}
-
-::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::ORBInitializer_var::tao_upcast (void *src)
-{
-  ORBInitializer **tmp =
-    ACE_static_cast (ORBInitializer **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::ORBInitializer,
+        PortableInterceptor::tao_ORBInitializer_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::ORBInitializer,
+        PortableInterceptor::tao_ORBInitializer_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::ORBInitializer, \
+        PortableInterceptor::tao_ORBInitializer_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::ORBInitializer, \
+        PortableInterceptor::tao_ORBInitializer_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableInterceptor::ORBInitializer_out
-// *************************************************************
-
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
-}
-
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
-}
-
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (const ::PortableInterceptor::ORBInitializer_out &p)
-  : ptr_ (ACE_const_cast (ORBInitializer_out &, p).ptr_)
-{}
-
-::PortableInterceptor::ORBInitializer_out &
-PortableInterceptor::ORBInitializer_out::operator= (const ::PortableInterceptor::ORBInitializer_out &p)
-{
-  this->ptr_ = ACE_const_cast (ORBInitializer_out&, p).ptr_;
-  return *this;
-}
-
-PortableInterceptor::ORBInitializer_out &
-PortableInterceptor::ORBInitializer_out::operator= (const ::PortableInterceptor::ORBInitializer_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableInterceptor::ORBInitializer_out &
-PortableInterceptor::ORBInitializer_out::operator= (ORBInitializer_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableInterceptor::ORBInitializer_out::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitializer_ptr &
-PortableInterceptor::ORBInitializer_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableInterceptor::ORBInitializer::ORBInitializer (void)
 {}
@@ -5369,7 +3482,7 @@ PortableInterceptor::ORBInitializer::ORBInitializer (void)
 PortableInterceptor::ORBInitializer::~ORBInitializer (void)
 {}
 
-void 
+void
 PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
 {
   ORBInitializer *tmp = ACE_static_cast (ORBInitializer *, _tao_void_pointer);
@@ -5385,7 +3498,7 @@ PortableInterceptor::ORBInitializer::_narrow (
   return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ORBInitializer_ptr 
+PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5395,7 +3508,7 @@ PortableInterceptor::ORBInitializer::_unchecked_narrow (
     {
       return ORBInitializer::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ORBInitializer_ptr,
@@ -5415,14 +3528,14 @@ PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitializer)::_tao_class_id)
@@ -5441,12 +3554,12 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -5455,6 +3568,12 @@ const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void)
   return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0";
 }
 
+CORBA::Boolean
+PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -5462,23 +3581,23 @@ static const CORBA::Long _oc_PortableInterceptor_ORBInitializer[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x616c697a), 
-  ACE_NTOHL (0x65723a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697469),
+  ACE_NTOHL (0x616c697a),
+  ACE_NTOHL (0x65723a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitializer:1.0
     15,
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x616c697a), 
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697469),
+  ACE_NTOHL (0x616c697a),
   ACE_NTOHL (0x65720000),  // name = ORBInitializer
   };
 
@@ -5553,7 +3672,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Interceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5615,10 +3734,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5680,7 +3799,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -6276,4 +4395,3 @@ operator>>= (
 # pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer, PortableInterceptor::ORBInitializer_var>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 35fa933d859..7240194f90b 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -26,14 +26,12 @@
 #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "CurrentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "CurrentC.h"
 #include "DynamicC.h"
 #include "ObjectReferenceTemplateC.h"
 #include "Messaging_SyncScopeC.h"
@@ -70,90 +68,41 @@ TAO_NAMESPACE  PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_INTERCEPTOR__ODDS_N_ENDS_CH_
   
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_
+  struct tao_Interceptor_life;
+  typedef TAO_Objref_Var_T<Interceptor, tao_Interceptor_life> Interceptor_var;
+  typedef TAO_Objref_Out_T<Interceptor, tao_Interceptor_life> Interceptor_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export Interceptor_var : public TAO_Base_var
+  struct TAO_Export tao_Interceptor_life
   {
-  public:
-    Interceptor_var (void); // default constructor
-    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} 
-    Interceptor_var (const Interceptor_var &); // copy constructor
-    ~Interceptor_var (void); // destructor
-    
-    Interceptor_var &operator= (Interceptor_ptr);
-    Interceptor_var &operator= (const Interceptor_var &);
-    Interceptor_ptr operator-> (void) const;
-    
-    operator const Interceptor_ptr &() const;
-    operator Interceptor_ptr &();
-    // in, inout, out, _retn 
-    Interceptor_ptr in (void) const;
-    Interceptor_ptr &inout (void);
-    Interceptor_ptr &out (void);
-    Interceptor_ptr _retn (void);
-    Interceptor_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Interceptor_ptr tao_duplicate (Interceptor_ptr);
     static void tao_release (Interceptor_ptr);
     static Interceptor_ptr tao_nil (void);
-    static Interceptor_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Interceptor_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Interceptor_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Interceptor_var (const TAO_Base_var &rhs);
-    Interceptor_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export Interceptor_out
+  struct TAO_Export tao_Interceptor_cast
   {
-  public:
-    Interceptor_out (Interceptor_ptr &);
-    Interceptor_out (Interceptor_var &);
-    Interceptor_out (const Interceptor_out &);
-    Interceptor_out &operator= (const Interceptor_out &);
-    Interceptor_out &operator= (const Interceptor_var &);
-    Interceptor_out &operator= (Interceptor_ptr);
-    operator Interceptor_ptr &();
-    Interceptor_ptr &ptr (void);
-    Interceptor_ptr operator-> (void);
-  
-  private:
-    Interceptor_ptr &ptr_;
+    static Interceptor_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
@@ -207,7 +156,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -217,7 +166,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     Interceptor (void);
     virtual ~Interceptor (void);
-    
+  
   private:
     Interceptor (const Interceptor &);
     void operator= (const Interceptor &);
@@ -289,7 +238,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_out;
@@ -302,40 +251,40 @@ TAO_NAMESPACE  PortableInterceptor
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short SUCCESSFUL = 0;
+  const PortableInterceptor::ReplyStatus SUCCESSFUL = 0;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short SYSTEM_EXCEPTION = 1;
+  const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short USER_EXCEPTION = 2;
+  const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short LOCATION_FORWARD = 3;
+  const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short LOCATION_FORWARD_PERMANENT = 4;
+  const PortableInterceptor::ReplyStatus LOCATION_FORWARD_PERMANENT = 4;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short TRANSPORT_RETRY = 5;
+  const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 5;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short UNKNOWN = 6;
+  const PortableInterceptor::ReplyStatus UNKNOWN = 6;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_out;
@@ -394,90 +343,41 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_CURRENT___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_CURRENT___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_CURRENT__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_CURRENT__ODDS_N_ENDS_CH_
   
   class Current;
   typedef Current *Current_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_CURRENT___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_CURRENT___VAR_CH_
+  struct tao_Current_life;
+  typedef TAO_Objref_Var_T<Current, tao_Current_life> Current_var;
+  typedef TAO_Objref_Out_T<Current, tao_Current_life> Current_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export Current_var : public TAO_Base_var
+  struct TAO_Export tao_Current_life
   {
-  public:
-    Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {} 
-    Current_var (const Current_var &); // copy constructor
-    ~Current_var (void); // destructor
-    
-    Current_var &operator= (Current_ptr);
-    Current_var &operator= (const Current_var &);
-    Current_ptr operator-> (void) const;
-    
-    operator const Current_ptr &() const;
-    operator Current_ptr &();
-    // in, inout, out, _retn 
-    Current_ptr in (void) const;
-    Current_ptr &inout (void);
-    Current_ptr &out (void);
-    Current_ptr _retn (void);
-    Current_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Current_ptr tao_duplicate (Current_ptr);
     static void tao_release (Current_ptr);
     static Current_ptr tao_nil (void);
-    static Current_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Current_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Current_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Current_var (const TAO_Base_var &rhs);
-    Current_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_CURRENT___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CURRENT___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export Current_out
+  struct TAO_Export tao_Current_cast
   {
-  public:
-    Current_out (Current_ptr &);
-    Current_out (Current_var &);
-    Current_out (const Current_out &);
-    Current_out &operator= (const Current_out &);
-    Current_out &operator= (const Current_var &);
-    Current_out &operator= (Current_ptr);
-    operator Current_ptr &();
-    Current_ptr &ptr (void);
-    Current_ptr operator-> (void);
-  
-  private:
-    Current_ptr &ptr_;
+    static Current_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
@@ -536,7 +436,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -546,7 +446,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     Current (void);
     virtual ~Current (void);
-    
+  
   private:
     Current (const Current &);
     void operator= (const Current &);
@@ -560,90 +460,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_REQUESTINFO__ODDS_N_ENDS_CH_
   
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_
+  struct tao_RequestInfo_life;
+  typedef TAO_Objref_Var_T<RequestInfo, tao_RequestInfo_life> RequestInfo_var;
+  typedef TAO_Objref_Out_T<RequestInfo, tao_RequestInfo_life> RequestInfo_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export RequestInfo_var : public TAO_Base_var
+  struct TAO_Export tao_RequestInfo_life
   {
-  public:
-    RequestInfo_var (void); // default constructor
-    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} 
-    RequestInfo_var (const RequestInfo_var &); // copy constructor
-    ~RequestInfo_var (void); // destructor
-    
-    RequestInfo_var &operator= (RequestInfo_ptr);
-    RequestInfo_var &operator= (const RequestInfo_var &);
-    RequestInfo_ptr operator-> (void) const;
-    
-    operator const RequestInfo_ptr &() const;
-    operator RequestInfo_ptr &();
-    // in, inout, out, _retn 
-    RequestInfo_ptr in (void) const;
-    RequestInfo_ptr &inout (void);
-    RequestInfo_ptr &out (void);
-    RequestInfo_ptr _retn (void);
-    RequestInfo_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RequestInfo_ptr tao_duplicate (RequestInfo_ptr);
     static void tao_release (RequestInfo_ptr);
     static RequestInfo_ptr tao_nil (void);
-    static RequestInfo_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RequestInfo_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RequestInfo_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RequestInfo_var (const TAO_Base_var &rhs);
-    RequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export RequestInfo_out
+  struct TAO_Export tao_RequestInfo_cast
   {
-  public:
-    RequestInfo_out (RequestInfo_ptr &);
-    RequestInfo_out (RequestInfo_var &);
-    RequestInfo_out (const RequestInfo_out &);
-    RequestInfo_out &operator= (const RequestInfo_out &);
-    RequestInfo_out &operator= (const RequestInfo_var &);
-    RequestInfo_out &operator= (RequestInfo_ptr);
-    operator RequestInfo_ptr &();
-    RequestInfo_ptr &ptr (void);
-    RequestInfo_ptr operator-> (void);
-  
-  private:
-    RequestInfo_ptr &ptr_;
+    static RequestInfo_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
@@ -821,7 +672,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -831,7 +682,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     RequestInfo (void);
     virtual ~RequestInfo (void);
-    
+  
   private:
     RequestInfo (const RequestInfo &);
     void operator= (const RequestInfo &);
@@ -845,90 +696,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ODDS_N_ENDS_CH_
   
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_
+  struct tao_ClientRequestInfo_life;
+  typedef TAO_Objref_Var_T<ClientRequestInfo, tao_ClientRequestInfo_life> ClientRequestInfo_var;
+  typedef TAO_Objref_Out_T<ClientRequestInfo, tao_ClientRequestInfo_life> ClientRequestInfo_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export ClientRequestInfo_var : public TAO_Base_var
+  struct TAO_Export tao_ClientRequestInfo_life
   {
-  public:
-    ClientRequestInfo_var (void); // default constructor
-    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} 
-    ClientRequestInfo_var (const ClientRequestInfo_var &); // copy constructor
-    ~ClientRequestInfo_var (void); // destructor
-    
-    ClientRequestInfo_var &operator= (ClientRequestInfo_ptr);
-    ClientRequestInfo_var &operator= (const ClientRequestInfo_var &);
-    ClientRequestInfo_ptr operator-> (void) const;
-    
-    operator const ClientRequestInfo_ptr &() const;
-    operator ClientRequestInfo_ptr &();
-    // in, inout, out, _retn 
-    ClientRequestInfo_ptr in (void) const;
-    ClientRequestInfo_ptr &inout (void);
-    ClientRequestInfo_ptr &out (void);
-    ClientRequestInfo_ptr _retn (void);
-    ClientRequestInfo_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ClientRequestInfo_ptr tao_duplicate (ClientRequestInfo_ptr);
     static void tao_release (ClientRequestInfo_ptr);
     static ClientRequestInfo_ptr tao_nil (void);
-    static ClientRequestInfo_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ClientRequestInfo_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ClientRequestInfo_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ClientRequestInfo_var (const TAO_Base_var &rhs);
-    ClientRequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export ClientRequestInfo_out
+  struct TAO_Export tao_ClientRequestInfo_cast
   {
-  public:
-    ClientRequestInfo_out (ClientRequestInfo_ptr &);
-    ClientRequestInfo_out (ClientRequestInfo_var &);
-    ClientRequestInfo_out (const ClientRequestInfo_out &);
-    ClientRequestInfo_out &operator= (const ClientRequestInfo_out &);
-    ClientRequestInfo_out &operator= (const ClientRequestInfo_var &);
-    ClientRequestInfo_out &operator= (ClientRequestInfo_ptr);
-    operator ClientRequestInfo_ptr &();
-    ClientRequestInfo_ptr &ptr (void);
-    ClientRequestInfo_ptr operator-> (void);
-  
-  private:
-    ClientRequestInfo_ptr &ptr_;
+    static ClientRequestInfo_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
@@ -1057,7 +859,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1067,7 +869,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     ClientRequestInfo (void);
     virtual ~ClientRequestInfo (void);
-    
+  
   private:
     ClientRequestInfo (const ClientRequestInfo &);
     void operator= (const ClientRequestInfo &);
@@ -1081,90 +883,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ODDS_N_ENDS_CH_
   
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_
+  struct tao_ServerRequestInfo_life;
+  typedef TAO_Objref_Var_T<ServerRequestInfo, tao_ServerRequestInfo_life> ServerRequestInfo_var;
+  typedef TAO_Objref_Out_T<ServerRequestInfo, tao_ServerRequestInfo_life> ServerRequestInfo_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export ServerRequestInfo_var : public TAO_Base_var
+  struct TAO_Export tao_ServerRequestInfo_life
   {
-  public:
-    ServerRequestInfo_var (void); // default constructor
-    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} 
-    ServerRequestInfo_var (const ServerRequestInfo_var &); // copy constructor
-    ~ServerRequestInfo_var (void); // destructor
-    
-    ServerRequestInfo_var &operator= (ServerRequestInfo_ptr);
-    ServerRequestInfo_var &operator= (const ServerRequestInfo_var &);
-    ServerRequestInfo_ptr operator-> (void) const;
-    
-    operator const ServerRequestInfo_ptr &() const;
-    operator ServerRequestInfo_ptr &();
-    // in, inout, out, _retn 
-    ServerRequestInfo_ptr in (void) const;
-    ServerRequestInfo_ptr &inout (void);
-    ServerRequestInfo_ptr &out (void);
-    ServerRequestInfo_ptr _retn (void);
-    ServerRequestInfo_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServerRequestInfo_ptr tao_duplicate (ServerRequestInfo_ptr);
     static void tao_release (ServerRequestInfo_ptr);
     static ServerRequestInfo_ptr tao_nil (void);
-    static ServerRequestInfo_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServerRequestInfo_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServerRequestInfo_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServerRequestInfo_var (const TAO_Base_var &rhs);
-    ServerRequestInfo_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export ServerRequestInfo_out
+  struct TAO_Export tao_ServerRequestInfo_cast
   {
-  public:
-    ServerRequestInfo_out (ServerRequestInfo_ptr &);
-    ServerRequestInfo_out (ServerRequestInfo_var &);
-    ServerRequestInfo_out (const ServerRequestInfo_out &);
-    ServerRequestInfo_out &operator= (const ServerRequestInfo_out &);
-    ServerRequestInfo_out &operator= (const ServerRequestInfo_var &);
-    ServerRequestInfo_out &operator= (ServerRequestInfo_ptr);
-    operator ServerRequestInfo_ptr &();
-    ServerRequestInfo_ptr &ptr (void);
-    ServerRequestInfo_ptr operator-> (void);
-  
-  private:
-    ServerRequestInfo_ptr &ptr_;
+    static ServerRequestInfo_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
@@ -1315,7 +1068,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1325,7 +1078,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     ServerRequestInfo (void);
     virtual ~ServerRequestInfo (void);
-    
+  
   private:
     ServerRequestInfo (const ServerRequestInfo &);
     void operator= (const ServerRequestInfo &);
@@ -1339,90 +1092,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_
   
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_
+  struct tao_ClientRequestInterceptor_life;
+  typedef TAO_Objref_Var_T<ClientRequestInterceptor, tao_ClientRequestInterceptor_life> ClientRequestInterceptor_var;
+  typedef TAO_Objref_Out_T<ClientRequestInterceptor, tao_ClientRequestInterceptor_life> ClientRequestInterceptor_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export ClientRequestInterceptor_var : public TAO_Base_var
+  struct TAO_Export tao_ClientRequestInterceptor_life
   {
-  public:
-    ClientRequestInterceptor_var (void); // default constructor
-    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} 
-    ClientRequestInterceptor_var (const ClientRequestInterceptor_var &); // copy constructor
-    ~ClientRequestInterceptor_var (void); // destructor
-    
-    ClientRequestInterceptor_var &operator= (ClientRequestInterceptor_ptr);
-    ClientRequestInterceptor_var &operator= (const ClientRequestInterceptor_var &);
-    ClientRequestInterceptor_ptr operator-> (void) const;
-    
-    operator const ClientRequestInterceptor_ptr &() const;
-    operator ClientRequestInterceptor_ptr &();
-    // in, inout, out, _retn 
-    ClientRequestInterceptor_ptr in (void) const;
-    ClientRequestInterceptor_ptr &inout (void);
-    ClientRequestInterceptor_ptr &out (void);
-    ClientRequestInterceptor_ptr _retn (void);
-    ClientRequestInterceptor_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ClientRequestInterceptor_ptr tao_duplicate (ClientRequestInterceptor_ptr);
     static void tao_release (ClientRequestInterceptor_ptr);
     static ClientRequestInterceptor_ptr tao_nil (void);
-    static ClientRequestInterceptor_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ClientRequestInterceptor_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ClientRequestInterceptor_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ClientRequestInterceptor_var (const TAO_Base_var &rhs);
-    ClientRequestInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export ClientRequestInterceptor_out
+  struct TAO_Export tao_ClientRequestInterceptor_cast
   {
-  public:
-    ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &);
-    ClientRequestInterceptor_out (ClientRequestInterceptor_var &);
-    ClientRequestInterceptor_out (const ClientRequestInterceptor_out &);
-    ClientRequestInterceptor_out &operator= (const ClientRequestInterceptor_out &);
-    ClientRequestInterceptor_out &operator= (const ClientRequestInterceptor_var &);
-    ClientRequestInterceptor_out &operator= (ClientRequestInterceptor_ptr);
-    operator ClientRequestInterceptor_ptr &();
-    ClientRequestInterceptor_ptr &ptr (void);
-    ClientRequestInterceptor_ptr operator-> (void);
-  
-  private:
-    ClientRequestInterceptor_ptr &ptr_;
+    static ClientRequestInterceptor_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
@@ -1514,7 +1218,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1524,7 +1228,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     ClientRequestInterceptor (void);
     virtual ~ClientRequestInterceptor (void);
-    
+  
   private:
     ClientRequestInterceptor (const ClientRequestInterceptor &);
     void operator= (const ClientRequestInterceptor &);
@@ -1538,90 +1242,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_
   
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_
+  struct tao_ServerRequestInterceptor_life;
+  typedef TAO_Objref_Var_T<ServerRequestInterceptor, tao_ServerRequestInterceptor_life> ServerRequestInterceptor_var;
+  typedef TAO_Objref_Out_T<ServerRequestInterceptor, tao_ServerRequestInterceptor_life> ServerRequestInterceptor_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export ServerRequestInterceptor_var : public TAO_Base_var
+  struct TAO_Export tao_ServerRequestInterceptor_life
   {
-  public:
-    ServerRequestInterceptor_var (void); // default constructor
-    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} 
-    ServerRequestInterceptor_var (const ServerRequestInterceptor_var &); // copy constructor
-    ~ServerRequestInterceptor_var (void); // destructor
-    
-    ServerRequestInterceptor_var &operator= (ServerRequestInterceptor_ptr);
-    ServerRequestInterceptor_var &operator= (const ServerRequestInterceptor_var &);
-    ServerRequestInterceptor_ptr operator-> (void) const;
-    
-    operator const ServerRequestInterceptor_ptr &() const;
-    operator ServerRequestInterceptor_ptr &();
-    // in, inout, out, _retn 
-    ServerRequestInterceptor_ptr in (void) const;
-    ServerRequestInterceptor_ptr &inout (void);
-    ServerRequestInterceptor_ptr &out (void);
-    ServerRequestInterceptor_ptr _retn (void);
-    ServerRequestInterceptor_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServerRequestInterceptor_ptr tao_duplicate (ServerRequestInterceptor_ptr);
     static void tao_release (ServerRequestInterceptor_ptr);
     static ServerRequestInterceptor_ptr tao_nil (void);
-    static ServerRequestInterceptor_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServerRequestInterceptor_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServerRequestInterceptor_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServerRequestInterceptor_var (const TAO_Base_var &rhs);
-    ServerRequestInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export ServerRequestInterceptor_out
+  struct TAO_Export tao_ServerRequestInterceptor_cast
   {
-  public:
-    ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &);
-    ServerRequestInterceptor_out (ServerRequestInterceptor_var &);
-    ServerRequestInterceptor_out (const ServerRequestInterceptor_out &);
-    ServerRequestInterceptor_out &operator= (const ServerRequestInterceptor_out &);
-    ServerRequestInterceptor_out &operator= (const ServerRequestInterceptor_var &);
-    ServerRequestInterceptor_out &operator= (ServerRequestInterceptor_ptr);
-    operator ServerRequestInterceptor_ptr &();
-    ServerRequestInterceptor_ptr &ptr (void);
-    ServerRequestInterceptor_ptr operator-> (void);
-  
-  private:
-    ServerRequestInterceptor_ptr &ptr_;
+    static ServerRequestInterceptor_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
@@ -1714,7 +1369,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1724,7 +1379,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     ServerRequestInterceptor (void);
     virtual ~ServerRequestInterceptor (void);
-    
+  
   private:
     ServerRequestInterceptor (const ServerRequestInterceptor &);
     void operator= (const ServerRequestInterceptor &);
@@ -1738,90 +1393,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_IORINFO__ODDS_N_ENDS_CH_
   
   class IORInfo;
   typedef IORInfo *IORInfo_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO___VAR_CH_
+  struct tao_IORInfo_life;
+  typedef TAO_Objref_Var_T<IORInfo, tao_IORInfo_life> IORInfo_var;
+  typedef TAO_Objref_Out_T<IORInfo, tao_IORInfo_life> IORInfo_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export IORInfo_var : public TAO_Base_var
+  struct TAO_Export tao_IORInfo_life
   {
-  public:
-    IORInfo_var (void); // default constructor
-    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} 
-    IORInfo_var (const IORInfo_var &); // copy constructor
-    ~IORInfo_var (void); // destructor
-    
-    IORInfo_var &operator= (IORInfo_ptr);
-    IORInfo_var &operator= (const IORInfo_var &);
-    IORInfo_ptr operator-> (void) const;
-    
-    operator const IORInfo_ptr &() const;
-    operator IORInfo_ptr &();
-    // in, inout, out, _retn 
-    IORInfo_ptr in (void) const;
-    IORInfo_ptr &inout (void);
-    IORInfo_ptr &out (void);
-    IORInfo_ptr _retn (void);
-    IORInfo_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static IORInfo_ptr tao_duplicate (IORInfo_ptr);
     static void tao_release (IORInfo_ptr);
     static IORInfo_ptr tao_nil (void);
-    static IORInfo_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        IORInfo_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    IORInfo_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    IORInfo_var (const TAO_Base_var &rhs);
-    IORInfo_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export IORInfo_out
+  struct TAO_Export tao_IORInfo_cast
   {
-  public:
-    IORInfo_out (IORInfo_ptr &);
-    IORInfo_out (IORInfo_var &);
-    IORInfo_out (const IORInfo_out &);
-    IORInfo_out &operator= (const IORInfo_out &);
-    IORInfo_out &operator= (const IORInfo_var &);
-    IORInfo_out &operator= (IORInfo_ptr);
-    operator IORInfo_ptr &();
-    IORInfo_ptr &ptr (void);
-    IORInfo_ptr operator-> (void);
-  
-  private:
-    IORInfo_ptr &ptr_;
+    static IORInfo_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO_CH_
@@ -1940,7 +1546,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1950,7 +1556,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     IORInfo (void);
     virtual ~IORInfo (void);
-    
+  
   private:
     IORInfo (const IORInfo &);
     void operator= (const IORInfo &);
@@ -1964,90 +1570,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ODDS_N_ENDS_CH_
   
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  struct tao_IORInterceptor_life;
+  typedef TAO_Objref_Var_T<IORInterceptor, tao_IORInterceptor_life> IORInterceptor_var;
+  typedef TAO_Objref_Out_T<IORInterceptor, tao_IORInterceptor_life> IORInterceptor_out;
   
-  class TAO_Export IORInterceptor_var : public TAO_Base_var
+  struct TAO_Export tao_IORInterceptor_life
   {
-  public:
-    IORInterceptor_var (void); // default constructor
-    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} 
-    IORInterceptor_var (const IORInterceptor_var &); // copy constructor
-    ~IORInterceptor_var (void); // destructor
-    
-    IORInterceptor_var &operator= (IORInterceptor_ptr);
-    IORInterceptor_var &operator= (const IORInterceptor_var &);
-    IORInterceptor_ptr operator-> (void) const;
-    
-    operator const IORInterceptor_ptr &() const;
-    operator IORInterceptor_ptr &();
-    // in, inout, out, _retn 
-    IORInterceptor_ptr in (void) const;
-    IORInterceptor_ptr &inout (void);
-    IORInterceptor_ptr &out (void);
-    IORInterceptor_ptr _retn (void);
-    IORInterceptor_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr);
     static void tao_release (IORInterceptor_ptr);
     static IORInterceptor_ptr tao_nil (void);
-    static IORInterceptor_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        IORInterceptor_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    IORInterceptor_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    IORInterceptor_var (const TAO_Base_var &rhs);
-    IORInterceptor_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_Export IORInterceptor_out
+  struct TAO_Export tao_IORInterceptor_cast
   {
-  public:
-    IORInterceptor_out (IORInterceptor_ptr &);
-    IORInterceptor_out (IORInterceptor_var &);
-    IORInterceptor_out (const IORInterceptor_out &);
-    IORInterceptor_out &operator= (const IORInterceptor_out &);
-    IORInterceptor_out &operator= (const IORInterceptor_var &);
-    IORInterceptor_out &operator= (IORInterceptor_ptr);
-    operator IORInterceptor_ptr &();
-    IORInterceptor_ptr &ptr (void);
-    IORInterceptor_ptr operator-> (void);
-  
-  private:
-    IORInterceptor_ptr &ptr_;
+    static IORInterceptor_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
@@ -2127,7 +1684,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2137,7 +1694,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     IORInterceptor (void);
     virtual ~IORInterceptor (void);
-    
+  
   private:
     IORInterceptor (const IORInterceptor &);
     void operator= (const IORInterceptor &);
@@ -2151,90 +1708,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORInterceptor;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY__ODDS_N_ENDS_CH_
   
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  struct tao_PolicyFactory_life;
+  typedef TAO_Objref_Var_T<PolicyFactory, tao_PolicyFactory_life> PolicyFactory_var;
+  typedef TAO_Objref_Out_T<PolicyFactory, tao_PolicyFactory_life> PolicyFactory_out;
   
-  class TAO_Export PolicyFactory_var : public TAO_Base_var
+  struct TAO_Export tao_PolicyFactory_life
   {
-  public:
-    PolicyFactory_var (void); // default constructor
-    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} 
-    PolicyFactory_var (const PolicyFactory_var &); // copy constructor
-    ~PolicyFactory_var (void); // destructor
-    
-    PolicyFactory_var &operator= (PolicyFactory_ptr);
-    PolicyFactory_var &operator= (const PolicyFactory_var &);
-    PolicyFactory_ptr operator-> (void) const;
-    
-    operator const PolicyFactory_ptr &() const;
-    operator PolicyFactory_ptr &();
-    // in, inout, out, _retn 
-    PolicyFactory_ptr in (void) const;
-    PolicyFactory_ptr &inout (void);
-    PolicyFactory_ptr &out (void);
-    PolicyFactory_ptr _retn (void);
-    PolicyFactory_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static PolicyFactory_ptr tao_duplicate (PolicyFactory_ptr);
     static void tao_release (PolicyFactory_ptr);
     static PolicyFactory_ptr tao_nil (void);
-    static PolicyFactory_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        PolicyFactory_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PolicyFactory_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PolicyFactory_var (const TAO_Base_var &rhs);
-    PolicyFactory_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export PolicyFactory_out
+  struct TAO_Export tao_PolicyFactory_cast
   {
-  public:
-    PolicyFactory_out (PolicyFactory_ptr &);
-    PolicyFactory_out (PolicyFactory_var &);
-    PolicyFactory_out (const PolicyFactory_out &);
-    PolicyFactory_out &operator= (const PolicyFactory_out &);
-    PolicyFactory_out &operator= (const PolicyFactory_var &);
-    PolicyFactory_out &operator= (PolicyFactory_ptr);
-    operator PolicyFactory_ptr &();
-    PolicyFactory_ptr &ptr (void);
-    PolicyFactory_ptr operator-> (void);
-  
-  private:
-    PolicyFactory_ptr &ptr_;
+    static PolicyFactory_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
@@ -2279,7 +1787,7 @@ TAO_NAMESPACE  PortableInterceptor
         CORBA::SystemException
         , CORBA::PolicyError
       )) = 0;
-
+    
     // Hand-crafted addition.
     
     virtual ::CORBA::Policy_ptr _create_policy (
@@ -2292,7 +1800,7 @@ TAO_NAMESPACE  PortableInterceptor
       ));
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2302,7 +1810,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     PolicyFactory (void);
     virtual ~PolicyFactory (void);
-    
+  
   private:
     PolicyFactory (const PolicyFactory &);
     void operator= (const PolicyFactory &);
@@ -2316,90 +1824,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO__ODDS_N_ENDS_CH_
   
   class ORBInitInfo;
   typedef ORBInitInfo *ORBInitInfo_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_
+  struct tao_ORBInitInfo_life;
+  typedef TAO_Objref_Var_T<ORBInitInfo, tao_ORBInitInfo_life> ORBInitInfo_var;
+  typedef TAO_Objref_Out_T<ORBInitInfo, tao_ORBInitInfo_life> ORBInitInfo_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export ORBInitInfo_var : public TAO_Base_var
+  struct TAO_Export tao_ORBInitInfo_life
   {
-  public:
-    ORBInitInfo_var (void); // default constructor
-    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} 
-    ORBInitInfo_var (const ORBInitInfo_var &); // copy constructor
-    ~ORBInitInfo_var (void); // destructor
-    
-    ORBInitInfo_var &operator= (ORBInitInfo_ptr);
-    ORBInitInfo_var &operator= (const ORBInitInfo_var &);
-    ORBInitInfo_ptr operator-> (void) const;
-    
-    operator const ORBInitInfo_ptr &() const;
-    operator ORBInitInfo_ptr &();
-    // in, inout, out, _retn 
-    ORBInitInfo_ptr in (void) const;
-    ORBInitInfo_ptr &inout (void);
-    ORBInitInfo_ptr &out (void);
-    ORBInitInfo_ptr _retn (void);
-    ORBInitInfo_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ORBInitInfo_ptr tao_duplicate (ORBInitInfo_ptr);
     static void tao_release (ORBInitInfo_ptr);
     static ORBInitInfo_ptr tao_nil (void);
-    static ORBInitInfo_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ORBInitInfo_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ORBInitInfo_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ORBInitInfo_var (const TAO_Base_var &rhs);
-    ORBInitInfo_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export ORBInitInfo_out
+  struct TAO_Export tao_ORBInitInfo_cast
   {
-  public:
-    ORBInitInfo_out (ORBInitInfo_ptr &);
-    ORBInitInfo_out (ORBInitInfo_var &);
-    ORBInitInfo_out (const ORBInitInfo_out &);
-    ORBInitInfo_out &operator= (const ORBInitInfo_out &);
-    ORBInitInfo_out &operator= (const ORBInitInfo_var &);
-    ORBInitInfo_out &operator= (ORBInitInfo_ptr);
-    operator ORBInitInfo_ptr &();
-    ORBInitInfo_ptr &ptr (void);
-    ORBInitInfo_ptr operator-> (void);
-  
-  private:
-    ORBInitInfo_ptr &ptr_;
+    static ORBInitInfo_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
@@ -2433,7 +1892,7 @@ TAO_NAMESPACE  PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
     
     typedef char * ObjectId;
     typedef CORBA::String_var ObjectId_var;
@@ -2662,7 +2121,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2672,7 +2131,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     ORBInitInfo (void);
     virtual ~ORBInitInfo (void);
-    
+  
   private:
     ORBInitInfo (const ORBInitInfo &);
     void operator= (const ORBInitInfo &);
@@ -2686,98 +2145,41 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__ODDS_N_ENDS_CH_
   
   class ORBInitializer;
   typedef ORBInitializer *ORBInitializer_ptr;
-
-  /// Hand-crafted addition.   
-  /// Register an ORBInitializer with the global ORBInitializer
-  /// table.
-  TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
-      ORBInitializer_ptr init
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_
+  struct tao_ORBInitializer_life;
+  typedef TAO_Objref_Var_T<ORBInitializer, tao_ORBInitializer_life> ORBInitializer_var;
+  typedef TAO_Objref_Out_T<ORBInitializer, tao_ORBInitializer_life> ORBInitializer_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_Export ORBInitializer_var : public TAO_Base_var
+  struct TAO_Export tao_ORBInitializer_life
   {
-  public:
-    ORBInitializer_var (void); // default constructor
-    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} 
-    ORBInitializer_var (const ORBInitializer_var &); // copy constructor
-    ~ORBInitializer_var (void); // destructor
-    
-    ORBInitializer_var &operator= (ORBInitializer_ptr);
-    ORBInitializer_var &operator= (const ORBInitializer_var &);
-    ORBInitializer_ptr operator-> (void) const;
-    
-    operator const ORBInitializer_ptr &() const;
-    operator ORBInitializer_ptr &();
-    // in, inout, out, _retn 
-    ORBInitializer_ptr in (void) const;
-    ORBInitializer_ptr &inout (void);
-    ORBInitializer_ptr &out (void);
-    ORBInitializer_ptr _retn (void);
-    ORBInitializer_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ORBInitializer_ptr tao_duplicate (ORBInitializer_ptr);
     static void tao_release (ORBInitializer_ptr);
     static ORBInitializer_ptr tao_nil (void);
-    static ORBInitializer_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ORBInitializer_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ORBInitializer_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ORBInitializer_var (const TAO_Base_var &rhs);
-    ORBInitializer_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export ORBInitializer_out
+  struct TAO_Export tao_ORBInitializer_cast
   {
-  public:
-    ORBInitializer_out (ORBInitializer_ptr &);
-    ORBInitializer_out (ORBInitializer_var &);
-    ORBInitializer_out (const ORBInitializer_out &);
-    ORBInitializer_out &operator= (const ORBInitializer_out &);
-    ORBInitializer_out &operator= (const ORBInitializer_var &);
-    ORBInitializer_out &operator= (ORBInitializer_ptr);
-    operator ORBInitializer_ptr &();
-    ORBInitializer_ptr &ptr (void);
-    ORBInitializer_ptr operator-> (void);
-  
-  private:
-    ORBInitializer_ptr &ptr_;
+    static ORBInitializer_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
@@ -2833,7 +2235,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2843,7 +2245,7 @@ TAO_NAMESPACE  PortableInterceptor
   protected:
     ORBInitializer (void);
     virtual ~ORBInitializer (void);
-    
+  
   private:
     ORBInitializer (const ORBInitializer &);
     void operator= (const ORBInitializer &);
@@ -2851,6 +2253,14 @@ TAO_NAMESPACE  PortableInterceptor
 
 #endif /* end #if !defined */
   
+  /// Hand-crafted addition.   
+  /// Register an ORBInitializer with the global ORBInitializer
+  /// table.
+  TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
+      ORBInitializer_ptr init
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
@@ -3001,7 +2411,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::Inval
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "PortableInterceptorC.i"
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
index 2707bb88149..26112c92c40 100644
--- a/TAO/tao/PortableInterceptorC.i
+++ b/TAO/tao/PortableInterceptorC.i
@@ -26,13 +26,6 @@
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -67,14 +60,6 @@ TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___CI_)
 #define _PORTABLEINTERCEPTOR_CURRENT___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::Current::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -109,14 +94,6 @@ TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -152,13 +129,6 @@ TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -193,14 +163,6 @@ TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_In
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -235,14 +197,6 @@ TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_In
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -277,14 +231,6 @@ TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -319,14 +265,6 @@ TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_)
 #define _PORTABLEINTERCEPTOR_IORINFO___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -361,14 +299,6 @@ TAO::Any_Impl_T<PortableInterceptor::IORInfo>::demarshal_value (TAO_InputCDR &)
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -404,13 +334,6 @@ TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::demarshal_value (TAO_Input
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -445,14 +368,6 @@ TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputC
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___CI_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -487,14 +402,6 @@ TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -525,7 +432,7 @@ TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_Input
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -576,7 +483,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -603,4 +510,3 @@ CORBA::Boolean operator>> (
 {
   return 1;
 }
-
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
index 1914b77bd82..b4d635d182b 100644
--- a/TAO/tao/PortableServer/Default_ORTC.cpp
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -42,27 +42,25 @@
 static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  56,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x44656661), 
-  ACE_NTOHL (0x756c745f), 
-  ACE_NTOHL (0x4f52542f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x6174653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/TAO_Default_ORT/ObjectReferenceTemplate:1.0
+  48,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x44656661),
+  ACE_NTOHL (0x756c745f),
+  ACE_NTOHL (0x4f52542f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x6174653a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0
     24,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
     0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -88,211 +86,47 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:94
 
 void
-tao_TAO_Default_ORT_ObjectReferenceTemplate_add_ref (
-    TAO_Default_ORT::ObjectReferenceTemplate *p
+TAO_Default_ORT::tao_ObjectReferenceTemplate_life::tao_add_ref (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
   )
 {
   CORBA::add_ref (p);
 }
 
 void
-tao_TAO_Default_ORT_ObjectReferenceTemplate_remove_ref (
-    TAO_Default_ORT::ObjectReferenceTemplate *p
+TAO_Default_ORT::tao_ObjectReferenceTemplate_life::tao_remove_ref (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
   )
 {
   CORBA::remove_ref (p);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298
-
-// *************************************************************
-// Operations for class TAO_Default_ORT::ObjectReferenceTemplate_var
-// *************************************************************
-
-TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void)
-  : ptr_ (0)
-{}
-
-TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (ObjectReferenceTemplate* p)
-  : ptr_ (p)
-{}
-
-TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate* p)
-  : ptr_ (ACE_const_cast (ObjectReferenceTemplate *, p))
-{}
-
-TAO_Default_ORT::ObjectReferenceTemplate *
-TAO_Default_ORT::ObjectReferenceTemplate_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p)
-{
-  CORBA::add_ref (p.ptr ());
-  this->ptr_ = p.ptr ();
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_var::~ObjectReferenceTemplate_var (void) // destructor
-{
-  CORBA::remove_ref (this->ptr_);
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_var &
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate *p)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_var &
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator= (const ObjectReferenceTemplate_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::remove_ref (this->ptr_);
-    ObjectReferenceTemplate *tmp = p.ptr ();
-    CORBA::add_ref (tmp);
-    this->ptr_ = tmp;
-  }
-  
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator const TAO_Default_ORT::ObjectReferenceTemplate* () const // cast
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator TAO_Default_ORT::ObjectReferenceTemplate*& () // cast 
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate *
-TAO_Default_ORT::ObjectReferenceTemplate_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate *
-TAO_Default_ORT::ObjectReferenceTemplate_var::in (void) const
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate *&
-TAO_Default_ORT::ObjectReferenceTemplate_var::inout (void)
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate *&
-TAO_Default_ORT::ObjectReferenceTemplate_var::out (void)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate *
-TAO_Default_ORT::ObjectReferenceTemplate_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ObjectReferenceTemplate* tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-void
-TAO_Default_ORT::ObjectReferenceTemplate_var::tao_add_ref (
-    ObjectReferenceTemplate *p
-  )
-{
-  CORBA::add_ref (p);
-}
-
-void
-TAO_Default_ORT::ObjectReferenceTemplate_var::tao_remove_ref (
-    ObjectReferenceTemplate *p
-  )
-{
-  CORBA::remove_ref (p);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568
-
-// *************************************************************
-// Operations for class TAO_Default_ORT::ObjectReferenceTemplate_out
-// *************************************************************
-
-TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p)
-  : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_)
-{}
-
-TAO_Default_ORT::ObjectReferenceTemplate_out &
-TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_out &p)
-{
-  this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_;
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_out &
-TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_var &p)
-{
-  ObjectReferenceTemplate *tmp = p.ptr ();
-  CORBA::add_ref (tmp);
-  this->ptr_ = tmp;
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_out &
-TAO_Default_ORT::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate_out::operator TAO_Default_ORT::ObjectReferenceTemplate*& () // cast
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate *&
-TAO_Default_ORT::ObjectReferenceTemplate_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-TAO_Default_ORT::ObjectReferenceTemplate *
-TAO_Default_ORT::ObjectReferenceTemplate_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Value_Var_T<
+        TAO_Default_ORT::ObjectReferenceTemplate,
+        TAO_Default_ORT::tao_ObjectReferenceTemplate_life
+      >;
+  template class
+    TAO_Value_Out_T<
+        TAO_Default_ORT::ObjectReferenceTemplate,
+        TAO_Default_ORT::tao_ObjectReferenceTemplate_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Value_Var_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate, \
+        TAO_Default_ORT::tao_ObjectReferenceTemplate_life \
+      >
+# pragma instantiate \
+    TAO_Value_Out_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate, \
+        TAO_Default_ORT::tao_ObjectReferenceTemplate_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
@@ -301,7 +135,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
 }
 
@@ -322,9 +156,9 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
     {
       return this;
     }
-  
+
   void *rval = 0;
-  
+
   if (rval == 0)
     {
 #if defined (_MSC_VER)
@@ -333,7 +167,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id)
       rval = this->PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (type_id);
 #endif /* _MSC_VER */
     }
-  
+
   return rval;
 }
 
@@ -380,29 +214,29 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
@@ -481,7 +315,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:270
 
 void
 CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
index 83f8b4daef7..2274f37c6c3 100644
--- a/TAO/tao/PortableServer/Default_ORTC.h
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -26,14 +26,12 @@
 #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/ObjectReferenceTemplateC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/ObjectReferenceTemplateC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -64,83 +62,21 @@ TAO_NAMESPACE  TAO_Default_ORT
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:307
   
   class ObjectReferenceTemplate;
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___PTR_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___PTR_CH_
-  
-  typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___VAR_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___VAR_CH_
+  struct tao_ObjectReferenceTemplate_life;
+  typedef TAO_Value_Var_T<ObjectReferenceTemplate, tao_ObjectReferenceTemplate_life> ObjectReferenceTemplate_var;
+  typedef TAO_Value_Out_T<ObjectReferenceTemplate, tao_ObjectReferenceTemplate_life> ObjectReferenceTemplate_out;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181
-  
-  class  ObjectReferenceTemplate_var
+  struct tao_ObjectReferenceTemplate_life
   {
-  public:
-    ObjectReferenceTemplate_var (void);
-    ObjectReferenceTemplate_var (ObjectReferenceTemplate*);
-    ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension)
-    ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &);
-    ~ObjectReferenceTemplate_var (void);
-    
-    ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*);
-    ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate* operator-> (void) const;
-    
-    operator const ObjectReferenceTemplate* () const;
-    operator ObjectReferenceTemplate*& ();
-    // in, inout, out, _retn 
-    ObjectReferenceTemplate* in (void) const;
-    ObjectReferenceTemplate*& inout (void);
-    ObjectReferenceTemplate*& out (void);
-    ObjectReferenceTemplate* _retn (void);
-    ObjectReferenceTemplate* ptr (void) const;
-    
-    // Hooks used by template sequence and valuetype manager classes
-    // for non-defined forward declared valuetypes.
     static void tao_add_ref (ObjectReferenceTemplate *);
     static void tao_remove_ref (ObjectReferenceTemplate *);
-  
-  private:
-    ObjectReferenceTemplate* ptr_;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OUT_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OUT_CH_
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490
-  
-  class  ObjectReferenceTemplate_out
-  {
-  public:
-    ObjectReferenceTemplate_out (ObjectReferenceTemplate* &);
-    ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &);
-    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &);
-    ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &);
-    ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*);
-    operator ObjectReferenceTemplate*& ();
-    ObjectReferenceTemplate*& ptr (void);
-    ObjectReferenceTemplate* operator-> (void);
-    
-  private:
-    ObjectReferenceTemplate* &ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
@@ -164,7 +100,7 @@ TAO_NAMESPACE  TAO_Default_ORT
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:272
   
   protected:
     ObjectReferenceTemplate (void);
@@ -247,7 +183,7 @@ TAO_NAMESPACE  OBV_TAO_Default_ORT
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:212
 
 TAO_NAMESPACE CORBA
 {
@@ -268,7 +204,7 @@ TAO_NAMESPACE_CLOSE
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "Default_ORTC.i"
@@ -285,4 +221,3 @@ TAO_NAMESPACE_CLOSE
 #include "ace/post.h"
 #endif /* ifndef */
 
-
diff --git a/TAO/tao/PortableServer/Default_ORTC.i b/TAO/tao/PortableServer/Default_ORTC.i
index 95ea7798c2a..822e2ef38ad 100644
--- a/TAO/tao/PortableServer/Default_ORTC.i
+++ b/TAO/tao/PortableServer/Default_ORTC.i
@@ -20,7 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
@@ -31,7 +31,7 @@ ACE_INLINE
 TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
 {}
 
-ACE_INLINE const char* 
+ACE_INLINE const char*
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 {
   return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0";
@@ -50,7 +50,7 @@ TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:242
 
 #if defined (__ACE_INLINE__)
 
@@ -68,4 +68,3 @@ TAO_NAMESPACE_CLOSE
 
  CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
  CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
-
diff --git a/TAO/tao/PortableServer/ImR_ActivatorC.cpp b/TAO/tao/PortableServer/ImR_ActivatorC.cpp
index fd0f2a18a7e..fe61f024639 100644
--- a/TAO/tao/PortableServer/ImR_ActivatorC.cpp
+++ b/TAO/tao/PortableServer/ImR_ActivatorC.cpp
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:315
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
-#include "ImR_ActivatorC.h"
 
+#include "ImR_ActivatorC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
@@ -35,6 +34,7 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
diff --git a/TAO/tao/PortableServer/ImR_ActivatorC.h b/TAO/tao/PortableServer/ImR_ActivatorC.h
index 188bbabf452..ed2bf4cfc64 100644
--- a/TAO/tao/PortableServer/ImR_ActivatorC.h
+++ b/TAO/tao/PortableServer/ImR_ActivatorC.h
@@ -19,12 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
-#ifndef _TAO_IDL_IMR_ACTIVATORC_H_
-#define _TAO_IDL_IMR_ACTIVATORC_H_
+#ifndef _TAO_IDL_ORIG_IMR_ACTIVATORC_H_
+#define _TAO_IDL_ORIG_IMR_ACTIVATORC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -58,14 +57,18 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1002
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "ImR_ActivatorC.i"
@@ -81,3 +84,4 @@
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImR_ActivatorC.i b/TAO/tao/PortableServer/ImR_ActivatorC.i
index f455a06b8f0..e86a7e25a26 100644
--- a/TAO/tao/PortableServer/ImR_ActivatorC.i
+++ b/TAO/tao/PortableServer/ImR_ActivatorC.i
@@ -19,3 +19,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index a2a658abeb7..a8717b51b68 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -50,7 +49,7 @@
 int ImplementationRepository::ServerObject::_tao_class_id = 0;
 
 ImplementationRepository::ServerObject_ptr
-tao_ImplementationRepository_ServerObject_duplicate (
+ImplementationRepository::tao_ServerObject_life::tao_duplicate (
     ImplementationRepository::ServerObject_ptr p
   )
 {
@@ -58,7 +57,7 @@ tao_ImplementationRepository_ServerObject_duplicate (
 }
 
 void
-tao_ImplementationRepository_ServerObject_release (
+ImplementationRepository::tao_ServerObject_life::tao_release (
     ImplementationRepository::ServerObject_ptr p
   )
 {
@@ -66,228 +65,64 @@ tao_ImplementationRepository_ServerObject_release (
 }
 
 ImplementationRepository::ServerObject_ptr
-tao_ImplementationRepository_ServerObject_nil (
+ImplementationRepository::tao_ServerObject_life::tao_nil (
     void
   )
 {
   return ImplementationRepository::ServerObject::_nil ();
 }
 
-ImplementationRepository::ServerObject_ptr
-tao_ImplementationRepository_ServerObject_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_ImplementationRepository_ServerObject_upcast (
-    void *src
-  )
-{
-  ImplementationRepository::ServerObject **tmp =
-    ACE_static_cast (ImplementationRepository::ServerObject **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_ImplementationRepository_ServerObject_marshal (
+ImplementationRepository::tao_ServerObject_life::tao_marshal (
     ImplementationRepository::ServerObject_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// ImplementationRepository::ServerObject_var
-// *************************************************************
-
-ImplementationRepository::ServerObject_var::ServerObject_var (void)
-  : ptr_ (ServerObject::_nil ())
-{}
-
-::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ImplementationRepository::ServerObject_var::ServerObject_var (const ::ImplementationRepository::ServerObject_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServerObject::_duplicate (p.ptr ()))
-{}
-
-ImplementationRepository::ServerObject_var::~ServerObject_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ImplementationRepository::ServerObject_var &
-ImplementationRepository::ServerObject_var::operator= (ServerObject_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ImplementationRepository::ServerObject_var &
-ImplementationRepository::ServerObject_var::operator= (const ::ImplementationRepository::ServerObject_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::ImplementationRepository::ServerObject::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ImplementationRepository::ServerObject_var::operator const ::ImplementationRepository::ServerObject_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerObject_ptr &
-ImplementationRepository::ServerObject_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerObject_ptr &
-ImplementationRepository::ServerObject_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::ImplementationRepository::ServerObject_ptr val = this->ptr_;
-  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
-  return val;
-}
-
-::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::tao_duplicate (ServerObject_ptr p)
-{
-  return ::ImplementationRepository::ServerObject::_duplicate (p);
-}
-
-void
-ImplementationRepository::ServerObject_var::tao_release (ServerObject_ptr p)
-{
-  CORBA::release (p);
-}
-
-::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::tao_nil (void)
-{
-  return ::ImplementationRepository::ServerObject::_nil ();
-}
-
-::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::tao_narrow (
+ImplementationRepository::ServerObject_ptr
+ImplementationRepository::tao_ServerObject_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-ImplementationRepository::ServerObject_var::tao_upcast (void *src)
+ImplementationRepository::tao_ServerObject_cast::tao_upcast (
+    void *src
+  )
 {
-  ServerObject **tmp =
-    ACE_static_cast (ServerObject **, src);
+  ImplementationRepository::ServerObject **tmp =
+    ACE_static_cast (ImplementationRepository::ServerObject **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// ImplementationRepository::ServerObject_out
-// *************************************************************
-
-ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
-}
-
-ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
-}
-
-ImplementationRepository::ServerObject_out::ServerObject_out (const ::ImplementationRepository::ServerObject_out &p)
-  : ptr_ (ACE_const_cast (ServerObject_out &, p).ptr_)
-{}
-
-::ImplementationRepository::ServerObject_out &
-ImplementationRepository::ServerObject_out::operator= (const ::ImplementationRepository::ServerObject_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerObject_out&, p).ptr_;
-  return *this;
-}
-
-ImplementationRepository::ServerObject_out &
-ImplementationRepository::ServerObject_out::operator= (const ::ImplementationRepository::ServerObject_var &p)
-{
-  this->ptr_ = ::ImplementationRepository::ServerObject::_duplicate (p.ptr ());
-  return *this;
-}
-
-ImplementationRepository::ServerObject_out &
-ImplementationRepository::ServerObject_out::operator= (ServerObject_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ImplementationRepository::ServerObject_out::operator ::ImplementationRepository::ServerObject_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerObject_ptr &
-ImplementationRepository::ServerObject_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        ImplementationRepository::ServerObject,
+        ImplementationRepository::tao_ServerObject_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        ImplementationRepository::ServerObject,
+        ImplementationRepository::tao_ServerObject_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        ImplementationRepository::ServerObject, \
+        ImplementationRepository::tao_ServerObject_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        ImplementationRepository::ServerObject, \
+        ImplementationRepository::tao_ServerObject_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -307,10 +142,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -318,14 +153,14 @@ public:
     TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -338,7 +173,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -350,11 +185,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (AC
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -363,7 +198,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_EN
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -382,10 +217,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -393,14 +228,14 @@ public:
     TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -413,7 +248,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -425,11 +260,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -438,7 +273,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (AC
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -450,7 +285,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (AC
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void)
@@ -473,12 +308,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "ping",
@@ -486,22 +321,22 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping _tao_ri (
           &_tao_call,
@@ -509,14 +344,14 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -524,58 +359,66 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
+                );
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -585,56 +428,54 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -650,12 +491,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown",
@@ -663,22 +504,22 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown _tao_ri (
           &_tao_call,
@@ -686,14 +527,14 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -701,58 +542,66 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
+                );
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -762,61 +611,59 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -867,8 +714,8 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy (
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 ImplementationRepository::ServerObject::ServerObject (int collocated)
 {
@@ -889,7 +736,7 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se
 ImplementationRepository::ServerObject::~ServerObject (void)
 {}
 
-void 
+void
 ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerObject *tmp = ACE_static_cast (ServerObject *, _tao_void_pointer);
@@ -906,7 +753,7 @@ ImplementationRepository::ServerObject::_narrow (
     {
       return ServerObject::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -915,17 +762,17 @@ ImplementationRepository::ServerObject::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ServerObject::_nil ());
-      
+
       if (is_a == 0)
         {
           return ServerObject::_nil ();
         }
     }
-  
+
   return ServerObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-ImplementationRepository::ServerObject_ptr 
+ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -935,18 +782,18 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
     {
       return ServerObject::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ServerObject_ptr default_proxy = ServerObject::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -964,7 +811,7 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
               ServerObject::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -977,10 +824,10 @@ ImplementationRepository::ServerObject::_unchecked_narrow (
               ServerObject::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ServerObject_ptr,
@@ -1000,7 +847,7 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1035,7 +882,7 @@ ImplementationRepository::ServerObject::_is_a (
 void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::ImplementationRepository, ServerObject)::_tao_class_id)
@@ -1054,12 +901,12 @@ void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1068,6 +915,12 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo
   return "IDL:ImplementationRepository/ServerObject:1.0";
 }
 
+CORBA::Boolean
+ImplementationRepository::ServerObject::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -1078,10 +931,10 @@ void ImplementationRepository::ServerObject::ping (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerObject_Proxy_Impl &proxy = 
+  _TAO_ServerObject_Proxy_Impl &proxy =
     this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.ping (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1098,10 +951,10 @@ void ImplementationRepository::ServerObject::shutdown (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerObject_Proxy_Impl &proxy = 
+  _TAO_ServerObject_Proxy_Impl &proxy =
     this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.shutdown (
       this
       ACE_ENV_ARG_PARAMETER
@@ -1115,22 +968,22 @@ static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x7665724f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f536572),
+  ACE_NTOHL (0x7665724f),
+  ACE_NTOHL (0x626a6563),
+  ACE_NTOHL (0x743a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/ServerObject:1.0
     13,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65724f62), 
-  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65724f62),
+  ACE_NTOHL (0x6a656374),
   ACE_NTOHL (0x0),  // name = ServerObject
   };
 
@@ -1151,7 +1004,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
@@ -1233,7 +1086,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1246,7 +1099,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1263,24 +1116,24 @@ static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f416c72), 
-  ACE_NTOHL (0x65616479), 
-  ACE_NTOHL (0x52656769), 
-  ACE_NTOHL (0x73746572), 
-  ACE_NTOHL (0x65643a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f416c72),
+  ACE_NTOHL (0x65616479),
+  ACE_NTOHL (0x52656769),
+  ACE_NTOHL (0x73746572),
+  ACE_NTOHL (0x65643a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/AlreadyRegistered:1.0
     18,
-  ACE_NTOHL (0x416c7265), 
-  ACE_NTOHL (0x61647952), 
-  ACE_NTOHL (0x65676973), 
-  ACE_NTOHL (0x74657265), 
+  ACE_NTOHL (0x416c7265),
+  ACE_NTOHL (0x61647952),
+  ACE_NTOHL (0x65676973),
+  ACE_NTOHL (0x74657265),
   ACE_NTOHL (0x64000000),  // name = AlreadyRegistered
   0, // member count
   };
@@ -1302,7 +1155,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
@@ -1386,7 +1239,7 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1399,7 +1252,7 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1431,28 +1284,28 @@ static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f43616e), 
-  ACE_NTOHL (0x6e6f7441), 
-  ACE_NTOHL (0x63746976), 
-  ACE_NTOHL (0x6174653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f43616e),
+  ACE_NTOHL (0x6e6f7441),
+  ACE_NTOHL (0x63746976),
+  ACE_NTOHL (0x6174653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/CannotActivate:1.0
     15,
-  ACE_NTOHL (0x43616e6e), 
-  ACE_NTOHL (0x6f744163), 
-  ACE_NTOHL (0x74697661), 
+  ACE_NTOHL (0x43616e6e),
+  ACE_NTOHL (0x6f744163),
+  ACE_NTOHL (0x74697661),
   ACE_NTOHL (0x74650000),  // name = CannotActivate
   1, // member count
     7,
-  ACE_NTOHL (0x72656173), 
+  ACE_NTOHL (0x72656173),
   ACE_NTOHL (0x6f6e0000),  // name = reason
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -1473,7 +1326,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
@@ -1555,7 +1408,7 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1568,7 +1421,7 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -1585,20 +1438,20 @@ static const CORBA::Long _oc_ImplementationRepository_NotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f4e6f74), 
-  ACE_NTOHL (0x466f756e), 
-  ACE_NTOHL (0x643a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f4e6f74),
+  ACE_NTOHL (0x466f756e),
+  ACE_NTOHL (0x643a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/NotFound:1.0
     9,
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
   };
@@ -1627,36 +1480,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f456e76), 
-  ACE_NTOHL (0x69726f6e), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x56617269), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f456e76),
+  ACE_NTOHL (0x69726f6e),
+  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x56617269),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
     20,
-  ACE_NTOHL (0x456e7669), 
-  ACE_NTOHL (0x726f6e6d), 
-  ACE_NTOHL (0x656e7456), 
-  ACE_NTOHL (0x61726961), 
+  ACE_NTOHL (0x456e7669),
+  ACE_NTOHL (0x726f6e6d),
+  ACE_NTOHL (0x656e7456),
+  ACE_NTOHL (0x61726961),
   ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
   2, // member count
     5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -1677,8 +1530,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -1687,27 +1540,58 @@ void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      EnvironmentVariable
+    >;
+
+template class
+  TAO_Out_T<
+      EnvironmentVariable,
+      EnvironmentVariable_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      EnvironmentVariable \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      EnvironmentVariable, \
+      EnvironmentVariable_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_Address[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f416464), 
-  ACE_NTOHL (0x72657373), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f416464),
+  ACE_NTOHL (0x72657373),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
     8,
-  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x41646472),
   ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -1728,117 +1612,39 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
-
-void
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_allocate_buffer (CORBA::ULong length)
-{
-  ImplementationRepository::EnvironmentVariable* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      ImplementationRepository::EnvironmentVariable *old =
-        ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  ImplementationRepository::EnvironmentVariable *tmp =
-    ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
-  _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
-#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// ImplementationRepository::EnvironmentList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 ImplementationRepository::EnvironmentList::EnvironmentList (void)
 {}
 
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        ImplementationRepository::EnvironmentVariable
+      >
+    (max)
 {}
 
 ImplementationRepository::EnvironmentList::EnvironmentList (
     CORBA::ULong max,
     CORBA::ULong length,
-    ImplementationRepository::EnvironmentVariable *buffer,
+    ImplementationRepository::EnvironmentVariable* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        ImplementationRepository::EnvironmentVariable
+      >
+    (max, length, buffer, release)
 {}
 
 ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        ImplementationRepository::EnvironmentVariable
+      >
+    (seq)
 {}
 
-ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor
+ImplementationRepository::EnvironmentList::~EnvironmentList (void)
 {}
 
 void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *_tao_void_pointer)
@@ -1847,7 +1653,37 @@ void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *_tao_
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      EnvironmentList,
+      ImplementationRepository::EnvironmentVariable
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      EnvironmentList,
+      EnvironmentList_var,
+      ImplementationRepository::EnvironmentVariable
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      EnvironmentList, \
+      ImplementationRepository::EnvironmentVariable \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      EnvironmentList, \
+      EnvironmentList_var, \
+      ImplementationRepository::EnvironmentVariable \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -1856,23 +1692,23 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f456e76), 
-  ACE_NTOHL (0x69726f6e), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f456e76),
+  ACE_NTOHL (0x69726f6e),
+  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
     16,
-  ACE_NTOHL (0x456e7669), 
-  ACE_NTOHL (0x726f6e6d), 
-  ACE_NTOHL (0x656e744c), 
+  ACE_NTOHL (0x456e7669),
+  ACE_NTOHL (0x726f6e6d),
+  ACE_NTOHL (0x656e744c),
   ACE_NTOHL (0x69737400),  // name = EnvironmentList
     CORBA::tk_sequence, // typecode kind
   148, // encapsulation length
@@ -1881,36 +1717,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
     132, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       53,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f456e76), 
-      ACE_NTOHL (0x69726f6e), 
-      ACE_NTOHL (0x6d656e74), 
-      ACE_NTOHL (0x56617269), 
-      ACE_NTOHL (0x61626c65), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x496d706c),
+      ACE_NTOHL (0x656d656e),
+      ACE_NTOHL (0x74617469),
+      ACE_NTOHL (0x6f6e5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x2f456e76),
+      ACE_NTOHL (0x69726f6e),
+      ACE_NTOHL (0x6d656e74),
+      ACE_NTOHL (0x56617269),
+      ACE_NTOHL (0x61626c65),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
             20,
-      ACE_NTOHL (0x456e7669), 
-      ACE_NTOHL (0x726f6e6d), 
-      ACE_NTOHL (0x656e7456), 
-      ACE_NTOHL (0x61726961), 
+      ACE_NTOHL (0x456e7669),
+      ACE_NTOHL (0x726f6e6d),
+      ACE_NTOHL (0x656e7456),
+      ACE_NTOHL (0x61726961),
       ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
       2, // member count
             5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_string, 
+            CORBA::tk_string,
       0U, // string length
       6,
-      ACE_NTOHL (0x76616c75), 
+      ACE_NTOHL (0x76616c75),
       ACE_NTOHL (0x65000000),  // name = value
-            CORBA::tk_string, 
+            CORBA::tk_string,
       0U, // string length
 
     0U,
@@ -1941,37 +1777,37 @@ static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f416374), 
-  ACE_NTOHL (0x69766174), 
-  ACE_NTOHL (0x696f6e4d), 
-  ACE_NTOHL (0x6f64653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f416374),
+  ACE_NTOHL (0x69766174),
+  ACE_NTOHL (0x696f6e4d),
+  ACE_NTOHL (0x6f64653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
   15,
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76617469), 
-  ACE_NTOHL (0x6f6e4d6f), 
+  ACE_NTOHL (0x41637469),
+  ACE_NTOHL (0x76617469),
+  ACE_NTOHL (0x6f6e4d6f),
   ACE_NTOHL (0x64650000),  // name = ActivationMode
   4, // member count
   7,
-  ACE_NTOHL (0x4e4f524d), 
+  ACE_NTOHL (0x4e4f524d),
   ACE_NTOHL (0x414c0000),  // name = NORMAL
   7,
-  ACE_NTOHL (0x4d414e55), 
+  ACE_NTOHL (0x4d414e55),
   ACE_NTOHL (0x414c0000),  // name = MANUAL
   11,
-  ACE_NTOHL (0x5045525f), 
-  ACE_NTOHL (0x434c4945), 
+  ACE_NTOHL (0x5045525f),
+  ACE_NTOHL (0x434c4945),
   ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
   11,
-  ACE_NTOHL (0x4155544f), 
-  ACE_NTOHL (0x5f535441), 
+  ACE_NTOHL (0x4155544f),
+  ACE_NTOHL (0x5f535441),
   ACE_NTOHL (0x52540000),  // name = AUTO_START
   };
 
@@ -1999,56 +1835,56 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f537461), 
-  ACE_NTOHL (0x72747570), 
-  ACE_NTOHL (0x4f707469), 
-  ACE_NTOHL (0x6f6e733a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f537461),
+  ACE_NTOHL (0x72747570),
+  ACE_NTOHL (0x4f707469),
+  ACE_NTOHL (0x6f6e733a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
     15,
-  ACE_NTOHL (0x53746172), 
-  ACE_NTOHL (0x7475704f), 
-  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x53746172),
+  ACE_NTOHL (0x7475704f),
+  ACE_NTOHL (0x7074696f),
   ACE_NTOHL (0x6e730000),  // name = StartupOptions
   5, // member count
     13,
-  ACE_NTOHL (0x636f6d6d), 
-  ACE_NTOHL (0x616e645f), 
-  ACE_NTOHL (0x6c696e65), 
+  ACE_NTOHL (0x636f6d6d),
+  ACE_NTOHL (0x616e645f),
+  ACE_NTOHL (0x6c696e65),
   ACE_NTOHL (0x0),  // name = command_line
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
   12,
-  ACE_NTOHL (0x656e7669), 
-  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e7669),
+  ACE_NTOHL (0x726f6e6d),
   ACE_NTOHL (0x656e7400),  // name = environment
     CORBA::tk_alias, // typecode kind for typedefs
   236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     49,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f456e76), 
-    ACE_NTOHL (0x69726f6e), 
-    ACE_NTOHL (0x6d656e74), 
-    ACE_NTOHL (0x4c697374), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x496d706c),
+    ACE_NTOHL (0x656d656e),
+    ACE_NTOHL (0x74617469),
+    ACE_NTOHL (0x6f6e5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x2f456e76),
+    ACE_NTOHL (0x69726f6e),
+    ACE_NTOHL (0x6d656e74),
+    ACE_NTOHL (0x4c697374),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
         16,
-    ACE_NTOHL (0x456e7669), 
-    ACE_NTOHL (0x726f6e6d), 
-    ACE_NTOHL (0x656e744c), 
+    ACE_NTOHL (0x456e7669),
+    ACE_NTOHL (0x726f6e6d),
+    ACE_NTOHL (0x656e744c),
     ACE_NTOHL (0x69737400),  // name = EnvironmentList
         CORBA::tk_sequence, // typecode kind
     148, // encapsulation length
@@ -2057,95 +1893,95 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
       132, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         53,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f456e76), 
-        ACE_NTOHL (0x69726f6e), 
-        ACE_NTOHL (0x6d656e74), 
-        ACE_NTOHL (0x56617269), 
-        ACE_NTOHL (0x61626c65), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x496d706c),
+        ACE_NTOHL (0x656d656e),
+        ACE_NTOHL (0x74617469),
+        ACE_NTOHL (0x6f6e5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x2f456e76),
+        ACE_NTOHL (0x69726f6e),
+        ACE_NTOHL (0x6d656e74),
+        ACE_NTOHL (0x56617269),
+        ACE_NTOHL (0x61626c65),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                 20,
-        ACE_NTOHL (0x456e7669), 
-        ACE_NTOHL (0x726f6e6d), 
-        ACE_NTOHL (0x656e7456), 
-        ACE_NTOHL (0x61726961), 
+        ACE_NTOHL (0x456e7669),
+        ACE_NTOHL (0x726f6e6d),
+        ACE_NTOHL (0x656e7456),
+        ACE_NTOHL (0x61726961),
         ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
         2, // member count
                 5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
         6,
-        ACE_NTOHL (0x76616c75), 
+        ACE_NTOHL (0x76616c75),
         ACE_NTOHL (0x65000000),  // name = value
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       0U,
 
 
   18,
-  ACE_NTOHL (0x776f726b), 
-  ACE_NTOHL (0x696e675f), 
-  ACE_NTOHL (0x64697265), 
-  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x776f726b),
+  ACE_NTOHL (0x696e675f),
+  ACE_NTOHL (0x64697265),
+  ACE_NTOHL (0x63746f72),
   ACE_NTOHL (0x79000000),  // name = working_directory
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
   11,
-  ACE_NTOHL (0x61637469), 
-  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x61637469),
+  ACE_NTOHL (0x76617469),
   ACE_NTOHL (0x6f6e0000),  // name = activation
     CORBA::tk_enum, // typecode kind
   136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f416374), 
-    ACE_NTOHL (0x69766174), 
-    ACE_NTOHL (0x696f6e4d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x496d706c),
+    ACE_NTOHL (0x656d656e),
+    ACE_NTOHL (0x74617469),
+    ACE_NTOHL (0x6f6e5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x2f416374),
+    ACE_NTOHL (0x69766174),
+    ACE_NTOHL (0x696f6e4d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
     15,
-    ACE_NTOHL (0x41637469), 
-    ACE_NTOHL (0x76617469), 
-    ACE_NTOHL (0x6f6e4d6f), 
+    ACE_NTOHL (0x41637469),
+    ACE_NTOHL (0x76617469),
+    ACE_NTOHL (0x6f6e4d6f),
     ACE_NTOHL (0x64650000),  // name = ActivationMode
     4, // member count
     7,
-    ACE_NTOHL (0x4e4f524d), 
+    ACE_NTOHL (0x4e4f524d),
     ACE_NTOHL (0x414c0000),  // name = NORMAL
     7,
-    ACE_NTOHL (0x4d414e55), 
+    ACE_NTOHL (0x4d414e55),
     ACE_NTOHL (0x414c0000),  // name = MANUAL
     11,
-    ACE_NTOHL (0x5045525f), 
-    ACE_NTOHL (0x434c4945), 
+    ACE_NTOHL (0x5045525f),
+    ACE_NTOHL (0x434c4945),
     ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
     11,
-    ACE_NTOHL (0x4155544f), 
-    ACE_NTOHL (0x5f535441), 
+    ACE_NTOHL (0x4155544f),
+    ACE_NTOHL (0x5f535441),
     ACE_NTOHL (0x52540000),  // name = AUTO_START
-    
+
   9,
-  ACE_NTOHL (0x6c6f6361), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x6c6f6361),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = location
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
 };
 
@@ -2166,8 +2002,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -2176,101 +2012,132 @@ void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_v
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      StartupOptions
+    >;
+
+template class
+  TAO_Out_T<
+      StartupOptions,
+      StartupOptions_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      StartupOptions \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      StartupOptions, \
+      StartupOptions_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f536572),
+  ACE_NTOHL (0x76657249),
+  ACE_NTOHL (0x6e666f72),
+  ACE_NTOHL (0x6d617469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
     18,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x6572496e),
+  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e000000),  // name = ServerInformation
   4, // member count
     15,
-  ACE_NTOHL (0x6c6f6769), 
-  ACE_NTOHL (0x63616c5f), 
-  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6c6f6769),
+  ACE_NTOHL (0x63616c5f),
+  ACE_NTOHL (0x73657276),
   ACE_NTOHL (0x65720000),  // name = logical_server
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
   7,
-  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x73657276),
   ACE_NTOHL (0x65720000),  // name = server
-    CORBA::tk_string, 
+    CORBA::tk_string,
   0U, // string length
   8,
-  ACE_NTOHL (0x73746172), 
+  ACE_NTOHL (0x73746172),
   ACE_NTOHL (0x74757000),  // name = startup
     CORBA::tk_struct, // typecode kind
   584, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f537461), 
-    ACE_NTOHL (0x72747570), 
-    ACE_NTOHL (0x4f707469), 
-    ACE_NTOHL (0x6f6e733a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x496d706c),
+    ACE_NTOHL (0x656d656e),
+    ACE_NTOHL (0x74617469),
+    ACE_NTOHL (0x6f6e5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x2f537461),
+    ACE_NTOHL (0x72747570),
+    ACE_NTOHL (0x4f707469),
+    ACE_NTOHL (0x6f6e733a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
         15,
-    ACE_NTOHL (0x53746172), 
-    ACE_NTOHL (0x7475704f), 
-    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x53746172),
+    ACE_NTOHL (0x7475704f),
+    ACE_NTOHL (0x7074696f),
     ACE_NTOHL (0x6e730000),  // name = StartupOptions
     5, // member count
         13,
-    ACE_NTOHL (0x636f6d6d), 
-    ACE_NTOHL (0x616e645f), 
-    ACE_NTOHL (0x6c696e65), 
+    ACE_NTOHL (0x636f6d6d),
+    ACE_NTOHL (0x616e645f),
+    ACE_NTOHL (0x6c696e65),
     ACE_NTOHL (0x0),  // name = command_line
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
     12,
-    ACE_NTOHL (0x656e7669), 
-    ACE_NTOHL (0x726f6e6d), 
+    ACE_NTOHL (0x656e7669),
+    ACE_NTOHL (0x726f6e6d),
     ACE_NTOHL (0x656e7400),  // name = environment
         CORBA::tk_alias, // typecode kind for typedefs
     236, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       49,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f456e76), 
-      ACE_NTOHL (0x69726f6e), 
-      ACE_NTOHL (0x6d656e74), 
-      ACE_NTOHL (0x4c697374), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x496d706c),
+      ACE_NTOHL (0x656d656e),
+      ACE_NTOHL (0x74617469),
+      ACE_NTOHL (0x6f6e5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x2f456e76),
+      ACE_NTOHL (0x69726f6e),
+      ACE_NTOHL (0x6d656e74),
+      ACE_NTOHL (0x4c697374),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
             16,
-      ACE_NTOHL (0x456e7669), 
-      ACE_NTOHL (0x726f6e6d), 
-      ACE_NTOHL (0x656e744c), 
+      ACE_NTOHL (0x456e7669),
+      ACE_NTOHL (0x726f6e6d),
+      ACE_NTOHL (0x656e744c),
       ACE_NTOHL (0x69737400),  // name = EnvironmentList
             CORBA::tk_sequence, // typecode kind
       148, // encapsulation length
@@ -2279,120 +2146,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
         132, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           53,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f456e76), 
-          ACE_NTOHL (0x69726f6e), 
-          ACE_NTOHL (0x6d656e74), 
-          ACE_NTOHL (0x56617269), 
-          ACE_NTOHL (0x61626c65), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x496d706c),
+          ACE_NTOHL (0x656d656e),
+          ACE_NTOHL (0x74617469),
+          ACE_NTOHL (0x6f6e5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x2f456e76),
+          ACE_NTOHL (0x69726f6e),
+          ACE_NTOHL (0x6d656e74),
+          ACE_NTOHL (0x56617269),
+          ACE_NTOHL (0x61626c65),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                     20,
-          ACE_NTOHL (0x456e7669), 
-          ACE_NTOHL (0x726f6e6d), 
-          ACE_NTOHL (0x656e7456), 
-          ACE_NTOHL (0x61726961), 
+          ACE_NTOHL (0x456e7669),
+          ACE_NTOHL (0x726f6e6d),
+          ACE_NTOHL (0x656e7456),
+          ACE_NTOHL (0x61726961),
           ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
           2, // member count
                     5,
-          ACE_NTOHL (0x6e616d65), 
+          ACE_NTOHL (0x6e616d65),
           ACE_NTOHL (0x0),  // name = name
-                    CORBA::tk_string, 
+                    CORBA::tk_string,
           0U, // string length
           6,
-          ACE_NTOHL (0x76616c75), 
+          ACE_NTOHL (0x76616c75),
           ACE_NTOHL (0x65000000),  // name = value
-                    CORBA::tk_string, 
+                    CORBA::tk_string,
           0U, // string length
 
         0U,
 
 
     18,
-    ACE_NTOHL (0x776f726b), 
-    ACE_NTOHL (0x696e675f), 
-    ACE_NTOHL (0x64697265), 
-    ACE_NTOHL (0x63746f72), 
+    ACE_NTOHL (0x776f726b),
+    ACE_NTOHL (0x696e675f),
+    ACE_NTOHL (0x64697265),
+    ACE_NTOHL (0x63746f72),
     ACE_NTOHL (0x79000000),  // name = working_directory
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
     11,
-    ACE_NTOHL (0x61637469), 
-    ACE_NTOHL (0x76617469), 
+    ACE_NTOHL (0x61637469),
+    ACE_NTOHL (0x76617469),
     ACE_NTOHL (0x6f6e0000),  // name = activation
         CORBA::tk_enum, // typecode kind
     136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
       48,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f416374), 
-      ACE_NTOHL (0x69766174), 
-      ACE_NTOHL (0x696f6e4d), 
-      ACE_NTOHL (0x6f64653a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x496d706c),
+      ACE_NTOHL (0x656d656e),
+      ACE_NTOHL (0x74617469),
+      ACE_NTOHL (0x6f6e5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x2f416374),
+      ACE_NTOHL (0x69766174),
+      ACE_NTOHL (0x696f6e4d),
+      ACE_NTOHL (0x6f64653a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
       15,
-      ACE_NTOHL (0x41637469), 
-      ACE_NTOHL (0x76617469), 
-      ACE_NTOHL (0x6f6e4d6f), 
+      ACE_NTOHL (0x41637469),
+      ACE_NTOHL (0x76617469),
+      ACE_NTOHL (0x6f6e4d6f),
       ACE_NTOHL (0x64650000),  // name = ActivationMode
       4, // member count
       7,
-      ACE_NTOHL (0x4e4f524d), 
+      ACE_NTOHL (0x4e4f524d),
       ACE_NTOHL (0x414c0000),  // name = NORMAL
       7,
-      ACE_NTOHL (0x4d414e55), 
+      ACE_NTOHL (0x4d414e55),
       ACE_NTOHL (0x414c0000),  // name = MANUAL
       11,
-      ACE_NTOHL (0x5045525f), 
-      ACE_NTOHL (0x434c4945), 
+      ACE_NTOHL (0x5045525f),
+      ACE_NTOHL (0x434c4945),
       ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
       11,
-      ACE_NTOHL (0x4155544f), 
-      ACE_NTOHL (0x5f535441), 
+      ACE_NTOHL (0x4155544f),
+      ACE_NTOHL (0x5f535441),
       ACE_NTOHL (0x52540000),  // name = AUTO_START
-      
+
     9,
-    ACE_NTOHL (0x6c6f6361), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x6c6f6361),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = location
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
   9,
-  ACE_NTOHL (0x6c6f6361), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x6c6f6361),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = location
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f416464), 
-    ACE_NTOHL (0x72657373), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x496d706c),
+    ACE_NTOHL (0x656d656e),
+    ACE_NTOHL (0x74617469),
+    ACE_NTOHL (0x6f6e5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x2f416464),
+    ACE_NTOHL (0x72657373),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
         8,
-    ACE_NTOHL (0x41646472), 
+    ACE_NTOHL (0x41646472),
     ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string, 
+        CORBA::tk_string,
     0U, // string length
 
 };
@@ -2414,8 +2281,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -2423,117 +2290,70 @@ void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_ta
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-void
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_allocate_buffer (CORBA::ULong length)
-{
-  ImplementationRepository::ServerInformation* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      ImplementationRepository::ServerInformation *old =
-        ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Var_Var_T<
+      ServerInformation
+    >;
 
-void
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  ImplementationRepository::ServerInformation *tmp =
-    ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
-  _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
-  this->buffer_ = 0;
-} 
+template class
+  TAO_Out_T<
+      ServerInformation,
+      ServerInformation_var
+    >;
 
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ServerInformation \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      ServerInformation, \
+      ServerInformation_var \
+    >
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// ImplementationRepository::ServerInformationList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 ImplementationRepository::ServerInformationList::ServerInformationList (void)
 {}
 
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        ImplementationRepository::ServerInformation
+      >
+    (max)
 {}
 
 ImplementationRepository::ServerInformationList::ServerInformationList (
     CORBA::ULong max,
     CORBA::ULong length,
-    ImplementationRepository::ServerInformation *buffer,
+    ImplementationRepository::ServerInformation* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        ImplementationRepository::ServerInformation
+      >
+    (max, length, buffer, release)
 {}
 
 ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        ImplementationRepository::ServerInformation
+      >
+    (seq)
 {}
 
-ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor
+ImplementationRepository::ServerInformationList::~ServerInformationList (void)
 {}
 
 void ImplementationRepository::ServerInformationList::_tao_any_destructor (void *_tao_void_pointer)
@@ -2542,7 +2362,37 @@ void ImplementationRepository::ServerInformationList::_tao_any_destructor (void
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      ServerInformationList,
+      ImplementationRepository::ServerInformation
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ServerInformationList,
+      ServerInformationList_var,
+      ImplementationRepository::ServerInformation
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ServerInformationList, \
+      ImplementationRepository::ServerInformation \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ServerInformationList, \
+      ServerInformationList_var, \
+      ImplementationRepository::ServerInformation \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -2551,26 +2401,26 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e4c69), 
-  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f536572),
+  ACE_NTOHL (0x76657249),
+  ACE_NTOHL (0x6e666f72),
+  ACE_NTOHL (0x6d617469),
+  ACE_NTOHL (0x6f6e4c69),
+  ACE_NTOHL (0x73743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0
     22,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e4c6973), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x6572496e),
+  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e4c6973),
   ACE_NTOHL (0x74000000),  // name = ServerInformationList
     CORBA::tk_sequence, // typecode kind
   852, // encapsulation length
@@ -2579,95 +2429,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
     836, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       51,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f536572), 
-      ACE_NTOHL (0x76657249), 
-      ACE_NTOHL (0x6e666f72), 
-      ACE_NTOHL (0x6d617469), 
-      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x496d706c),
+      ACE_NTOHL (0x656d656e),
+      ACE_NTOHL (0x74617469),
+      ACE_NTOHL (0x6f6e5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x2f536572),
+      ACE_NTOHL (0x76657249),
+      ACE_NTOHL (0x6e666f72),
+      ACE_NTOHL (0x6d617469),
+      ACE_NTOHL (0x6f6e3a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
             18,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x6572496e), 
-      ACE_NTOHL (0x666f726d), 
-      ACE_NTOHL (0x6174696f), 
+      ACE_NTOHL (0x53657276),
+      ACE_NTOHL (0x6572496e),
+      ACE_NTOHL (0x666f726d),
+      ACE_NTOHL (0x6174696f),
       ACE_NTOHL (0x6e000000),  // name = ServerInformation
       4, // member count
             15,
-      ACE_NTOHL (0x6c6f6769), 
-      ACE_NTOHL (0x63616c5f), 
-      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x6c6f6769),
+      ACE_NTOHL (0x63616c5f),
+      ACE_NTOHL (0x73657276),
       ACE_NTOHL (0x65720000),  // name = logical_server
-            CORBA::tk_string, 
+            CORBA::tk_string,
       0U, // string length
       7,
-      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x73657276),
       ACE_NTOHL (0x65720000),  // name = server
-            CORBA::tk_string, 
+            CORBA::tk_string,
       0U, // string length
       8,
-      ACE_NTOHL (0x73746172), 
+      ACE_NTOHL (0x73746172),
       ACE_NTOHL (0x74757000),  // name = startup
             CORBA::tk_struct, // typecode kind
       584, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         48,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f537461), 
-        ACE_NTOHL (0x72747570), 
-        ACE_NTOHL (0x4f707469), 
-        ACE_NTOHL (0x6f6e733a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x496d706c),
+        ACE_NTOHL (0x656d656e),
+        ACE_NTOHL (0x74617469),
+        ACE_NTOHL (0x6f6e5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x2f537461),
+        ACE_NTOHL (0x72747570),
+        ACE_NTOHL (0x4f707469),
+        ACE_NTOHL (0x6f6e733a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
                 15,
-        ACE_NTOHL (0x53746172), 
-        ACE_NTOHL (0x7475704f), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x53746172),
+        ACE_NTOHL (0x7475704f),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = StartupOptions
         5, // member count
                 13,
-        ACE_NTOHL (0x636f6d6d), 
-        ACE_NTOHL (0x616e645f), 
-        ACE_NTOHL (0x6c696e65), 
+        ACE_NTOHL (0x636f6d6d),
+        ACE_NTOHL (0x616e645f),
+        ACE_NTOHL (0x6c696e65),
         ACE_NTOHL (0x0),  // name = command_line
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
         12,
-        ACE_NTOHL (0x656e7669), 
-        ACE_NTOHL (0x726f6e6d), 
+        ACE_NTOHL (0x656e7669),
+        ACE_NTOHL (0x726f6e6d),
         ACE_NTOHL (0x656e7400),  // name = environment
                 CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           49,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f456e76), 
-          ACE_NTOHL (0x69726f6e), 
-          ACE_NTOHL (0x6d656e74), 
-          ACE_NTOHL (0x4c697374), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x496d706c),
+          ACE_NTOHL (0x656d656e),
+          ACE_NTOHL (0x74617469),
+          ACE_NTOHL (0x6f6e5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x2f456e76),
+          ACE_NTOHL (0x69726f6e),
+          ACE_NTOHL (0x6d656e74),
+          ACE_NTOHL (0x4c697374),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
                     16,
-          ACE_NTOHL (0x456e7669), 
-          ACE_NTOHL (0x726f6e6d), 
-          ACE_NTOHL (0x656e744c), 
+          ACE_NTOHL (0x456e7669),
+          ACE_NTOHL (0x726f6e6d),
+          ACE_NTOHL (0x656e744c),
           ACE_NTOHL (0x69737400),  // name = EnvironmentList
                     CORBA::tk_sequence, // typecode kind
           148, // encapsulation length
@@ -2676,120 +2526,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
             132, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               53,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x496d706c), 
-              ACE_NTOHL (0x656d656e), 
-              ACE_NTOHL (0x74617469), 
-              ACE_NTOHL (0x6f6e5265), 
-              ACE_NTOHL (0x706f7369), 
-              ACE_NTOHL (0x746f7279), 
-              ACE_NTOHL (0x2f456e76), 
-              ACE_NTOHL (0x69726f6e), 
-              ACE_NTOHL (0x6d656e74), 
-              ACE_NTOHL (0x56617269), 
-              ACE_NTOHL (0x61626c65), 
-              ACE_NTOHL (0x3a312e30), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x496d706c),
+              ACE_NTOHL (0x656d656e),
+              ACE_NTOHL (0x74617469),
+              ACE_NTOHL (0x6f6e5265),
+              ACE_NTOHL (0x706f7369),
+              ACE_NTOHL (0x746f7279),
+              ACE_NTOHL (0x2f456e76),
+              ACE_NTOHL (0x69726f6e),
+              ACE_NTOHL (0x6d656e74),
+              ACE_NTOHL (0x56617269),
+              ACE_NTOHL (0x61626c65),
+              ACE_NTOHL (0x3a312e30),
               ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                             20,
-              ACE_NTOHL (0x456e7669), 
-              ACE_NTOHL (0x726f6e6d), 
-              ACE_NTOHL (0x656e7456), 
-              ACE_NTOHL (0x61726961), 
+              ACE_NTOHL (0x456e7669),
+              ACE_NTOHL (0x726f6e6d),
+              ACE_NTOHL (0x656e7456),
+              ACE_NTOHL (0x61726961),
               ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
               2, // member count
                             5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
-                            CORBA::tk_string, 
+                            CORBA::tk_string,
               0U, // string length
               6,
-              ACE_NTOHL (0x76616c75), 
+              ACE_NTOHL (0x76616c75),
               ACE_NTOHL (0x65000000),  // name = value
-                            CORBA::tk_string, 
+                            CORBA::tk_string,
               0U, // string length
 
             0U,
 
 
         18,
-        ACE_NTOHL (0x776f726b), 
-        ACE_NTOHL (0x696e675f), 
-        ACE_NTOHL (0x64697265), 
-        ACE_NTOHL (0x63746f72), 
+        ACE_NTOHL (0x776f726b),
+        ACE_NTOHL (0x696e675f),
+        ACE_NTOHL (0x64697265),
+        ACE_NTOHL (0x63746f72),
         ACE_NTOHL (0x79000000),  // name = working_directory
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
         11,
-        ACE_NTOHL (0x61637469), 
-        ACE_NTOHL (0x76617469), 
+        ACE_NTOHL (0x61637469),
+        ACE_NTOHL (0x76617469),
         ACE_NTOHL (0x6f6e0000),  // name = activation
                 CORBA::tk_enum, // typecode kind
         136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           48,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f416374), 
-          ACE_NTOHL (0x69766174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x496d706c),
+          ACE_NTOHL (0x656d656e),
+          ACE_NTOHL (0x74617469),
+          ACE_NTOHL (0x6f6e5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x2f416374),
+          ACE_NTOHL (0x69766174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
           15,
-          ACE_NTOHL (0x41637469), 
-          ACE_NTOHL (0x76617469), 
-          ACE_NTOHL (0x6f6e4d6f), 
+          ACE_NTOHL (0x41637469),
+          ACE_NTOHL (0x76617469),
+          ACE_NTOHL (0x6f6e4d6f),
           ACE_NTOHL (0x64650000),  // name = ActivationMode
           4, // member count
           7,
-          ACE_NTOHL (0x4e4f524d), 
+          ACE_NTOHL (0x4e4f524d),
           ACE_NTOHL (0x414c0000),  // name = NORMAL
           7,
-          ACE_NTOHL (0x4d414e55), 
+          ACE_NTOHL (0x4d414e55),
           ACE_NTOHL (0x414c0000),  // name = MANUAL
           11,
-          ACE_NTOHL (0x5045525f), 
-          ACE_NTOHL (0x434c4945), 
+          ACE_NTOHL (0x5045525f),
+          ACE_NTOHL (0x434c4945),
           ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
           11,
-          ACE_NTOHL (0x4155544f), 
-          ACE_NTOHL (0x5f535441), 
+          ACE_NTOHL (0x4155544f),
+          ACE_NTOHL (0x5f535441),
           ACE_NTOHL (0x52540000),  // name = AUTO_START
-          
+
         9,
-        ACE_NTOHL (0x6c6f6361), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x6c6f6361),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = location
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
       9,
-      ACE_NTOHL (0x6c6f6361), 
-      ACE_NTOHL (0x74696f6e), 
+      ACE_NTOHL (0x6c6f6361),
+      ACE_NTOHL (0x74696f6e),
       ACE_NTOHL (0x0),  // name = location
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         41,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f416464), 
-        ACE_NTOHL (0x72657373), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x496d706c),
+        ACE_NTOHL (0x656d656e),
+        ACE_NTOHL (0x74617469),
+        ACE_NTOHL (0x6f6e5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x2f416464),
+        ACE_NTOHL (0x72657373),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
                 8,
-        ACE_NTOHL (0x41646472), 
+        ACE_NTOHL (0x41646472),
         ACE_NTOHL (0x65737300),  // name = Address
-                CORBA::tk_string, 
+                CORBA::tk_string,
         0U, // string length
 
 
@@ -2820,7 +2670,7 @@ TAO_NAMESPACE_END
 int ImplementationRepository::Administration::_tao_class_id = 0;
 
 ImplementationRepository::Administration_ptr
-tao_ImplementationRepository_Administration_duplicate (
+ImplementationRepository::tao_Administration_life::tao_duplicate (
     ImplementationRepository::Administration_ptr p
   )
 {
@@ -2828,7 +2678,7 @@ tao_ImplementationRepository_Administration_duplicate (
 }
 
 void
-tao_ImplementationRepository_Administration_release (
+ImplementationRepository::tao_Administration_life::tao_release (
     ImplementationRepository::Administration_ptr p
   )
 {
@@ -2836,228 +2686,64 @@ tao_ImplementationRepository_Administration_release (
 }
 
 ImplementationRepository::Administration_ptr
-tao_ImplementationRepository_Administration_nil (
+ImplementationRepository::tao_Administration_life::tao_nil (
     void
   )
 {
   return ImplementationRepository::Administration::_nil ();
 }
 
-ImplementationRepository::Administration_ptr
-tao_ImplementationRepository_Administration_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_ImplementationRepository_Administration_upcast (
-    void *src
-  )
-{
-  ImplementationRepository::Administration **tmp =
-    ACE_static_cast (ImplementationRepository::Administration **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_ImplementationRepository_Administration_marshal (
+ImplementationRepository::tao_Administration_life::tao_marshal (
     ImplementationRepository::Administration_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// ImplementationRepository::Administration_var
-// *************************************************************
-
-ImplementationRepository::Administration_var::Administration_var (void)
-  : ptr_ (Administration::_nil ())
-{}
-
-::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ImplementationRepository::Administration_var::Administration_var (const ::ImplementationRepository::Administration_var &p)
-  : TAO_Base_var (),
-    ptr_ (Administration::_duplicate (p.ptr ()))
-{}
-
-ImplementationRepository::Administration_var::~Administration_var (void)
-{
-  CORBA::release (this->ptr_);
+  return p->marshal (cdr);
 }
 
-ImplementationRepository::Administration_var &
-ImplementationRepository::Administration_var::operator= (Administration_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ImplementationRepository::Administration_var &
-ImplementationRepository::Administration_var::operator= (const ::ImplementationRepository::Administration_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::Administration_ptr &
-ImplementationRepository::Administration_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::Administration_ptr &
-ImplementationRepository::Administration_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
-  return this->ptr_;
-}
-
-::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::ImplementationRepository::Administration_ptr val = this->ptr_;
-  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
-  return val;
-}
-
-::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::tao_duplicate (Administration_ptr p)
-{
-  return ::ImplementationRepository::Administration::_duplicate (p);
-}
-
-void
-ImplementationRepository::Administration_var::tao_release (Administration_ptr p)
-{
-  CORBA::release (p);
-}
-
-::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::tao_nil (void)
-{
-  return ::ImplementationRepository::Administration::_nil ();
-}
-
-::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::tao_narrow (
+ImplementationRepository::Administration_ptr
+ImplementationRepository::tao_Administration_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-ImplementationRepository::Administration_var::tao_upcast (void *src)
+ImplementationRepository::tao_Administration_cast::tao_upcast (
+    void *src
+  )
 {
-  Administration **tmp =
-    ACE_static_cast (Administration **, src);
+  ImplementationRepository::Administration **tmp =
+    ACE_static_cast (ImplementationRepository::Administration **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// ImplementationRepository::Administration_out
-// *************************************************************
-
-ImplementationRepository::Administration_out::Administration_out (Administration_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
-}
-
-ImplementationRepository::Administration_out::Administration_out (Administration_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
-}
-
-ImplementationRepository::Administration_out::Administration_out (const ::ImplementationRepository::Administration_out &p)
-  : ptr_ (ACE_const_cast (Administration_out &, p).ptr_)
-{}
-
-::ImplementationRepository::Administration_out &
-ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_out &p)
-{
-  this->ptr_ = ACE_const_cast (Administration_out&, p).ptr_;
-  return *this;
-}
-
-ImplementationRepository::Administration_out &
-ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_var &p)
-{
-  this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ());
-  return *this;
-}
-
-ImplementationRepository::Administration_out &
-ImplementationRepository::Administration_out::operator= (Administration_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::Administration_ptr &
-ImplementationRepository::Administration_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        ImplementationRepository::Administration,
+        ImplementationRepository::tao_Administration_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        ImplementationRepository::Administration,
+        ImplementationRepository::tao_Administration_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        ImplementationRepository::Administration, \
+        ImplementationRepository::tao_Administration_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        ImplementationRepository::Administration, \
+        ImplementationRepository::tao_Administration_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -3078,10 +2764,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3090,15 +2776,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
     const char * server_;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3112,15 +2798,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3132,15 +2818,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-  
+
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -3152,7 +2838,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3161,7 +2847,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3182,33 +2868,33 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (char * result);
-    
+
   private:
     TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &);
     const char * server_;
     const CORBA::Long & check_startup_;
-    
+
     char * _result;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
       const CORBA::Long & check_startup
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server),
@@ -3223,19 +2909,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_wi
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= check_startup_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3247,15 +2933,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_wi
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-  
+
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -3267,7 +2953,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_wi
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3276,17 +2962,17 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_wi
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (char * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -3305,10 +2991,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3318,16 +3004,16 @@ public:
     const char * server_;
     const ImplementationRepository::StartupOptions & options_;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server),
@@ -3342,19 +3028,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3366,14 +3052,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_AlreadyRegistered
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3385,7 +3071,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3394,7 +3080,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3415,10 +3101,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3428,16 +3114,16 @@ public:
     const char * server_;
     const ImplementationRepository::StartupOptions & options_;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server),
@@ -3452,19 +3138,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3476,11 +3162,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3489,7 +3175,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3509,10 +3195,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3521,15 +3207,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
     const char * server_;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3543,15 +3229,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arg
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3563,14 +3249,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3582,7 +3268,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3591,7 +3277,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3611,10 +3297,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3623,15 +3309,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
     const char * server_;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3645,15 +3331,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::a
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3665,14 +3351,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3684,7 +3370,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3693,7 +3379,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3715,35 +3401,35 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (char * result);
-    
+
   private:
     TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
     const char * server_;
     const char * addr_;
     ImplementationRepository::ServerObject_ptr server_object_;
-    
+
     char * _result;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server),
@@ -3759,23 +3445,23 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<= addr_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3787,14 +3473,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3806,7 +3492,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3815,17 +3501,17 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -3843,10 +3529,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3855,15 +3541,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
     const char * server_;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3877,15 +3563,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3897,14 +3583,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3916,7 +3602,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -3925,7 +3611,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -3945,10 +3631,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3957,15 +3643,15 @@ public:
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
     const char * server_;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       server_ (server)
@@ -3979,15 +3665,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -3999,14 +3685,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] =
   {
     ImplementationRepository::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -4018,7 +3704,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (
   return safe_exception_list._retn ();
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4027,7 +3713,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4042,38 +3728,38 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many      
+      const CORBA::ULong & how_many
 
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
     TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-    const CORBA::ULong & how_many_;    
+    const CORBA::ULong & how_many_;
 
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many      
+      const CORBA::ULong & how_many
 
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      how_many_ (how_many)  
+      how_many_ (how_many)
 
 {}
 
@@ -4085,15 +3771,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (A
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    
+
 
   return safe_parameter_list._retn ();
 }
@@ -4106,11 +3792,11 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -4119,7 +3805,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -4131,7 +3817,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void)
@@ -4156,7 +3842,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
     , ImplementationRepository::CannotActivate
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -4169,12 +3855,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server",
@@ -4182,22 +3868,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server _tao_ri (
           &_tao_call,
@@ -4206,14 +3892,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4221,70 +3907,76 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4294,56 +3986,54 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -4362,7 +4052,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate
     , ImplementationRepository::CannotActivate
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -4376,12 +4066,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate
 
 CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server_with_startup",
@@ -4389,22 +4079,22 @@ CORBA::String_var _tao_retval;
       2,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup _tao_ri (
           &_tao_call,
@@ -4414,14 +4104,14 @@ CORBA::String_var _tao_retval;
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4429,92 +4119,96 @@ CORBA::String_var _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server) &&
-              (_tao_out << check_startup)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server) &&
+                  (_tao_out << check_startup)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  char * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          char * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4524,59 +4218,57 @@ CORBA::String_var _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -4593,7 +4285,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/AlreadyRegistered:1.0",
@@ -4602,12 +4294,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_server",
@@ -4615,22 +4307,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       2,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server _tao_ri (
           &_tao_call,
@@ -4640,14 +4332,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4655,71 +4347,77 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server) &&
-              (_tao_out << options)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK;
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server) &&
+                  (_tao_out << options)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4729,56 +4427,54 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -4796,12 +4492,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "reregister_server",
@@ -4809,22 +4505,22 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
       2,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server _tao_ri (
           &_tao_call,
@@ -4834,14 +4530,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -4849,71 +4545,77 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server) &&
-              (_tao_out << options)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK;
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server) &&
+                  (_tao_out << options)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -4923,56 +4625,54 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -4989,7 +4689,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -4998,12 +4698,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "remove_server",
@@ -5011,22 +4711,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server _tao_ri (
           &_tao_call,
@@ -5035,14 +4735,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5050,70 +4750,76 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -5123,56 +4829,54 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -5189,7 +4893,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -5198,12 +4902,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown_server",
@@ -5211,22 +4915,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server _tao_ri (
           &_tao_call,
@@ -5235,14 +4939,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5250,70 +4954,76 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -5323,56 +5033,54 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -5391,7 +5099,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -5401,12 +5109,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
 
 CORBA::String_var _tao_retval;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_running",
@@ -5414,22 +5122,22 @@ CORBA::String_var _tao_retval;
       3,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running _tao_ri (
           &_tao_call,
@@ -5440,14 +5148,14 @@ CORBA::String_var _tao_retval;
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5455,93 +5163,97 @@ CORBA::String_var _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server) &&
-              (_tao_out << addr) &&
-              (_tao_out << server_object)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  0
-                );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  0
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server) &&
+                  (_tao_out << addr) &&
+                  (_tao_out << server_object)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      0
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> _tao_retval.inout ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  char * _tao_retval_info =
+                    _tao_retval._retn ();
+                  _tao_ri.result (_tao_retval_info);
+                  _tao_retval = _tao_retval_info;
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> _tao_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  0
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          char * _tao_retval_info =
-            _tao_retval._retn ();
-          _tao_ri.result (_tao_retval_info);
-          _tao_retval = _tao_retval_info;
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -5551,59 +5263,57 @@ CORBA::String_var _tao_retval;
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval._retn ();
+
+return _tao_retval._retn ();
 }
 
 // TAO_IDL - Generated from
@@ -5619,7 +5329,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -5628,12 +5338,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_shutting_down",
@@ -5641,22 +5351,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down _tao_ri (
           &_tao_call,
@@ -5665,14 +5375,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5680,70 +5390,76 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -5753,56 +5469,54 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -5820,7 +5534,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
+    static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/NotFound:1.0",
@@ -5829,7 +5543,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
   };
 
 TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
@@ -5838,7 +5552,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       info.ptr (),
       ImplementationRepository::ServerInformation
     );
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "find",
@@ -5846,22 +5560,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_find _tao_ri (
           &_tao_call,
@@ -5870,14 +5584,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -5885,83 +5599,89 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << server)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << server)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!((_tao_in >> *info.ptr ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK;
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!((_tao_in >> *info.ptr ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    )
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -5971,56 +5691,54 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
@@ -6039,7 +5757,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
@@ -6048,7 +5766,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
       server_list.ptr (),
       ImplementationRepository::ServerInformationList
     );
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "list",
@@ -6056,39 +5774,39 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_list _tao_ri (
           &_tao_call,
           _collocated_tao_target_,
-          how_many          
+          how_many
 
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -6096,84 +5814,90 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << how_many)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      
-                    )
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
+              TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << how_many)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK;
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!((_tao_in >> *server_list.ptr ()) &&
+                      (_tao_in >> server_iterator.ptr ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK;
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!((_tao_in >> *server_list.ptr ()) &&
-              (_tao_in >> server_iterator.ptr ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    )
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -6183,61 +5907,59 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -6288,8 +6010,8 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 ImplementationRepository::Administration::Administration (int collocated)
 {
@@ -6310,7 +6032,7 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
 ImplementationRepository::Administration::~Administration (void)
 {}
 
-void 
+void
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
   Administration *tmp = ACE_static_cast (Administration *, _tao_void_pointer);
@@ -6327,7 +6049,7 @@ ImplementationRepository::Administration::_narrow (
     {
       return Administration::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -6336,17 +6058,17 @@ ImplementationRepository::Administration::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (Administration::_nil ());
-      
+
       if (is_a == 0)
         {
           return Administration::_nil ();
         }
     }
-  
+
   return Administration::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-ImplementationRepository::Administration_ptr 
+ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6356,18 +6078,18 @@ ImplementationRepository::Administration::_unchecked_narrow (
     {
       return Administration::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       Administration_ptr default_proxy = Administration::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -6385,7 +6107,7 @@ ImplementationRepository::Administration::_unchecked_narrow (
               Administration::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -6398,10 +6120,10 @@ ImplementationRepository::Administration::_unchecked_narrow (
               Administration::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           Administration_ptr,
@@ -6421,7 +6143,7 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -6456,7 +6178,7 @@ ImplementationRepository::Administration::_is_a (
 void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::ImplementationRepository, Administration)::_tao_class_id)
@@ -6475,12 +6197,12 @@ void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -6489,6 +6211,12 @@ const char* ImplementationRepository::Administration::_interface_repository_id (
   return "IDL:ImplementationRepository/Administration:1.0";
 }
 
+CORBA::Boolean
+ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -6502,10 +6230,10 @@ void ImplementationRepository::Administration::activate_server (
     , ImplementationRepository::CannotActivate
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.activate_server (
       this,
       server
@@ -6527,10 +6255,10 @@ char * ImplementationRepository::Administration::activate_server_with_startup (
     , ImplementationRepository::CannotActivate
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.activate_server_with_startup (
       this,
       server,
@@ -6552,10 +6280,10 @@ void ImplementationRepository::Administration::register_server (
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.register_server (
       this,
       server,
@@ -6576,10 +6304,10 @@ void ImplementationRepository::Administration::reregister_server (
     CORBA::SystemException
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.reregister_server (
       this,
       server,
@@ -6600,10 +6328,10 @@ void ImplementationRepository::Administration::remove_server (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.remove_server (
       this,
       server
@@ -6623,10 +6351,10 @@ void ImplementationRepository::Administration::shutdown_server (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.shutdown_server (
       this,
       server
@@ -6648,10 +6376,10 @@ char * ImplementationRepository::Administration::server_is_running (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.server_is_running (
       this,
       server,
@@ -6673,10 +6401,10 @@ void ImplementationRepository::Administration::server_is_shutting_down (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.server_is_shutting_down (
       this,
       server
@@ -6697,10 +6425,10 @@ void ImplementationRepository::Administration::find (
     , ImplementationRepository::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.find (
       this,
       server,
@@ -6722,10 +6450,10 @@ void ImplementationRepository::Administration::list (
     CORBA::SystemException
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
+  _TAO_Administration_Proxy_Impl &proxy =
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.list (
       this,
       how_many,
@@ -6742,22 +6470,22 @@ static const CORBA::Long _oc_ImplementationRepository_Administration[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f41646d), 
-  ACE_NTOHL (0x696e6973), 
-  ACE_NTOHL (0x74726174), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f41646d),
+  ACE_NTOHL (0x696e6973),
+  ACE_NTOHL (0x74726174),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
     15,
-  ACE_NTOHL (0x41646d69), 
-  ACE_NTOHL (0x6e697374), 
-  ACE_NTOHL (0x72617469), 
+  ACE_NTOHL (0x41646d69),
+  ACE_NTOHL (0x6e697374),
+  ACE_NTOHL (0x72617469),
   ACE_NTOHL (0x6f6e0000),  // name = Administration
   };
 
@@ -6784,7 +6512,7 @@ TAO_NAMESPACE_END
 int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0;
 
 ImplementationRepository::ServerInformationIterator_ptr
-tao_ImplementationRepository_ServerInformationIterator_duplicate (
+ImplementationRepository::tao_ServerInformationIterator_life::tao_duplicate (
     ImplementationRepository::ServerInformationIterator_ptr p
   )
 {
@@ -6792,7 +6520,7 @@ tao_ImplementationRepository_ServerInformationIterator_duplicate (
 }
 
 void
-tao_ImplementationRepository_ServerInformationIterator_release (
+ImplementationRepository::tao_ServerInformationIterator_life::tao_release (
     ImplementationRepository::ServerInformationIterator_ptr p
   )
 {
@@ -6800,228 +6528,64 @@ tao_ImplementationRepository_ServerInformationIterator_release (
 }
 
 ImplementationRepository::ServerInformationIterator_ptr
-tao_ImplementationRepository_ServerInformationIterator_nil (
+ImplementationRepository::tao_ServerInformationIterator_life::tao_nil (
     void
   )
 {
   return ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
-ImplementationRepository::ServerInformationIterator_ptr
-tao_ImplementationRepository_ServerInformationIterator_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-tao_ImplementationRepository_ServerInformationIterator_upcast (
-    void *src
-  )
-{
-  ImplementationRepository::ServerInformationIterator **tmp =
-    ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src);
-  return *tmp;
-}
-
 CORBA::Boolean
-tao_ImplementationRepository_ServerInformationIterator_marshal (
+ImplementationRepository::tao_ServerInformationIterator_life::tao_marshal (
     ImplementationRepository::ServerInformationIterator_ptr p,
-    TAO_OutputCDR &strm
+    TAO_OutputCDR &cdr
   )
 {
-  return p->marshal (strm);
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// ImplementationRepository::ServerInformationIterator_var
-// *************************************************************
-
-ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (void)
-  : ptr_ (ServerInformationIterator::_nil ())
-{}
-
-::ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (const ::ImplementationRepository::ServerInformationIterator_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServerInformationIterator::_duplicate (p.ptr ()))
-{}
-
-ImplementationRepository::ServerInformationIterator_var::~ServerInformationIterator_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ImplementationRepository::ServerInformationIterator_var &
-ImplementationRepository::ServerInformationIterator_var::operator= (ServerInformationIterator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ImplementationRepository::ServerInformationIterator_var &
-ImplementationRepository::ServerInformationIterator_var::operator= (const ::ImplementationRepository::ServerInformationIterator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ImplementationRepository::ServerInformationIterator_var::operator const ::ImplementationRepository::ServerInformationIterator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr &
-ImplementationRepository::ServerInformationIterator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr &
-ImplementationRepository::ServerInformationIterator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::ImplementationRepository::ServerInformationIterator_ptr val = this->ptr_;
-  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
-  return val;
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::tao_duplicate (ServerInformationIterator_ptr p)
-{
-  return ::ImplementationRepository::ServerInformationIterator::_duplicate (p);
-}
-
-void
-ImplementationRepository::ServerInformationIterator_var::tao_release (ServerInformationIterator_ptr p)
-{
-  CORBA::release (p);
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::tao_nil (void)
-{
-  return ::ImplementationRepository::ServerInformationIterator::_nil ();
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::tao_narrow (
+ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::tao_ServerInformationIterator_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
-ImplementationRepository::ServerInformationIterator_var::tao_upcast (void *src)
+ImplementationRepository::tao_ServerInformationIterator_cast::tao_upcast (
+    void *src
+  )
 {
-  ServerInformationIterator **tmp =
-    ACE_static_cast (ServerInformationIterator **, src);
+  ImplementationRepository::ServerInformationIterator **tmp =
+    ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src);
   return *tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// ImplementationRepository::ServerInformationIterator_out
-// *************************************************************
-
-ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
-}
-
-ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
-}
-
-ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (const ::ImplementationRepository::ServerInformationIterator_out &p)
-  : ptr_ (ACE_const_cast (ServerInformationIterator_out &, p).ptr_)
-{}
-
-::ImplementationRepository::ServerInformationIterator_out &
-ImplementationRepository::ServerInformationIterator_out::operator= (const ::ImplementationRepository::ServerInformationIterator_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerInformationIterator_out&, p).ptr_;
-  return *this;
-}
-
-ImplementationRepository::ServerInformationIterator_out &
-ImplementationRepository::ServerInformationIterator_out::operator= (const ::ImplementationRepository::ServerInformationIterator_var &p)
-{
-  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ImplementationRepository::ServerInformationIterator_out &
-ImplementationRepository::ServerInformationIterator_out::operator= (ServerInformationIterator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ImplementationRepository::ServerInformationIterator_out::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr &
-ImplementationRepository::ServerInformationIterator_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_out::operator-> (void)
-{
-  return this->ptr_;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        ImplementationRepository::ServerInformationIterator,
+        ImplementationRepository::tao_ServerInformationIterator_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        ImplementationRepository::ServerInformationIterator,
+        ImplementationRepository::tao_ServerInformationIterator_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        ImplementationRepository::ServerInformationIterator, \
+        ImplementationRepository::tao_ServerInformationIterator_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        ImplementationRepository::ServerInformationIterator, \
+        ImplementationRepository::tao_ServerInformationIterator_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56
@@ -7042,31 +6606,31 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void result (::CORBA::Boolean result);
-    
+
   private:
     TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
     const CORBA::ULong & how_many_;
-    
+
     ::CORBA::Boolean _result;
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & how_many
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
       how_many_ (how_many)
@@ -7080,15 +6644,15 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
   (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
@@ -7100,11 +6664,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -7113,17 +6677,17 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   CORBA::Any_var safe_result_any = result_any;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
 {
-  // Update the result. 
+  // Update the result.
   this->_result = result;
 }
 
@@ -7140,10 +6704,10 @@ public:
 
     virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7151,14 +6715,14 @@ public:
     TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
   };
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376
+
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
+      ACE_ENV_ARG_DECL_NOT_USED
     )
       : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
@@ -7171,7 +6735,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return parameter_list;
 }
 
@@ -7183,11 +6747,11 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return exception_list;
 }
 
-CORBA::Any * 
+CORBA::Any *
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -7196,7 +6760,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return result_any;
 }
 
@@ -7208,7 +6772,7 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void)
@@ -7234,18 +6798,18 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
 {
   CORBA::Boolean _tao_retval = 0;
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
     }
-    
+
   ACE_NEW_RETURN (
       server_list.ptr (),
       ImplementationRepository::ServerInformationList,
       0
     );
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "next_n",
@@ -7253,22 +6817,22 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n _tao_ri (
           &_tao_call,
@@ -7277,14 +6841,14 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7292,91 +6856,95 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
 
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          
-          if (!(
-              (_tao_out << how_many)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      
-                    ),
-                  _tao_retval
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
                 );
-            }
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+
+              if (!(
+                  (_tao_out << how_many)
+                  ))
+                {
+                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+                }
+
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW_RETURN (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        ),
+                      _tao_retval
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
+                    )
+                }
+              else
+                {
+
+                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+                  _tao_call.transport()->assign_translators (&_tao_in,0);
+
+                  if (!(
+                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) &&
+                      (_tao_in >> *server_list.ptr ())
+                      ))
+                    {
+                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER);
+                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+
+
+                    }
+
+#if TAO_HAS_INTERCEPTORS == 1
+                  CORBA::Boolean _tao_retval_info =
+                    _tao_retval;
+                  _tao_ri.result (_tao_retval_info);
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          
-          if (!(
-              (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) &&
-              (_tao_in >> *server_list.ptr ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                  CORBA::MARSHAL (
-                      TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES
-                    ),
-                  _tao_retval
-                );
-            }
-          
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          CORBA::Boolean _tao_retval_info =
-            _tao_retval;
-          _tao_ri.result (_tao_retval_info);
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7386,59 +6954,57 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK_RETURN (_tao_retval);
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
-  
-  return _tao_retval;
+
+return _tao_retval;
 }
 
 // TAO_IDL - Generated from
@@ -7453,12 +7019,12 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
   ))
 {
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  
+
   if (istub == 0)
     {
       ACE_THROW (CORBA::INTERNAL ());
     }
-    
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -7466,22 +7032,22 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy _tao_ri (
           &_tao_call,
@@ -7489,14 +7055,14 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
@@ -7504,58 +7070,66 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
-              continue;
             }
-          
+          else
+            {
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              ACE_ENV_ARG_PARAMETER
-            );
-          TAO_INTERCEPTOR_CHECK;
+              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              _tao_call.prepare_header (
+                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
+                  ACE_ENV_ARG_PARAMETER
+                );
+              TAO_INTERCEPTOR_CHECK;
 
-          
-          _invoke_status =
-            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-          TAO_INTERCEPTOR_CHECK;
 
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                  CORBA::UNKNOWN (
-                      CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+              _invoke_status =
+                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+              TAO_INTERCEPTOR_CHECK;
+
+              if (_invoke_status == TAO_INVOKE_EXCEPTION)
+                {
+                  TAO_INTERCEPTOR_THROW (
+                      CORBA::UNKNOWN (
+                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
+                        )
+                    );
+                }
+              else if (_invoke_status == TAO_INVOKE_RESTART)
+                {
+                  _tao_call.restart_flag (1);
+                  TAO_INTERCEPTOR (
+                      _tao_ri.reply_status (_invoke_status);
+                      _tao_vfr.receive_other (
+                          &_tao_ri
+                          ACE_ENV_ARG_PARAMETER
+                        );
+                      ACE_TRY_CHECK;
                     )
-                );
-            }
-          else if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              TAO_INTERCEPTOR (
+                }
+              else
+                {
+#if TAO_HAS_INTERCEPTORS == 1
+
                   _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_other (
+                  _tao_vfr.receive_reply (
                       &_tao_ri
                       ACE_ENV_ARG_PARAMETER
                     );
                   ACE_TRY_CHECK;
-                )
-              
-              continue;
-            }
+
+#endif  /* TAO_HAS_INTERCEPTORS */
+                }
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
-          _tao_ri.reply_status (_invoke_status);
-          _tao_vfr.receive_reply (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
+            }
         }
       ACE_CATCHANY
         {
@@ -7565,61 +7139,59 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
               || _tao_status == PortableInterceptor::USER_EXCEPTION)
             {
               ACE_RE_THROW;
             }
         }
-      
+
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
       ACE_CATCHALL
         {
           CORBA::UNKNOWN ex;
-          
+
           _tao_ri.exception (&ex);
           _tao_vfr.receive_exception (
               &_tao_ri
               ACE_ENV_ARG_PARAMETER
             );
           ACE_TRY_CHECK;
-          
-          PortableInterceptor::ReplyStatus _tao_status =
+
+          const PortableInterceptor::ReplyStatus _tao_status =
             _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          
+
           if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
             ACE_TRY_THROW (ex);
         }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-      
+
       ACE_ENDTRY;
       ACE_CHECK;
-      
-      PortableInterceptor::ReplyStatus _tao_status =
+
+      const PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      
-      if (_tao_status == PortableInterceptor::LOCATION_FORWARD
-          || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
-        {
-          continue;
-        }
-      
+
+      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
+          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-      
-      break;
+
+        if (_invoke_status != TAO_INVOKE_RESTART)
+          break;
     }
 }
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
@@ -7670,8 +7242,8 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::se
 //           End Remote & Base Proxy Broker Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 ImplementationRepository::ServerInformationIterator::ServerInformationIterator (int collocated)
 {
@@ -7692,7 +7264,7 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {}
 
-void 
+void
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationIterator *tmp = ACE_static_cast (ServerInformationIterator *, _tao_void_pointer);
@@ -7709,7 +7281,7 @@ ImplementationRepository::ServerInformationIterator::_narrow (
     {
       return ServerInformationIterator::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a =
@@ -7718,17 +7290,17 @@ ImplementationRepository::ServerInformationIterator::_narrow (
             ACE_ENV_ARG_PARAMETER
           );
       ACE_CHECK_RETURN (ServerInformationIterator::_nil ());
-      
+
       if (is_a == 0)
         {
           return ServerInformationIterator::_nil ();
         }
     }
-  
+
   return ServerInformationIterator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-ImplementationRepository::ServerInformationIterator_ptr 
+ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -7738,18 +7310,18 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
     {
       return ServerInformationIterator::_nil ();
     }
-  
+
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
-      
+
       if (stub != 0)
         {
           stub->_incr_refcnt ();
         }
-      
+
       ServerInformationIterator_ptr default_proxy = ServerInformationIterator::_nil ();
-      
+
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
@@ -7767,7 +7339,7 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
               ServerInformationIterator::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -7780,10 +7352,10 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
               ServerInformationIterator::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast (
           ServerInformationIterator_ptr,
@@ -7803,7 +7375,7 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -7838,7 +7410,7 @@ ImplementationRepository::ServerInformationIterator::_is_a (
 void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::ImplementationRepository, ServerInformationIterator)::_tao_class_id)
@@ -7857,12 +7429,12 @@ void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -7871,6 +7443,12 @@ const char* ImplementationRepository::ServerInformationIterator::_interface_repo
   return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
 }
 
+CORBA::Boolean
+ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80
 
@@ -7883,10 +7461,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
+  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
     this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.next_n (
       this,
       how_many,
@@ -7905,10 +7483,10 @@ void ImplementationRepository::ServerInformationIterator::destroy (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
+  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
     this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.destroy (
       this
       ACE_ENV_ARG_PARAMETER
@@ -7922,28 +7500,28 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e4974), 
-  ACE_NTOHL (0x65726174), 
-  ACE_NTOHL (0x6f723a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f536572),
+  ACE_NTOHL (0x76657249),
+  ACE_NTOHL (0x6e666f72),
+  ACE_NTOHL (0x6d617469),
+  ACE_NTOHL (0x6f6e4974),
+  ACE_NTOHL (0x65726174),
+  ACE_NTOHL (0x6f723a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0
     26,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e497465), 
-  ACE_NTOHL (0x7261746f), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x6572496e),
+  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e497465),
+  ACE_NTOHL (0x7261746f),
   ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
   };
 
@@ -8018,7 +7596,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerObject>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8080,10 +7658,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8145,10 +7723,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8210,10 +7788,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>
+# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8278,7 +7856,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8367,7 +7945,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
         _tao_any,
         ImplementationRepository::_tc_ActivationMode,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -8375,10 +7953,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>
+# pragma instantiate TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8443,7 +8021,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8508,7 +8086,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8682,7 +8260,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8701,12 +8279,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::ServerObject::_unchecked_narrow (
@@ -8725,7 +8303,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8733,20 +8311,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -8756,7 +8334,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -8766,32 +8344,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8799,20 +8377,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -8822,7 +8400,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -8832,32 +8410,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8876,12 +8454,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::Administration::_unchecked_narrow (
@@ -8900,7 +8478,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8919,12 +8497,12 @@ CORBA::Boolean operator>> (
   ACE_TRY_NEW_ENV
   {
     CORBA::Object_var obj;
-    
+
     if ((strm >> obj.inout ()) == 0)
       {
         return 0;
       }
-    
+
     // Narrow to the right type.
     _tao_objref =
       ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index c93fa013e0e..9039fad49da 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -26,19 +26,19 @@
 #define _TAO_IDL_ORIG_IMPLREPOC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "portableserver_export.h"
+#include "tao/Exception.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
-
-#include "tao/Exception.h"
 #include "tao/Object.h"
 #include "tao/Sequence.h"
 #include "tao/Remote_Object_Proxy_Impl.h"
 #include "tao/Any_T.h"
+#include "tao/VarOut_T.h"
+
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -68,101 +68,52 @@
 
 TAO_NAMESPACE  ImplementationRepository
 {
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ODDS_N_ENDS_CH_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ODDS_N_ENDS_CH_
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_
-  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
+  struct tao_ServerObject_life;
+  typedef TAO_Objref_Var_T<ServerObject, tao_ServerObject_life> ServerObject_var;
+  typedef TAO_Objref_Out_T<ServerObject, tao_ServerObject_life> ServerObject_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ServerObject_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_ServerObject_life
   {
-  public:
-    ServerObject_var (void); // default constructor
-    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} 
-    ServerObject_var (const ServerObject_var &); // copy constructor
-    ~ServerObject_var (void); // destructor
-    
-    ServerObject_var &operator= (ServerObject_ptr);
-    ServerObject_var &operator= (const ServerObject_var &);
-    ServerObject_ptr operator-> (void) const;
-    
-    operator const ServerObject_ptr &() const;
-    operator ServerObject_ptr &();
-    // in, inout, out, _retn 
-    ServerObject_ptr in (void) const;
-    ServerObject_ptr &inout (void);
-    ServerObject_ptr &out (void);
-    ServerObject_ptr _retn (void);
-    ServerObject_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServerObject_ptr tao_duplicate (ServerObject_ptr);
     static void tao_release (ServerObject_ptr);
     static ServerObject_ptr tao_nil (void);
-    static ServerObject_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServerObject_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServerObject_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServerObject_var (const TAO_Base_var &rhs);
-    ServerObject_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ServerObject_out
+  struct TAO_PortableServer_Export tao_ServerObject_cast
   {
-  public:
-    ServerObject_out (ServerObject_ptr &);
-    ServerObject_out (ServerObject_var &);
-    ServerObject_out (const ServerObject_out &);
-    ServerObject_out &operator= (const ServerObject_out &);
-    ServerObject_out &operator= (const ServerObject_var &);
-    ServerObject_out &operator= (ServerObject_ptr);
-    operator ServerObject_ptr &();
-    ServerObject_ptr &ptr (void);
-    ServerObject_ptr operator-> (void);
-  
-  private:
-    ServerObject_ptr &ptr_;
+    static ServerObject_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-  
+
   class _TAO_ServerObject_Proxy_Impl;
   class _TAO_ServerObject_Remote_Proxy_Impl;
   class _TAO_ServerObject_Proxy_Broker;
   class _TAO_ServerObject_Remote_Proxy_Broker;
-  
+
   class TAO_PortableServer_Export ServerObject
     : public virtual CORBA::Object
   {
@@ -170,106 +121,106 @@ TAO_NAMESPACE  ImplementationRepository
     typedef ServerObject_ptr _ptr_type;
     typedef ServerObject_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-    
+
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerObject_ptr _nil (void)
       {
         return (ServerObject_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
-  
+
   protected:
     ServerObject (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
-    
+
     ServerObject (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ServerObject (void);
-    
+
     friend class _TAO_ServerObject_Remote_Proxy_Impl;
     friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
     friend class _TAO_ServerObject_Direct_Proxy_Impl;
-  
+
   private:
     ServerObject (const ServerObject &);
     void operator= (const ServerObject &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_ServerObject_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void ping (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -277,10 +228,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void shutdown (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -288,35 +239,35 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_ServerObject_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl
     : public virtual _TAO_ServerObject_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_ServerObject_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void ping (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -324,10 +275,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void shutdown (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -336,23 +287,23 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
   {
   public:
@@ -361,76 +312,76 @@ TAO_NAMESPACE  ImplementationRepository
         ServerObject *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ServerObject_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker
     : public virtual _TAO_ServerObject_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ServerObject_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
         ServerObject *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
-  
+
   class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
   {
   public:
-    
+
     AlreadyRegistered (void);
     AlreadyRegistered (const AlreadyRegistered &);
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static AlreadyRegistered *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -442,44 +393,44 @@ TAO_NAMESPACE  ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
-  
+
   class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
   {
   public:
-    
+
     TAO_String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static CannotActivate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -491,50 +442,50 @@ TAO_NAMESPACE  ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     CannotActivate (
         const char * _tao_reason
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
-  
+
   class TAO_PortableServer_Export NotFound : public CORBA::UserException
   {
   public:
-    
+
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -546,289 +497,123 @@ TAO_NAMESPACE  ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class EnvironmentVariable_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct EnvironmentVariable;
+
+  typedef
+    TAO_Var_Var_T<
+        EnvironmentVariable
+      >
+    EnvironmentVariable_var;
+
+  typedef
+    TAO_Out_T<
+        EnvironmentVariable,
+        EnvironmentVariable_var
+      >
+    EnvironmentVariable_out;
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_PortableServer_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager value;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_PortableServer_Export EnvironmentVariable_var
-  {
-  public:
-    EnvironmentVariable_var (void);
-    EnvironmentVariable_var (EnvironmentVariable *);
-    EnvironmentVariable_var (const EnvironmentVariable_var &);
-    ~EnvironmentVariable_var (void);
-    
-    EnvironmentVariable_var &operator= (EnvironmentVariable *);
-    EnvironmentVariable_var &operator= (const EnvironmentVariable_var &);
-    EnvironmentVariable *operator-> (void);
-    const EnvironmentVariable *operator-> (void) const;
-    
-    operator const EnvironmentVariable &() const;
-    operator EnvironmentVariable &();
-    operator EnvironmentVariable &() const;
-    
-    // Variable-size types only.
-    operator EnvironmentVariable *&();
-    
-    // in, inout, out, _retn 
-    const EnvironmentVariable &in (void) const;
-    EnvironmentVariable &inout (void);
-    EnvironmentVariable *&out (void);
-    EnvironmentVariable *_retn (void);
-    EnvironmentVariable *ptr (void) const;
-  
-  private:
-    EnvironmentVariable *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_PortableServer_Export EnvironmentVariable_out
-  {
-  public:
-    EnvironmentVariable_out (EnvironmentVariable *&);
-    EnvironmentVariable_out (EnvironmentVariable_var &);
-    EnvironmentVariable_out (const EnvironmentVariable_out &);
-    EnvironmentVariable_out &operator= (const EnvironmentVariable_out &);
-    EnvironmentVariable_out &operator= (EnvironmentVariable *);
-    operator EnvironmentVariable *&();
-    EnvironmentVariable *&ptr (void);
-    EnvironmentVariable *operator-> (void);
-    
-  private:
-    EnvironmentVariable *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const EnvironmentVariable_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+
   typedef char * Address;
   typedef CORBA::String_var Address_var;
   typedef CORBA::String_out Address_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-  
-  class TAO_PortableServer_Export _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        EnvironmentVariable *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
-        const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs
-      );
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &operator= (
-        const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
-    
-    // = Accessors.
-    EnvironmentVariable &operator[] (CORBA::ULong i);
-    const EnvironmentVariable &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static EnvironmentVariable *allocbuf (CORBA::ULong size);
-    static void freebuf (EnvironmentVariable *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0);
-    const EnvironmentVariable *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        EnvironmentVariable *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address;
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class EnvironmentList;
-  class EnvironmentList_var;
-  
-  // *************************************************************
-  // ImplementationRepository::EnvironmentList
-  // *************************************************************
-  
-  class TAO_PortableServer_Export EnvironmentList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<EnvironmentVariable>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_VarSeq_Var_T<
+        EnvironmentList,
+        ImplementationRepository::EnvironmentVariable
+      >
+    EnvironmentList_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        EnvironmentList,
+        EnvironmentList_var,
+        ImplementationRepository::EnvironmentVariable
+      >
+    EnvironmentList_out;
+
+  class TAO_PortableServer_Export EnvironmentList
+    : public
+        TAO_Unbounded_Sequence<
+            ImplementationRepository::EnvironmentVariable
+          >
   {
   public:
     EnvironmentList (void);
     EnvironmentList (CORBA::ULong max);
     EnvironmentList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        EnvironmentVariable *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        EnvironmentVariable* buffer,
         CORBA::Boolean release = 0
       );
     EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef EnvironmentList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class ImplementationRepository::EnvironmentList_var
-  // *************************************************************
-  
-  class TAO_PortableServer_Export EnvironmentList_var
-  {
-  public:
-    EnvironmentList_var (void);
-    EnvironmentList_var (EnvironmentList *);
-    EnvironmentList_var (const EnvironmentList_var &);
-    ~EnvironmentList_var (void);
-    
-    EnvironmentList_var &operator= (EnvironmentList *);
-    EnvironmentList_var &operator= (const EnvironmentList_var &);
-    EnvironmentList *operator-> (void);
-    const EnvironmentList *operator-> (void) const;
-    
-    operator const EnvironmentList &() const;
-    operator EnvironmentList &();
-    operator EnvironmentList &() const;
-    
-    // Variable-size base types only.
-    operator EnvironmentList *&();
-    
-    EnvironmentVariable & operator[] (CORBA::ULong index);
-    const EnvironmentVariable & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const EnvironmentList &in (void) const;
-    EnvironmentList &inout (void);
-    EnvironmentList *&out (void);
-    EnvironmentList *_retn (void);
-    EnvironmentList *ptr (void) const;
-  
-  private:
-    EnvironmentList *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_PortableServer_Export EnvironmentList_out
-  {
-  public:
-    EnvironmentList_out (EnvironmentList *&);
-    EnvironmentList_out (EnvironmentList_var &);
-    EnvironmentList_out (const EnvironmentList_out &);
-    EnvironmentList_out &operator= (const EnvironmentList_out &);
-    EnvironmentList_out &operator= (EnvironmentList *);
-    operator EnvironmentList *&();
-    EnvironmentList *&ptr (void);
-    EnvironmentList *operator-> (void);
-    EnvironmentVariable & operator[] (CORBA::ULong index);
-  
-  private:
-    EnvironmentList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const EnvironmentList_var &);
+    typedef EnvironmentList_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ActivationMode
   {
     NORMAL,
@@ -836,23 +621,39 @@ TAO_NAMESPACE  ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-  
+
   typedef ActivationMode &ActivationMode_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode;
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct StartupOptions;
+
+  typedef
+    TAO_Var_Var_T<
+        StartupOptions
+      >
+    StartupOptions_var;
+
+  typedef
+    TAO_Out_T<
+        StartupOptions,
+        StartupOptions_var
+      >
+    StartupOptions_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class StartupOptions_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_PortableServer_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager command_line;
     ImplementationRepository::EnvironmentList environment;
@@ -860,496 +661,176 @@ TAO_NAMESPACE  ImplementationRepository
     ImplementationRepository::ActivationMode activation;
     TAO_String_Manager location;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_PortableServer_Export StartupOptions_var
-  {
-  public:
-    StartupOptions_var (void);
-    StartupOptions_var (StartupOptions *);
-    StartupOptions_var (const StartupOptions_var &);
-    ~StartupOptions_var (void);
-    
-    StartupOptions_var &operator= (StartupOptions *);
-    StartupOptions_var &operator= (const StartupOptions_var &);
-    StartupOptions *operator-> (void);
-    const StartupOptions *operator-> (void) const;
-    
-    operator const StartupOptions &() const;
-    operator StartupOptions &();
-    operator StartupOptions &() const;
-    
-    // Variable-size types only.
-    operator StartupOptions *&();
-    
-    // in, inout, out, _retn 
-    const StartupOptions &in (void) const;
-    StartupOptions &inout (void);
-    StartupOptions *&out (void);
-    StartupOptions *_retn (void);
-    StartupOptions *ptr (void) const;
-  
-  private:
-    StartupOptions *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_PortableServer_Export StartupOptions_out
-  {
-  public:
-    StartupOptions_out (StartupOptions *&);
-    StartupOptions_out (StartupOptions_var &);
-    StartupOptions_out (const StartupOptions_out &);
-    StartupOptions_out &operator= (const StartupOptions_out &);
-    StartupOptions_out &operator= (StartupOptions *);
-    operator StartupOptions *&();
-    StartupOptions *&ptr (void);
-    StartupOptions *operator-> (void);
-    
-  private:
-    StartupOptions *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const StartupOptions_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions;
-  
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+
+  struct ServerInformation;
+
+  typedef
+    TAO_Var_Var_T<
+        ServerInformation
+      >
+    ServerInformation_var;
+
+  typedef
+    TAO_Out_T<
+        ServerInformation,
+        ServerInformation_var
+      >
+    ServerInformation_out;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ServerInformation_var;
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+
   struct TAO_PortableServer_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager logical_server;
     TAO_String_Manager server;
     ImplementationRepository::StartupOptions startup;
     TAO_String_Manager location;
   };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_PortableServer_Export ServerInformation_var
-  {
-  public:
-    ServerInformation_var (void);
-    ServerInformation_var (ServerInformation *);
-    ServerInformation_var (const ServerInformation_var &);
-    ~ServerInformation_var (void);
-    
-    ServerInformation_var &operator= (ServerInformation *);
-    ServerInformation_var &operator= (const ServerInformation_var &);
-    ServerInformation *operator-> (void);
-    const ServerInformation *operator-> (void) const;
-    
-    operator const ServerInformation &() const;
-    operator ServerInformation &();
-    operator ServerInformation &() const;
-    
-    // Variable-size types only.
-    operator ServerInformation *&();
-    
-    // in, inout, out, _retn 
-    const ServerInformation &in (void) const;
-    ServerInformation &inout (void);
-    ServerInformation *&out (void);
-    ServerInformation *_retn (void);
-    ServerInformation *ptr (void) const;
-  
-  private:
-    ServerInformation *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_PortableServer_Export ServerInformation_out
-  {
-  public:
-    ServerInformation_out (ServerInformation *&);
-    ServerInformation_out (ServerInformation_var &);
-    ServerInformation_out (const ServerInformation_out &);
-    ServerInformation_out &operator= (const ServerInformation_out &);
-    ServerInformation_out &operator= (ServerInformation *);
-    operator ServerInformation *&();
-    ServerInformation *&ptr (void);
-    ServerInformation *operator-> (void);
-    
-  private:
-    ServerInformation *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ServerInformation_var &);
-  };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation;
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-  
-  class TAO_PortableServer_Export _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ServerInformation *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
-        const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs
-      );
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &operator= (
-        const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
-    
-    // = Accessors.
-    ServerInformation &operator[] (CORBA::ULong i);
-    const ServerInformation &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ServerInformation *allocbuf (CORBA::ULong size);
-    static void freebuf (ServerInformation *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ServerInformation *get_buffer (CORBA::Boolean orphan = 0);
-    const ServerInformation *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ServerInformation *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation;
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class ServerInformationList;
-  class ServerInformationList_var;
-  
-  // *************************************************************
-  // ImplementationRepository::ServerInformationList
-  // *************************************************************
-  
-  class TAO_PortableServer_Export ServerInformationList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ServerInformation>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_VarSeq_Var_T<
+        ServerInformationList,
+        ImplementationRepository::ServerInformation
+      >
+    ServerInformationList_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        ServerInformationList,
+        ServerInformationList_var,
+        ImplementationRepository::ServerInformation
+      >
+    ServerInformationList_out;
+
+  class TAO_PortableServer_Export ServerInformationList
+    : public
+        TAO_Unbounded_Sequence<
+            ImplementationRepository::ServerInformation
+          >
   {
   public:
     ServerInformationList (void);
     ServerInformationList (CORBA::ULong max);
     ServerInformationList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ServerInformation *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ServerInformation* buffer,
         CORBA::Boolean release = 0
       );
     ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ServerInformationList_var _var_type;
-  };
-
-#endif /* end #if !defined */
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class ImplementationRepository::ServerInformationList_var
-  // *************************************************************
-  
-  class TAO_PortableServer_Export ServerInformationList_var
-  {
-  public:
-    ServerInformationList_var (void);
-    ServerInformationList_var (ServerInformationList *);
-    ServerInformationList_var (const ServerInformationList_var &);
-    ~ServerInformationList_var (void);
-    
-    ServerInformationList_var &operator= (ServerInformationList *);
-    ServerInformationList_var &operator= (const ServerInformationList_var &);
-    ServerInformationList *operator-> (void);
-    const ServerInformationList *operator-> (void) const;
-    
-    operator const ServerInformationList &() const;
-    operator ServerInformationList &();
-    operator ServerInformationList &() const;
-    
-    // Variable-size base types only.
-    operator ServerInformationList *&();
-    
-    ServerInformation & operator[] (CORBA::ULong index);
-    const ServerInformation & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ServerInformationList &in (void) const;
-    ServerInformationList &inout (void);
-    ServerInformationList *&out (void);
-    ServerInformationList *_retn (void);
-    ServerInformationList *ptr (void) const;
-  
-  private:
-    ServerInformationList *ptr_;
-  };
-
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_PortableServer_Export ServerInformationList_out
-  {
-  public:
-    ServerInformationList_out (ServerInformationList *&);
-    ServerInformationList_out (ServerInformationList_var &);
-    ServerInformationList_out (const ServerInformationList_out &);
-    ServerInformationList_out &operator= (const ServerInformationList_out &);
-    ServerInformationList_out &operator= (ServerInformationList *);
-    operator ServerInformationList *&();
-    ServerInformationList *&ptr (void);
-    ServerInformationList *operator-> (void);
-    ServerInformation & operator[] (CORBA::ULong index);
-  
-  private:
-    ServerInformationList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ServerInformationList_var &);
+    typedef ServerInformationList_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class ServerInformationIterator;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
-  
-  typedef ServerInformationIterator *ServerInformationIterator_ptr;
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ODDS_N_ENDS_CH_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ODDS_N_ENDS_CH_
 
-#endif /* end #if !defined */
+  class ServerInformationIterator;
+  typedef ServerInformationIterator *ServerInformationIterator_ptr;
+  struct tao_ServerInformationIterator_life;
+  typedef TAO_Objref_Var_T<ServerInformationIterator, tao_ServerInformationIterator_life> ServerInformationIterator_var;
+  typedef TAO_Objref_Out_T<ServerInformationIterator, tao_ServerInformationIterator_life> ServerInformationIterator_out;
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_ServerInformationIterator_life
   {
-  public:
-    ServerInformationIterator_var (void); // default constructor
-    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
-    ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
-    ~ServerInformationIterator_var (void); // destructor
-    
-    ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
-    ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
-    ServerInformationIterator_ptr operator-> (void) const;
-    
-    operator const ServerInformationIterator_ptr &() const;
-    operator ServerInformationIterator_ptr &();
-    // in, inout, out, _retn 
-    ServerInformationIterator_ptr in (void) const;
-    ServerInformationIterator_ptr &inout (void);
-    ServerInformationIterator_ptr &out (void);
-    ServerInformationIterator_ptr _retn (void);
-    ServerInformationIterator_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServerInformationIterator_ptr tao_duplicate (ServerInformationIterator_ptr);
     static void tao_release (ServerInformationIterator_ptr);
     static ServerInformationIterator_ptr tao_nil (void);
-    static ServerInformationIterator_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServerInformationIterator_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServerInformationIterator_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServerInformationIterator_var (const TAO_Base_var &rhs);
-    ServerInformationIterator_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ServerInformationIterator_out
+  struct TAO_PortableServer_Export tao_ServerInformationIterator_cast
   {
-  public:
-    ServerInformationIterator_out (ServerInformationIterator_ptr &);
-    ServerInformationIterator_out (ServerInformationIterator_var &);
-    ServerInformationIterator_out (const ServerInformationIterator_out &);
-    ServerInformationIterator_out &operator= (const ServerInformationIterator_out &);
-    ServerInformationIterator_out &operator= (const ServerInformationIterator_var &);
-    ServerInformationIterator_out &operator= (ServerInformationIterator_ptr);
-    operator ServerInformationIterator_ptr &();
-    ServerInformationIterator_ptr &ptr (void);
-    ServerInformationIterator_ptr operator-> (void);
-  
-  private:
-    ServerInformationIterator_ptr &ptr_;
+    static ServerInformationIterator_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ODDS_N_ENDS_CH_)
+#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ODDS_N_ENDS_CH_
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_
-  
   class Administration;
   typedef Administration *Administration_ptr;
+  struct tao_Administration_life;
+  typedef TAO_Objref_Var_T<Administration, tao_Administration_life> Administration_var;
+  typedef TAO_Objref_Out_T<Administration, tao_Administration_life> Administration_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export Administration_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_Administration_life
   {
-  public:
-    Administration_var (void); // default constructor
-    Administration_var (Administration_ptr p) : ptr_ (p) {} 
-    Administration_var (const Administration_var &); // copy constructor
-    ~Administration_var (void); // destructor
-    
-    Administration_var &operator= (Administration_ptr);
-    Administration_var &operator= (const Administration_var &);
-    Administration_ptr operator-> (void) const;
-    
-    operator const Administration_ptr &() const;
-    operator Administration_ptr &();
-    // in, inout, out, _retn 
-    Administration_ptr in (void) const;
-    Administration_ptr &inout (void);
-    Administration_ptr &out (void);
-    Administration_ptr _retn (void);
-    Administration_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Administration_ptr tao_duplicate (Administration_ptr);
     static void tao_release (Administration_ptr);
     static Administration_ptr tao_nil (void);
-    static Administration_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Administration_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Administration_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Administration_var (const TAO_Base_var &rhs);
-    Administration_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export Administration_out
+  struct TAO_PortableServer_Export tao_Administration_cast
   {
-  public:
-    Administration_out (Administration_ptr &);
-    Administration_out (Administration_var &);
-    Administration_out (const Administration_out &);
-    Administration_out &operator= (const Administration_out &);
-    Administration_out &operator= (const Administration_var &);
-    Administration_out &operator= (Administration_ptr);
-    operator Administration_ptr &();
-    Administration_ptr &ptr (void);
-    Administration_ptr operator-> (void);
-  
-  private:
-    Administration_ptr &ptr_;
+    static Administration_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
-  
+
   class _TAO_Administration_Proxy_Impl;
   class _TAO_Administration_Remote_Proxy_Impl;
   class _TAO_Administration_Proxy_Broker;
   class _TAO_Administration_Remote_Proxy_Broker;
-  
+
   class TAO_PortableServer_Export Administration
     : public virtual CORBA::Object
   {
@@ -1357,30 +838,30 @@ TAO_NAMESPACE  ImplementationRepository
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-    
+
     static Administration_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Administration_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Administration_ptr _nil (void)
       {
         return (Administration_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1390,10 +871,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * activate_server_with_startup (
         const char * server,
         CORBA::Long check_startup
@@ -1404,10 +885,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -1417,10 +898,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -1429,10 +910,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1441,10 +922,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1453,10 +934,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * server_is_running (
         const char * server,
         const char * addr,
@@ -1467,10 +948,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1479,10 +960,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
@@ -1492,10 +973,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
@@ -1505,66 +986,66 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-  
+
   protected:
     Administration (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
-    
+
     Administration (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~Administration (void);
-    
+
     friend class _TAO_Administration_Remote_Proxy_Impl;
     friend class _TAO_Administration_ThruPOA_Proxy_Impl;
     friend class _TAO_Administration_Direct_Proxy_Impl;
-  
+
   private:
     Administration (const Administration &);
     void operator= (const Administration &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_Administration_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void activate_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1575,10 +1056,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual char * activate_server_with_startup (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1590,10 +1071,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void register_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1604,10 +1085,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void reregister_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1617,10 +1098,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void remove_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1630,10 +1111,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void shutdown_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1643,10 +1124,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual char * server_is_running (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1658,10 +1139,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void server_is_shutting_down (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1671,10 +1152,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void find (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1685,10 +1166,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void list (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -1699,35 +1180,35 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_Administration_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl
     : public virtual _TAO_Administration_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_Administration_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_Administration_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void activate_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1738,10 +1219,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual char * activate_server_with_startup (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1753,10 +1234,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void register_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1767,10 +1248,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void reregister_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1780,10 +1261,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void remove_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1793,10 +1274,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void shutdown_server (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1806,10 +1287,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual char * server_is_running (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1821,10 +1302,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void server_is_shutting_down (
         CORBA::Object *_collocated_tao_target_,
         const char * server
@@ -1834,10 +1315,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void find (
         CORBA::Object *_collocated_tao_target_,
         const char * server,
@@ -1848,10 +1329,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void list (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -1863,23 +1344,23 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
   {
   public:
@@ -1888,152 +1369,69 @@ TAO_NAMESPACE  ImplementationRepository
         Administration *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_Administration_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker
     : public virtual _TAO_Administration_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_Administration_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_Administration_Proxy_Impl &select_proxy (
         Administration *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
-  
-  class ServerInformationIterator;
-  typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
-#endif /* end #if !defined */
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
-  {
-  public:
-    ServerInformationIterator_var (void); // default constructor
-    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
-    ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
-    ~ServerInformationIterator_var (void); // destructor
-    
-    ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
-    ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
-    ServerInformationIterator_ptr operator-> (void) const;
-    
-    operator const ServerInformationIterator_ptr &() const;
-    operator ServerInformationIterator_ptr &();
-    // in, inout, out, _retn 
-    ServerInformationIterator_ptr in (void) const;
-    ServerInformationIterator_ptr &inout (void);
-    ServerInformationIterator_ptr &out (void);
-    ServerInformationIterator_ptr _retn (void);
-    ServerInformationIterator_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static ServerInformationIterator_ptr tao_duplicate (ServerInformationIterator_ptr);
-    static void tao_release (ServerInformationIterator_ptr);
-    static ServerInformationIterator_ptr tao_nil (void);
-    static ServerInformationIterator_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServerInformationIterator_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServerInformationIterator_var (const TAO_Base_var &rhs);
-    ServerInformationIterator_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ServerInformationIterator_out
-  {
-  public:
-    ServerInformationIterator_out (ServerInformationIterator_ptr &);
-    ServerInformationIterator_out (ServerInformationIterator_var &);
-    ServerInformationIterator_out (const ServerInformationIterator_out &);
-    ServerInformationIterator_out &operator= (const ServerInformationIterator_out &);
-    ServerInformationIterator_out &operator= (const ServerInformationIterator_var &);
-    ServerInformationIterator_out &operator= (ServerInformationIterator_ptr);
-    operator ServerInformationIterator_ptr &();
-    ServerInformationIterator_ptr &ptr (void);
-    ServerInformationIterator_ptr operator-> (void);
-  
-  private:
-    ServerInformationIterator_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-  
+
   class _TAO_ServerInformationIterator_Proxy_Impl;
   class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
   class _TAO_ServerInformationIterator_Proxy_Broker;
   class _TAO_ServerInformationIterator_Remote_Proxy_Broker;
-  
+
   class TAO_PortableServer_Export ServerInformationIterator
     : public virtual CORBA::Object
   {
@@ -2041,30 +1439,30 @@ TAO_NAMESPACE  ImplementationRepository
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-    
+
     static ServerInformationIterator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerInformationIterator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerInformationIterator_ptr _nil (void)
       {
         return (ServerInformationIterator_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean next_n (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list
@@ -2073,76 +1471,76 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-  
+
   protected:
     ServerInformationIterator (int collocated = 0);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
-    
+
     ServerInformationIterator (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
     virtual ~ServerInformationIterator (void);
-    
+
     friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
     friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
     friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-  
+
   private:
     ServerInformationIterator (const ServerInformationIterator &);
     void operator= (const ServerInformationIterator &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulates
   // an invocation logic.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35
-  
+
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual CORBA::Boolean next_n (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -2152,10 +1550,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24
-    
+
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2163,35 +1561,35 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-  
+
   protected:
     _TAO_ServerInformationIterator_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37
-  
+
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl
     : public virtual _TAO_ServerInformationIterator_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual CORBA::Boolean next_n (
         CORBA::Object *_collocated_tao_target_,
         CORBA::ULong how_many,
@@ -2201,10 +1599,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     virtual void destroy (
         CORBA::Object *_collocated_tao_target_
         ACE_ENV_ARG_DECL
@@ -2213,23 +1611,23 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
       ));
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35
-  
+
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
   {
   public:
@@ -2238,56 +1636,56 @@ TAO_NAMESPACE  ImplementationRepository
         ServerInformationIterator *object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ServerInformationIterator_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40
-  
+
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker
     : public virtual _TAO_ServerInformationIterator_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
         ServerInformationIterator *object
         ACE_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator;
 
 // TAO_IDL - Generated from
@@ -2515,7 +1913,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoC.i"
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 5391af79952..b8698643596 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -37,13 +37,6 @@ ImplementationRepository::ServerObject::ServerObject (
   this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-ImplementationRepository::ServerObject::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -58,1555 +51,6 @@ TAO::Any_Impl_T<ImplementationRepository::ServerObject>::to_object (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::EnvironmentVariable_var
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::EnvironmentVariable_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::EnvironmentVariable_var (EnvironmentVariable *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::EnvironmentVariable_var (const ::ImplementationRepository::EnvironmentVariable_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::ImplementationRepository::EnvironmentVariable (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::~EnvironmentVariable_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var &
-ImplementationRepository::EnvironmentVariable_var::operator= (EnvironmentVariable *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentVariable_var &
-ImplementationRepository::EnvironmentVariable_var::operator= (const ::ImplementationRepository::EnvironmentVariable_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          EnvironmentVariable *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              EnvironmentVariable (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              EnvironmentVariable *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::ImplementationRepository::EnvironmentVariable *
-ImplementationRepository::EnvironmentVariable_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::EnvironmentVariable *
-ImplementationRepository::EnvironmentVariable_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator const ::ImplementationRepository::EnvironmentVariable &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::ImplementationRepository::EnvironmentVariable &
-ImplementationRepository::EnvironmentVariable_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::EnvironmentVariable &
-ImplementationRepository::EnvironmentVariable_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::ImplementationRepository::EnvironmentVariable *&
-ImplementationRepository::EnvironmentVariable_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::EnvironmentVariable *
-ImplementationRepository::EnvironmentVariable_var::_retn (void)
-{
-  ::ImplementationRepository::EnvironmentVariable *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::ImplementationRepository::EnvironmentVariable *
-ImplementationRepository::EnvironmentVariable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::EnvironmentVariable_out
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (::ImplementationRepository::EnvironmentVariable *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (EnvironmentVariable_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_out::EnvironmentVariable_out (const ::ImplementationRepository::EnvironmentVariable_out &p)
-  : ptr_ (ACE_const_cast (EnvironmentVariable_out&, p).ptr_)
-{}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_out &
-ImplementationRepository::EnvironmentVariable_out::operator= (const ::ImplementationRepository::EnvironmentVariable_out &p)
-{
-  this->ptr_ = ACE_const_cast (EnvironmentVariable_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable_out &
-ImplementationRepository::EnvironmentVariable_out::operator= (EnvironmentVariable *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::EnvironmentVariable *&
-ImplementationRepository::EnvironmentVariable_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::EnvironmentVariable *
-ImplementationRepository::EnvironmentVariable_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable *
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (CORBA::ULong size)
-{
-  ImplementationRepository::EnvironmentVariable *retval = 0;
-  ACE_NEW_RETURN (retval, ImplementationRepository::EnvironmentVariable[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (ImplementationRepository::EnvironmentVariable *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void)
-{
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    ImplementationRepository::EnvironmentVariable *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
-    const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      ImplementationRepository::EnvironmentVariable *tmp1 =
-        _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_);
-      ImplementationRepository::EnvironmentVariable * const tmp2 =
-        ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator= (
-    const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          ImplementationRepository::EnvironmentVariable *tmp =
-            ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  ImplementationRepository::EnvironmentVariable *tmp1 =
-    ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
-  ImplementationRepository::EnvironmentVariable * const tmp2 =
-    ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable &
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  ImplementationRepository::EnvironmentVariable* tmp =
-    ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const ImplementationRepository::EnvironmentVariable &
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  ImplementationRepository::EnvironmentVariable * const tmp =
-    ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable *
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan)
-{
-  ImplementationRepository::EnvironmentVariable *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const ImplementationRepository::EnvironmentVariable *
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    ImplementationRepository::EnvironmentVariable *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      ImplementationRepository::EnvironmentVariable *tmp =
-        ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable*, this->buffer_);
-      _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
-#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::EnvironmentList_var
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::EnvironmentList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::EnvironmentList_var (EnvironmentList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::EnvironmentList_var (const ::ImplementationRepository::EnvironmentList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::ImplementationRepository::EnvironmentList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::~EnvironmentList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var &
-ImplementationRepository::EnvironmentList_var::operator= (EnvironmentList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList_var &
-ImplementationRepository::EnvironmentList_var::operator= (const ::ImplementationRepository::EnvironmentList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          EnvironmentList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              EnvironmentList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              EnvironmentList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::ImplementationRepository::EnvironmentList *
-ImplementationRepository::EnvironmentList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList *
-ImplementationRepository::EnvironmentList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable &
-ImplementationRepository::EnvironmentList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ImplementationRepository::EnvironmentVariable &
-ImplementationRepository::EnvironmentList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const ImplementationRepository::EnvironmentVariable &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::ImplementationRepository::EnvironmentList &
-ImplementationRepository::EnvironmentList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList &
-ImplementationRepository::EnvironmentList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList *&
-ImplementationRepository::EnvironmentList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList *
-ImplementationRepository::EnvironmentList_var::_retn (void)
-{
-  ::ImplementationRepository::EnvironmentList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList *
-ImplementationRepository::EnvironmentList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::EnvironmentList_out
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_out::EnvironmentList_out (EnvironmentList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_out::EnvironmentList_out (EnvironmentList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_out::EnvironmentList_out (const ::ImplementationRepository::EnvironmentList_out &p)
-  : ptr_ (ACE_const_cast (EnvironmentList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList_out &
-ImplementationRepository::EnvironmentList_out::operator= (const ::ImplementationRepository::EnvironmentList_out &p)
-{
-  this->ptr_ = ACE_const_cast (EnvironmentList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList_out &
-ImplementationRepository::EnvironmentList_out::operator= (EnvironmentList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList *&
-ImplementationRepository::EnvironmentList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::EnvironmentList *
-ImplementationRepository::EnvironmentList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::EnvironmentVariable &
-ImplementationRepository::EnvironmentList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::StartupOptions_var
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_var::StartupOptions_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_var::StartupOptions_var (StartupOptions *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_var::StartupOptions_var (const ::ImplementationRepository::StartupOptions_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::ImplementationRepository::StartupOptions (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_var::~StartupOptions_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_var &
-ImplementationRepository::StartupOptions_var::operator= (StartupOptions *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::ImplementationRepository::StartupOptions_var &
-ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationRepository::StartupOptions_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          StartupOptions *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              StartupOptions (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              StartupOptions *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::ImplementationRepository::StartupOptions *
-ImplementationRepository::StartupOptions_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::StartupOptions *
-ImplementationRepository::StartupOptions_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator const ::ImplementationRepository::StartupOptions &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::ImplementationRepository::StartupOptions &
-ImplementationRepository::StartupOptions_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::StartupOptions &
-ImplementationRepository::StartupOptions_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::ImplementationRepository::StartupOptions *&
-ImplementationRepository::StartupOptions_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::StartupOptions *
-ImplementationRepository::StartupOptions_var::_retn (void)
-{
-  ::ImplementationRepository::StartupOptions *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::ImplementationRepository::StartupOptions *
-ImplementationRepository::StartupOptions_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::StartupOptions_out
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_out::StartupOptions_out (::ImplementationRepository::StartupOptions *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_out::StartupOptions_out (StartupOptions_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_out::StartupOptions_out (const ::ImplementationRepository::StartupOptions_out &p)
-  : ptr_ (ACE_const_cast (StartupOptions_out&, p).ptr_)
-{}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_out &
-ImplementationRepository::StartupOptions_out::operator= (const ::ImplementationRepository::StartupOptions_out &p)
-{
-  this->ptr_ = ACE_const_cast (StartupOptions_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-ImplementationRepository::StartupOptions_out &
-ImplementationRepository::StartupOptions_out::operator= (StartupOptions *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::StartupOptions *&
-ImplementationRepository::StartupOptions_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::StartupOptions *
-ImplementationRepository::StartupOptions_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::ServerInformation_var
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_var::ServerInformation_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_var::ServerInformation_var (ServerInformation *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_var::ServerInformation_var (const ::ImplementationRepository::ServerInformation_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::ImplementationRepository::ServerInformation (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_var::~ServerInformation_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_var &
-ImplementationRepository::ServerInformation_var::operator= (ServerInformation *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformation_var &
-ImplementationRepository::ServerInformation_var::operator= (const ::ImplementationRepository::ServerInformation_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ServerInformation *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ServerInformation (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ServerInformation *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::ImplementationRepository::ServerInformation *
-ImplementationRepository::ServerInformation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerInformation *
-ImplementationRepository::ServerInformation_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator const ::ImplementationRepository::ServerInformation &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::ImplementationRepository::ServerInformation &
-ImplementationRepository::ServerInformation_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerInformation &
-ImplementationRepository::ServerInformation_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::ImplementationRepository::ServerInformation *&
-ImplementationRepository::ServerInformation_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerInformation *
-ImplementationRepository::ServerInformation_var::_retn (void)
-{
-  ::ImplementationRepository::ServerInformation *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerInformation *
-ImplementationRepository::ServerInformation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::ServerInformation_out
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_out::ServerInformation_out (::ImplementationRepository::ServerInformation *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_out::ServerInformation_out (ServerInformation_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_out::ServerInformation_out (const ::ImplementationRepository::ServerInformation_out &p)
-  : ptr_ (ACE_const_cast (ServerInformation_out&, p).ptr_)
-{}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_out &
-ImplementationRepository::ServerInformation_out::operator= (const ::ImplementationRepository::ServerInformation_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerInformation_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation_out &
-ImplementationRepository::ServerInformation_out::operator= (ServerInformation *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerInformation *&
-ImplementationRepository::ServerInformation_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerInformation *
-ImplementationRepository::ServerInformation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
-
-ACE_INLINE
-ImplementationRepository::ServerInformation *
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (CORBA::ULong size)
-{
-  ImplementationRepository::ServerInformation *retval = 0;
-  ACE_NEW_RETURN (retval, ImplementationRepository::ServerInformation[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (ImplementationRepository::ServerInformation *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void)
-{
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    ImplementationRepository::ServerInformation *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
-    const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      ImplementationRepository::ServerInformation *tmp1 =
-        _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_);
-      ImplementationRepository::ServerInformation * const tmp2 =
-        ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator= (
-    const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          ImplementationRepository::ServerInformation *tmp =
-            ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  ImplementationRepository::ServerInformation *tmp1 =
-    ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
-  ImplementationRepository::ServerInformation * const tmp2 =
-    ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-ImplementationRepository::ServerInformation &
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  ImplementationRepository::ServerInformation* tmp =
-    ACE_reinterpret_cast (ImplementationRepository::ServerInformation*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const ImplementationRepository::ServerInformation &
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  ImplementationRepository::ServerInformation * const tmp =
-    ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-ImplementationRepository::ServerInformation *
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan)
-{
-  ImplementationRepository::ServerInformation *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (ImplementationRepository::ServerInformation*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const ImplementationRepository::ServerInformation *
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const ImplementationRepository::ServerInformation * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    ImplementationRepository::ServerInformation *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      ImplementationRepository::ServerInformation *tmp =
-        ACE_reinterpret_cast (ImplementationRepository::ServerInformation*, this->buffer_);
-      _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::ServerInformationList_var
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::ServerInformationList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::ServerInformationList_var (ServerInformationList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::ServerInformationList_var (const ::ImplementationRepository::ServerInformationList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::ImplementationRepository::ServerInformationList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::~ServerInformationList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var &
-ImplementationRepository::ServerInformationList_var::operator= (ServerInformationList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList_var &
-ImplementationRepository::ServerInformationList_var::operator= (const ::ImplementationRepository::ServerInformationList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ServerInformationList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ServerInformationList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ServerInformationList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::ImplementationRepository::ServerInformationList *
-ImplementationRepository::ServerInformationList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList *
-ImplementationRepository::ServerInformationList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation &
-ImplementationRepository::ServerInformationList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ImplementationRepository::ServerInformation &
-ImplementationRepository::ServerInformationList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const ImplementationRepository::ServerInformation &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::ImplementationRepository::ServerInformationList &
-ImplementationRepository::ServerInformationList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList &
-ImplementationRepository::ServerInformationList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList *&
-ImplementationRepository::ServerInformationList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList *
-ImplementationRepository::ServerInformationList_var::_retn (void)
-{
-  ::ImplementationRepository::ServerInformationList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList *
-ImplementationRepository::ServerInformationList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::ServerInformationList_out
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_out::ServerInformationList_out (ServerInformationList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_out::ServerInformationList_out (ServerInformationList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_out::ServerInformationList_out (const ::ImplementationRepository::ServerInformationList_out &p)
-  : ptr_ (ACE_const_cast (ServerInformationList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList_out &
-ImplementationRepository::ServerInformationList_out::operator= (const ::ImplementationRepository::ServerInformationList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerInformationList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList_out &
-ImplementationRepository::ServerInformationList_out::operator= (ServerInformationList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList *&
-ImplementationRepository::ServerInformationList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::ImplementationRepository::ServerInformationList *
-ImplementationRepository::ServerInformationList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformation &
-ImplementationRepository::ServerInformationList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
@@ -1623,13 +67,6 @@ ImplementationRepository::Administration::Administration (
   this->ImplementationRepository_Administration_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1660,13 +97,6 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
   this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA::Boolean
-ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1694,7 +124,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1723,7 +153,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1772,7 +202,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1801,7 +231,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1874,17 +304,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (ImplementationRepository::ActivationMode, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1931,7 +361,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 408b4ca814a..ae4beae8a7a 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -57,7 +57,7 @@ module PortableServer
   local interface POA;	    // forward declaration
   typedef sequence<POA> POAList;
   native Servant;
-  typedef sequence<octet> ObjectId;
+  typedef CORBA::OctetSeq ObjectId;
 
   exception ForwardRequest 
   {
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 48ad2c06f3f..3dc56e1922e 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -69,160 +69,47 @@ PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_
-
-// The Base_Sequence functions, please see tao/Sequence.h
-void
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_allocate_buffer (CORBA::ULong length)
-{
-  PortableServer::POA **tmp = 0;
-  tmp = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      PortableServer::POA **old = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          if (!this->release_)
-            {
-              tmp[i] = PortableServer::POA::_duplicate (old[i]);
-            }
-          else
-            {
-              tmp[i] = old[i];
-            }
-        }
-      
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = PortableServer::POA::_nil ();
-    }
-  
-  _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::~_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
-{
-  this->_deallocate_buffer ();
-}
-
-void
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-{
-  PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-  
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = PortableServer::POA::_nil ();
-    }
-}
-
-void 
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast (
-    void* target,
-    CORBA::Object *src
-    ACE_ENV_ARG_DECL
-  )
-{
-  PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, target);
-  *tmp = PortableServer::POA::_narrow (src ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::Object*
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_upcast (void *src) const
-{
-  PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, src);
-  return *tmp;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_PORTABLESERVER_POALIST_CS_)
-#define _PORTABLESERVER_POALIST_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// PortableServer::POAList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 PortableServer::POAList::POAList (void)
 {}
 
 PortableServer::POAList::POAList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_PortableServer_POAList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Object_Sequence<
+        PortableServer::POA,
+        PortableServer::POA_var,
+        PortableServer::tao_POA_life,
+        PortableServer::tao_POA_cast
+      >
+    (max)
 {}
 
 PortableServer::POAList::POAList (
     CORBA::ULong max,
     CORBA::ULong length,
-    PortableServer::POA_ptr *buffer,
+    PortableServer::POA_ptr* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_PortableServer_POAList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Object_Sequence<
+        PortableServer::POA,
+        PortableServer::POA_var,
+        PortableServer::tao_POA_life,
+        PortableServer::tao_POA_cast
+      >
+    (max, length, buffer, release)
 {}
 
 PortableServer::POAList::POAList (const POAList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Object_Sequence_PortableServer_POAList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Object_Sequence<
+        PortableServer::POA,
+        PortableServer::POA_var,
+        PortableServer::tao_POA_life,
+        PortableServer::tao_POA_cast
+      >
+    (seq)
 {}
 
-PortableServer::POAList::~POAList (void) // dtor
+PortableServer::POAList::~POAList (void)
 {}
 
 void PortableServer::POAList::_tao_any_destructor (void *_tao_void_pointer)
@@ -231,294 +118,292 @@ void PortableServer::POAList::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      PortableServer::POAList,
+      TAO_Object_Manager<
+          PortableServer::POA,
+          PortableServer::POA_var,
+          PortableServer::tao_POA_life
+        >
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      PortableServer::POAList,
+      PortableServer::POAList_var,
+      TAO_Object_Manager<
+          PortableServer::POA,
+          PortableServer::POA_var,
+          PortableServer::tao_POA_life
+        >
+    >;
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-static const CORBA::Long _oc_PortableServer_POAList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f414c69), 
-  ACE_NTOHL (0x73743a32), 
-  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POAList:2.3
-    8,
-  ACE_NTOHL (0x504f414c), 
-  ACE_NTOHL (0x69737400),  // name = POAList
-    CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    52, // encapsulation length
+# pragma instantiate \
+    TAO_MngSeq_Var_T< \
+        PortableServer::POAList, \
+        TAO_Object_Manager< \
+            PortableServer::POA, \
+            PortableServer::POA_var, \
+            PortableServer::tao_POA_life \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        PortableServer::POAList, \
+        PortableServer::POAList_var, \
+        TAO_Object_Manager< \
+            PortableServer::POA, \
+            PortableServer::POA_var, \
+            PortableServer::tao_POA_life \
+          > \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+  static const CORBA::Long _oc_PortableServer_POAList[] =
+  {
+        TAO_ENCAP_BYTE_ORDER, // byte order
+    39,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x506f7274),
+    ACE_NTOHL (0x61626c65),
+    ACE_NTOHL (0x53657276),
+    ACE_NTOHL (0x65722f50),
+    ACE_NTOHL (0x4f414c69),
+    ACE_NTOHL (0x73743a32),
+    ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POAList:2.3
+        8,
+    ACE_NTOHL (0x504f414c),
+    ACE_NTOHL (0x69737400),  // name = POAList
+        CORBA::tk_sequence, // typecode kind
+    68, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x506f7274), 
-      ACE_NTOHL (0x61626c65), 
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x65722f50), 
-      ACE_NTOHL (0x4f413a32), 
-      ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
-            4,
-      ACE_NTOHL (0x504f4100),  // name = POA
-      
-    0U,
+      CORBA::tk_objref, // typecode kind
+      52, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        35,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x506f7274),
+        ACE_NTOHL (0x61626c65),
+        ACE_NTOHL (0x53657276),
+        ACE_NTOHL (0x65722f50),
+        ACE_NTOHL (0x4f413a32),
+        ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
+                4,
+        ACE_NTOHL (0x504f4100),  // name = POA
+
+      0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAList (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableServer_POAList),
-    (char *) &_oc_PortableServer_POAList,
-    0,
-    sizeof (PortableServer::POAList)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_POAList,
-    &_tc_TAO_tc_PortableServer_POAList
-  )
-TAO_NAMESPACE_END
-
-#if !defined (_PORTABLESERVER_OBJECTID_CS_)
-#define _PORTABLESERVER_OBJECTID_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// PortableServer::ObjectId
-// *************************************************************
-
-PortableServer::ObjectId::ObjectId (void)
-{}
-
-PortableServer::ObjectId::ObjectId (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-PortableServer::ObjectId::ObjectId (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Octet *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-PortableServer::ObjectId::ObjectId (const ObjectId &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
+  static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAList (
+      CORBA::tk_alias,
+      sizeof (_oc_PortableServer_POAList),
+      (char *) &_oc_PortableServer_POAList,
+      0,
+      sizeof (PortableServer::POAList)
+    );
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (PortableServer)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_POAList,
+      &_tc_TAO_tc_PortableServer_POAList
+    )
+  TAO_NAMESPACE_END
 
-PortableServer::ObjectId::~ObjectId (void) // dtor
-{}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-void PortableServer::ObjectId::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ObjectId *tmp = ACE_static_cast (ObjectId*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+  static const CORBA::Long _oc_PortableServer_ObjectId[] =
+  {
+        TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x506f7274),
+    ACE_NTOHL (0x61626c65),
+    ACE_NTOHL (0x53657276),
+    ACE_NTOHL (0x65722f4f),
+    ACE_NTOHL (0x626a6563),
+    ACE_NTOHL (0x7449643a),
+    ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
+        9,
+    ACE_NTOHL (0x4f626a65),
+    ACE_NTOHL (0x63744964),
+    ACE_NTOHL (0x0),  // name = ObjectId
+        CORBA::tk_alias, // typecode kind for typedefs
+    76, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      31,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f4f63),
+      ACE_NTOHL (0x74657453),
+      ACE_NTOHL (0x65713a31),
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+            9,
+      ACE_NTOHL (0x4f637465),
+      ACE_NTOHL (0x74536571),
+      ACE_NTOHL (0x0),  // name = OctetSeq
+            CORBA::tk_sequence, // typecode kind
+      12, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        CORBA::tk_octet,
 
-static const CORBA::Long _oc_PortableServer_ObjectId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f4f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x7449643a), 
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
-    9,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x0),  // name = ObjectId
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
+        0U,
 
-    0U,
 
 };
 
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableServer_ObjectId),
-    (char *) &_oc_PortableServer_ObjectId,
-    0,
-    sizeof (PortableServer::ObjectId)
-  );
+  static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
+      CORBA::tk_alias,
+      sizeof (_oc_PortableServer_ObjectId),
+      (char *) &_oc_PortableServer_ObjectId,
+      0,
+      sizeof (PortableServer::ObjectId)
+    );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ObjectId,
-    &_tc_TAO_tc_PortableServer_ObjectId
-  )
-TAO_NAMESPACE_END
+  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+  TAO_NAMESPACE_BEGIN (PortableServer)
+  TAO_NAMESPACE_DEFINE (
+      ::CORBA::TypeCode_ptr,
+      _tc_ObjectId,
+      &_tc_TAO_tc_PortableServer_ObjectId
+    )
+  TAO_NAMESPACE_END
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-PortableServer::ForwardRequest::ForwardRequest (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
-        "ForwardRequest"
-      )
-{
-}
+  PortableServer::ForwardRequest::ForwardRequest (void)
+    : CORBA::UserException (
+          "IDL:omg.org/PortableServer/ForwardRequest:2.3",
+          "ForwardRequest"
+        )
+  {
+  }
 
-PortableServer::ForwardRequest::~ForwardRequest (void)
-{
-}
+  PortableServer::ForwardRequest::~ForwardRequest (void)
+  {
+  }
 
-PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
-}
+  PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
+    : CORBA::UserException (
+          _tao_excp._rep_id (),
+          _tao_excp._name ()
+        )
+  {
+    this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
+  }
 
-PortableServer::ForwardRequest&
-PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
-  return *this;
-}
+  PortableServer::ForwardRequest&
+  PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
+  {
+    this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+    this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
+    return *this;
+  }
 
-void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ForwardRequest *tmp = ACE_static_cast (ForwardRequest*, _tao_void_pointer);
-  delete tmp;
-}
+  void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer)
+  {
+    ForwardRequest *tmp = ACE_static_cast (ForwardRequest*, _tao_void_pointer);
+    delete tmp;
+  }
 
-PortableServer::ForwardRequest *
-PortableServer::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
-}
+  PortableServer::ForwardRequest *
+  PortableServer::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
+  {
+    if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:2.3", _tao_excp->_rep_id ()))
+      {
+        return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
+      }
+    else
+      {
+        return 0;
+      }
+  }
 
-CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::ForwardRequest, 0);
-  return retval;
-}
+  CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
+  {
+    CORBA::Exception *retval = 0;
+    ACE_NEW_RETURN (retval, ::PortableServer::ForwardRequest, 0);
+    return retval;
+  }
 
-CORBA::Exception *
-PortableServer::ForwardRequest::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::ForwardRequest (*this),
-      0
-    );
-  return result;
-}
+  CORBA::Exception *
+  PortableServer::ForwardRequest::_tao_duplicate (void) const
+  {
+    CORBA::Exception *result;
+    ACE_NEW_RETURN (
+        result,
+        ::PortableServer::ForwardRequest (*this),
+        0
+      );
+    return result;
+  }
 
-void PortableServer::ForwardRequest::_raise (void)
-{
-  TAO_RAISE (*this);
-}
+  void PortableServer::ForwardRequest::_raise (void)
+  {
+    TAO_RAISE (*this);
+  }
 
-void PortableServer::ForwardRequest::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
+  void PortableServer::ForwardRequest::_tao_encode (
+      TAO_OutputCDR &cdr
+      ACE_ENV_ARG_DECL
+    ) const
+  {
+    if (cdr << *this)
+      {
+        return;
+      }
 
-void PortableServer::ForwardRequest::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
+    ACE_THROW (CORBA::MARSHAL ());
+  }
+
+  void PortableServer::ForwardRequest::_tao_decode (
+      TAO_InputCDR &cdr
+      ACE_ENV_ARG_DECL
+    )
+  {
+    if (cdr >> *this)
+      {
+        return;
+      }
 
+    ACE_THROW (CORBA::MARSHAL ());
+  }
 
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
 
-PortableServer::ForwardRequest::ForwardRequest (
-    const CORBA::Object_ptr  _tao_forward_reference
-  )  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
-        "ForwardRequest"
-      )
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
+  PortableServer::ForwardRequest::ForwardRequest (
+      const CORBA::Object_ptr  _tao_forward_reference
+    )  : CORBA::UserException (
+          "IDL:omg.org/PortableServer/ForwardRequest:2.3",
+          "ForwardRequest"
+        )
 {
   this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
@@ -536,31 +421,47 @@ static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f46), 
-  ACE_NTOHL (0x6f727761), 
-  ACE_NTOHL (0x72645265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x743a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f46),
+  ACE_NTOHL (0x6f727761),
+  ACE_NTOHL (0x72645265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x743a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:2.3
     15,
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   1, // member count
     18,
-  ACE_NTOHL (0x666f7277), 
-  ACE_NTOHL (0x6172645f), 
-  ACE_NTOHL (0x72656665), 
-  ACE_NTOHL (0x72656e63), 
+  ACE_NTOHL (0x666f7277),
+  ACE_NTOHL (0x6172645f),
+  ACE_NTOHL (0x72656665),
+  ACE_NTOHL (0x72656e63),
   ACE_NTOHL (0x65000000),  // name = forward_reference
-    };
+    CORBA::tk_objref,
+  52, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    29,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f62),
+    ACE_NTOHL (0x6a656374),
+    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
+        7,
+    ACE_NTOHL (0x4f626a65),
+    ACE_NTOHL (0x63740000),  // name = Object
+
+};
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
     CORBA::tk_except,
@@ -583,7 +484,7 @@ TAO_NAMESPACE_END
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::NotAGroupObject::NotAGroupObject (void)
@@ -665,7 +566,7 @@ void PortableServer::NotAGroupObject::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -678,7 +579,7 @@ void PortableServer::NotAGroupObject::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -695,22 +596,22 @@ static const CORBA::Long _oc_PortableServer_NotAGroupObject[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f4e), 
-  ACE_NTOHL (0x6f744147), 
-  ACE_NTOHL (0x726f7570), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63743a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f4e),
+  ACE_NTOHL (0x6f744147),
+  ACE_NTOHL (0x726f7570),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63743a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/NotAGroupObject:2.3
     16,
-  ACE_NTOHL (0x4e6f7441), 
-  ACE_NTOHL (0x47726f75), 
-  ACE_NTOHL (0x704f626a), 
+  ACE_NTOHL (0x4e6f7441),
+  ACE_NTOHL (0x47726f75),
+  ACE_NTOHL (0x704f626a),
   ACE_NTOHL (0x65637400),  // name = NotAGroupObject
   0, // member count
   };
@@ -732,117 +633,39 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CS_
-
-void
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_allocate_buffer (CORBA::ULong length)
-{
-  PortableServer::ObjectId* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      PortableServer::ObjectId *old =
-        ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  PortableServer::ObjectId *tmp =
-    ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
-  _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::~_TAO_Unbounded_Sequence_PortableServer_IDs (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_PORTABLESERVER_IDS_CS_)
-#define _PORTABLESERVER_IDS_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// PortableServer::IDs
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 PortableServer::IDs::IDs (void)
 {}
 
 PortableServer::IDs::IDs (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_PortableServer_IDs
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<PortableServer::ObjectId>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        PortableServer::ObjectId
+      >
+    (max)
 {}
 
 PortableServer::IDs::IDs (
     CORBA::ULong max,
     CORBA::ULong length,
-    PortableServer::ObjectId *buffer,
+    PortableServer::ObjectId* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_PortableServer_IDs
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<PortableServer::ObjectId>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        PortableServer::ObjectId
+      >
+    (max, length, buffer, release)
 {}
 
 PortableServer::IDs::IDs (const IDs &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_PortableServer_IDs
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<PortableServer::ObjectId>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        PortableServer::ObjectId
+      >
+    (seq)
 {}
 
-PortableServer::IDs::~IDs (void) // dtor
+PortableServer::IDs::~IDs (void)
 {}
 
 void PortableServer::IDs::_tao_any_destructor (void *_tao_void_pointer)
@@ -851,7 +674,37 @@ void PortableServer::IDs::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      IDs,
+      PortableServer::ObjectId
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      IDs,
+      IDs_var,
+      PortableServer::ObjectId
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      IDs, \
+      PortableServer::ObjectId \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      IDs, \
+      IDs_var, \
+      PortableServer::ObjectId \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -860,44 +713,61 @@ static const CORBA::Long _oc_PortableServer_IDs[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f49), 
-  ACE_NTOHL (0x44733a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f49),
+  ACE_NTOHL (0x44733a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IDs:2.3
     4,
   ACE_NTOHL (0x49447300),  // name = IDs
     CORBA::tk_sequence, // typecode kind
-  100, // encapsulation length
+  164, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
-    84, // encapsulation length
+    148, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       40,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x506f7274), 
-      ACE_NTOHL (0x61626c65), 
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x65722f4f), 
-      ACE_NTOHL (0x626a6563), 
-      ACE_NTOHL (0x7449643a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x506f7274),
+      ACE_NTOHL (0x61626c65),
+      ACE_NTOHL (0x53657276),
+      ACE_NTOHL (0x65722f4f),
+      ACE_NTOHL (0x626a6563),
+      ACE_NTOHL (0x7449643a),
       ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
             9,
-      ACE_NTOHL (0x4f626a65), 
-      ACE_NTOHL (0x63744964), 
+      ACE_NTOHL (0x4f626a65),
+      ACE_NTOHL (0x63744964),
       ACE_NTOHL (0x0),  // name = ObjectId
-            CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
+            CORBA::tk_alias, // typecode kind for typedefs
+      76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
+        31,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f63),
+        ACE_NTOHL (0x74657453),
+        ACE_NTOHL (0x65713a31),
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+                9,
+        ACE_NTOHL (0x4f637465),
+        ACE_NTOHL (0x74536571),
+        ACE_NTOHL (0x0),  // name = OctetSeq
+                CORBA::tk_sequence, // typecode kind
+        12, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          CORBA::tk_octet,
+
+          0U,
 
-        0U,
 
 
     0U,
@@ -932,36 +802,36 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f54), 
-  ACE_NTOHL (0x68726561), 
-  ACE_NTOHL (0x64506f6c), 
-  ACE_NTOHL (0x69637956), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f54),
+  ACE_NTOHL (0x68726561),
+  ACE_NTOHL (0x64506f6c),
+  ACE_NTOHL (0x69637956),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x3a322e33),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicyValue:2.3
   18,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x56616c75),
   ACE_NTOHL (0x65000000),  // name = ThreadPolicyValue
   2, // member count
   15,
-  ACE_NTOHL (0x4f52425f), 
-  ACE_NTOHL (0x4354524c), 
-  ACE_NTOHL (0x5f4d4f44), 
+  ACE_NTOHL (0x4f52425f),
+  ACE_NTOHL (0x4354524c),
+  ACE_NTOHL (0x5f4d4f44),
   ACE_NTOHL (0x454c0000),  // name = ORB_CTRL_MODEL
   20,
-  ACE_NTOHL (0x53494e47), 
-  ACE_NTOHL (0x4c455f54), 
-  ACE_NTOHL (0x48524541), 
-  ACE_NTOHL (0x445f4d4f), 
+  ACE_NTOHL (0x53494e47),
+  ACE_NTOHL (0x4c455f54),
+  ACE_NTOHL (0x48524541),
+  ACE_NTOHL (0x445f4d4f),
   ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
   };
 
@@ -988,7 +858,7 @@ TAO_NAMESPACE_END
 int PortableServer::ThreadPolicy::_tao_class_id = 0;
 
 PortableServer::ThreadPolicy_ptr
-tao_PortableServer_ThreadPolicy_duplicate (
+PortableServer::tao_ThreadPolicy_life::tao_duplicate (
     PortableServer::ThreadPolicy_ptr p
   )
 {
@@ -996,7 +866,7 @@ tao_PortableServer_ThreadPolicy_duplicate (
 }
 
 void
-tao_PortableServer_ThreadPolicy_release (
+PortableServer::tao_ThreadPolicy_life::tao_release (
     PortableServer::ThreadPolicy_ptr p
   )
 {
@@ -1004,15 +874,24 @@ tao_PortableServer_ThreadPolicy_release (
 }
 
 PortableServer::ThreadPolicy_ptr
-tao_PortableServer_ThreadPolicy_nil (
+PortableServer::tao_ThreadPolicy_life::tao_nil (
     void
   )
 {
   return PortableServer::ThreadPolicy::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_ThreadPolicy_life::tao_marshal (
+    PortableServer::ThreadPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::ThreadPolicy_ptr
-tao_PortableServer_ThreadPolicy_narrow (
+PortableServer::tao_ThreadPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1021,7 +900,7 @@ tao_PortableServer_ThreadPolicy_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_ThreadPolicy_upcast (
+PortableServer::tao_ThreadPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -1030,205 +909,32 @@ tao_PortableServer_ThreadPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_ThreadPolicy_marshal (
-    PortableServer::ThreadPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::ThreadPolicy_var
-// *************************************************************
-
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (void)
-  : ptr_ (ThreadPolicy::_nil ())
-{}
-
-::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (const ::PortableServer::ThreadPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ThreadPolicy::_duplicate (p.ptr ()))
-{}
-
-PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::ThreadPolicy_var &
-PortableServer::ThreadPolicy_var::operator= (ThreadPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ThreadPolicy_var &
-PortableServer::ThreadPolicy_var::operator= (const ::PortableServer::ThreadPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ThreadPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::ThreadPolicy_var::operator const ::PortableServer::ThreadPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ThreadPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
-  return val;
-}
-
-::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::tao_duplicate (ThreadPolicy_ptr p)
-{
-  return ::PortableServer::ThreadPolicy::_duplicate (p);
-}
-
-void
-PortableServer::ThreadPolicy_var::tao_release (ThreadPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::tao_nil (void)
-{
-  return ::PortableServer::ThreadPolicy::_nil ();
-}
-
-::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::ThreadPolicy_var::tao_upcast (void *src)
-{
-  ThreadPolicy **tmp =
-    ACE_static_cast (ThreadPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ThreadPolicy,
+        PortableServer::tao_ThreadPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ThreadPolicy,
+        PortableServer::tao_ThreadPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ThreadPolicy, \
+        PortableServer::tao_ThreadPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ThreadPolicy, \
+        PortableServer::tao_ThreadPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::ThreadPolicy_out
-// *************************************************************
-
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
-}
-
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
-}
-
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (const ::PortableServer::ThreadPolicy_out &p)
-  : ptr_ (ACE_const_cast (ThreadPolicy_out &, p).ptr_)
-{}
-
-::PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (const ::PortableServer::ThreadPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ThreadPolicy_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (const ::PortableServer::ThreadPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::ThreadPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (ThreadPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ThreadPolicy_out::operator ::PortableServer::ThreadPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::ThreadPolicy::ThreadPolicy (void)
 {}
@@ -1236,7 +942,7 @@ PortableServer::ThreadPolicy::ThreadPolicy (void)
 PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {}
 
-void 
+void
 PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ThreadPolicy *tmp = ACE_static_cast (ThreadPolicy *, _tao_void_pointer);
@@ -1252,7 +958,7 @@ PortableServer::ThreadPolicy::_narrow (
   return ThreadPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ThreadPolicy_ptr 
+PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1262,7 +968,7 @@ PortableServer::ThreadPolicy::_unchecked_narrow (
     {
       return ThreadPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ThreadPolicy_ptr,
@@ -1282,14 +988,14 @@ PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, ThreadPolicy)::_tao_class_id)
@@ -1322,12 +1028,12 @@ void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1336,6 +1042,12 @@ const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/ThreadPolicy:2.3";
 }
 
+CORBA::Boolean
+PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1343,21 +1055,21 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f54), 
-  ACE_NTOHL (0x68726561), 
-  ACE_NTOHL (0x64506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f54),
+  ACE_NTOHL (0x68726561),
+  ACE_NTOHL (0x64506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:2.3
     13,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ThreadPolicy
   };
 
@@ -1387,33 +1099,33 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f4c), 
-  ACE_NTOHL (0x69666573), 
-  ACE_NTOHL (0x70616e50), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x7956616c), 
-  ACE_NTOHL (0x75653a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f4c),
+  ACE_NTOHL (0x69666573),
+  ACE_NTOHL (0x70616e50),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x7956616c),
+  ACE_NTOHL (0x75653a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicyValue:2.3
   20,
-  ACE_NTOHL (0x4c696665), 
-  ACE_NTOHL (0x7370616e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x4c696665),
+  ACE_NTOHL (0x7370616e),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
   ACE_NTOHL (0x6c756500),  // name = LifespanPolicyValue
   2, // member count
   10,
-  ACE_NTOHL (0x5452414e), 
-  ACE_NTOHL (0x5349454e), 
+  ACE_NTOHL (0x5452414e),
+  ACE_NTOHL (0x5349454e),
   ACE_NTOHL (0x54000000),  // name = TRANSIENT
   11,
-  ACE_NTOHL (0x50455253), 
-  ACE_NTOHL (0x49535445), 
+  ACE_NTOHL (0x50455253),
+  ACE_NTOHL (0x49535445),
   ACE_NTOHL (0x4e540000),  // name = PERSISTENT
   };
 
@@ -1440,7 +1152,7 @@ TAO_NAMESPACE_END
 int PortableServer::LifespanPolicy::_tao_class_id = 0;
 
 PortableServer::LifespanPolicy_ptr
-tao_PortableServer_LifespanPolicy_duplicate (
+PortableServer::tao_LifespanPolicy_life::tao_duplicate (
     PortableServer::LifespanPolicy_ptr p
   )
 {
@@ -1448,7 +1160,7 @@ tao_PortableServer_LifespanPolicy_duplicate (
 }
 
 void
-tao_PortableServer_LifespanPolicy_release (
+PortableServer::tao_LifespanPolicy_life::tao_release (
     PortableServer::LifespanPolicy_ptr p
   )
 {
@@ -1456,15 +1168,24 @@ tao_PortableServer_LifespanPolicy_release (
 }
 
 PortableServer::LifespanPolicy_ptr
-tao_PortableServer_LifespanPolicy_nil (
+PortableServer::tao_LifespanPolicy_life::tao_nil (
     void
   )
 {
   return PortableServer::LifespanPolicy::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_LifespanPolicy_life::tao_marshal (
+    PortableServer::LifespanPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::LifespanPolicy_ptr
-tao_PortableServer_LifespanPolicy_narrow (
+PortableServer::tao_LifespanPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1473,7 +1194,7 @@ tao_PortableServer_LifespanPolicy_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_LifespanPolicy_upcast (
+PortableServer::tao_LifespanPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -1482,205 +1203,32 @@ tao_PortableServer_LifespanPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_LifespanPolicy_marshal (
-    PortableServer::LifespanPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::LifespanPolicy_var
-// *************************************************************
-
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (void)
-  : ptr_ (LifespanPolicy::_nil ())
-{}
-
-::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (const ::PortableServer::LifespanPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (LifespanPolicy::_duplicate (p.ptr ()))
-{}
-
-PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::LifespanPolicy_var &
-PortableServer::LifespanPolicy_var::operator= (LifespanPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::LifespanPolicy_var &
-PortableServer::LifespanPolicy_var::operator= (const ::PortableServer::LifespanPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::LifespanPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::LifespanPolicy_var::operator const ::PortableServer::LifespanPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::LifespanPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
-  return val;
-}
-
-::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::tao_duplicate (LifespanPolicy_ptr p)
-{
-  return ::PortableServer::LifespanPolicy::_duplicate (p);
-}
-
-void
-PortableServer::LifespanPolicy_var::tao_release (LifespanPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::tao_nil (void)
-{
-  return ::PortableServer::LifespanPolicy::_nil ();
-}
-
-::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::LifespanPolicy_var::tao_upcast (void *src)
-{
-  LifespanPolicy **tmp =
-    ACE_static_cast (LifespanPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::LifespanPolicy,
+        PortableServer::tao_LifespanPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::LifespanPolicy,
+        PortableServer::tao_LifespanPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::LifespanPolicy, \
+        PortableServer::tao_LifespanPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::LifespanPolicy, \
+        PortableServer::tao_LifespanPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::LifespanPolicy_out
-// *************************************************************
-
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
-}
-
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
-}
-
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (const ::PortableServer::LifespanPolicy_out &p)
-  : ptr_ (ACE_const_cast (LifespanPolicy_out &, p).ptr_)
-{}
-
-::PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (const ::PortableServer::LifespanPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (LifespanPolicy_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (const ::PortableServer::LifespanPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::LifespanPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (LifespanPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::LifespanPolicy_out::operator ::PortableServer::LifespanPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::LifespanPolicy::LifespanPolicy (void)
 {}
@@ -1688,7 +1236,7 @@ PortableServer::LifespanPolicy::LifespanPolicy (void)
 PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {}
 
-void 
+void
 PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   LifespanPolicy *tmp = ACE_static_cast (LifespanPolicy *, _tao_void_pointer);
@@ -1704,7 +1252,7 @@ PortableServer::LifespanPolicy::_narrow (
   return LifespanPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::LifespanPolicy_ptr 
+PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1714,7 +1262,7 @@ PortableServer::LifespanPolicy::_unchecked_narrow (
     {
       return LifespanPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           LifespanPolicy_ptr,
@@ -1734,14 +1282,14 @@ PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, LifespanPolicy)::_tao_class_id)
@@ -1774,12 +1322,12 @@ void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1788,6 +1336,12 @@ const char* PortableServer::LifespanPolicy::_interface_repository_id (void) cons
   return "IDL:omg.org/PortableServer/LifespanPolicy:2.3";
 }
 
+CORBA::Boolean
+PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1795,22 +1349,22 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f4c), 
-  ACE_NTOHL (0x69666573), 
-  ACE_NTOHL (0x70616e50), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f4c),
+  ACE_NTOHL (0x69666573),
+  ACE_NTOHL (0x70616e50),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:2.3
     15,
-  ACE_NTOHL (0x4c696665), 
-  ACE_NTOHL (0x7370616e), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x4c696665),
+  ACE_NTOHL (0x7370616e),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = LifespanPolicy
   };
 
@@ -1838,35 +1392,35 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f49), 
-  ACE_NTOHL (0x64556e69), 
-  ACE_NTOHL (0x7175656e), 
-  ACE_NTOHL (0x65737350), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x7956616c), 
-  ACE_NTOHL (0x75653a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f49),
+  ACE_NTOHL (0x64556e69),
+  ACE_NTOHL (0x7175656e),
+  ACE_NTOHL (0x65737350),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x7956616c),
+  ACE_NTOHL (0x75653a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicyValue:2.3
   24,
-  ACE_NTOHL (0x4964556e), 
-  ACE_NTOHL (0x69717565), 
-  ACE_NTOHL (0x6e657373), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x4964556e),
+  ACE_NTOHL (0x69717565),
+  ACE_NTOHL (0x6e657373),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
   ACE_NTOHL (0x6c756500),  // name = IdUniquenessPolicyValue
   2, // member count
   10,
-  ACE_NTOHL (0x554e4951), 
-  ACE_NTOHL (0x55455f49), 
+  ACE_NTOHL (0x554e4951),
+  ACE_NTOHL (0x55455f49),
   ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
   12,
-  ACE_NTOHL (0x4d554c54), 
-  ACE_NTOHL (0x49504c45), 
+  ACE_NTOHL (0x4d554c54),
+  ACE_NTOHL (0x49504c45),
   ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
   };
 
@@ -1893,7 +1447,7 @@ TAO_NAMESPACE_END
 int PortableServer::IdUniquenessPolicy::_tao_class_id = 0;
 
 PortableServer::IdUniquenessPolicy_ptr
-tao_PortableServer_IdUniquenessPolicy_duplicate (
+PortableServer::tao_IdUniquenessPolicy_life::tao_duplicate (
     PortableServer::IdUniquenessPolicy_ptr p
   )
 {
@@ -1901,7 +1455,7 @@ tao_PortableServer_IdUniquenessPolicy_duplicate (
 }
 
 void
-tao_PortableServer_IdUniquenessPolicy_release (
+PortableServer::tao_IdUniquenessPolicy_life::tao_release (
     PortableServer::IdUniquenessPolicy_ptr p
   )
 {
@@ -1909,15 +1463,24 @@ tao_PortableServer_IdUniquenessPolicy_release (
 }
 
 PortableServer::IdUniquenessPolicy_ptr
-tao_PortableServer_IdUniquenessPolicy_nil (
+PortableServer::tao_IdUniquenessPolicy_life::tao_nil (
     void
   )
 {
   return PortableServer::IdUniquenessPolicy::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_IdUniquenessPolicy_life::tao_marshal (
+    PortableServer::IdUniquenessPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::IdUniquenessPolicy_ptr
-tao_PortableServer_IdUniquenessPolicy_narrow (
+PortableServer::tao_IdUniquenessPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1926,7 +1489,7 @@ tao_PortableServer_IdUniquenessPolicy_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_IdUniquenessPolicy_upcast (
+PortableServer::tao_IdUniquenessPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -1935,205 +1498,32 @@ tao_PortableServer_IdUniquenessPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_IdUniquenessPolicy_marshal (
-    PortableServer::IdUniquenessPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::IdUniquenessPolicy_var
-// *************************************************************
-
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void)
-  : ptr_ (IdUniquenessPolicy::_nil ())
-{}
-
-::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const ::PortableServer::IdUniquenessPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (IdUniquenessPolicy::_duplicate (p.ptr ()))
-{}
-
-PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::IdUniquenessPolicy_var &
-PortableServer::IdUniquenessPolicy_var::operator= (IdUniquenessPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::IdUniquenessPolicy_var &
-PortableServer::IdUniquenessPolicy_var::operator= (const ::PortableServer::IdUniquenessPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::IdUniquenessPolicy_var::operator const ::PortableServer::IdUniquenessPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::IdUniquenessPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
-  return val;
-}
-
-::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::tao_duplicate (IdUniquenessPolicy_ptr p)
-{
-  return ::PortableServer::IdUniquenessPolicy::_duplicate (p);
-}
-
-void
-PortableServer::IdUniquenessPolicy_var::tao_release (IdUniquenessPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::tao_nil (void)
-{
-  return ::PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::IdUniquenessPolicy_var::tao_upcast (void *src)
-{
-  IdUniquenessPolicy **tmp =
-    ACE_static_cast (IdUniquenessPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::IdUniquenessPolicy,
+        PortableServer::tao_IdUniquenessPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::IdUniquenessPolicy,
+        PortableServer::tao_IdUniquenessPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::IdUniquenessPolicy, \
+        PortableServer::tao_IdUniquenessPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::IdUniquenessPolicy, \
+        PortableServer::tao_IdUniquenessPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::IdUniquenessPolicy_out
-// *************************************************************
-
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (const ::PortableServer::IdUniquenessPolicy_out &p)
-  : ptr_ (ACE_const_cast (IdUniquenessPolicy_out &, p).ptr_)
-{}
-
-::PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (const ::PortableServer::IdUniquenessPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (IdUniquenessPolicy_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (const ::PortableServer::IdUniquenessPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (IdUniquenessPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::IdUniquenessPolicy_out::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 {}
@@ -2141,7 +1531,7 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {}
 
-void 
+void
 PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   IdUniquenessPolicy *tmp = ACE_static_cast (IdUniquenessPolicy *, _tao_void_pointer);
@@ -2157,7 +1547,7 @@ PortableServer::IdUniquenessPolicy::_narrow (
   return IdUniquenessPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::IdUniquenessPolicy_ptr 
+PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2167,7 +1557,7 @@ PortableServer::IdUniquenessPolicy::_unchecked_narrow (
     {
       return IdUniquenessPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           IdUniquenessPolicy_ptr,
@@ -2187,14 +1577,14 @@ PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, IdUniquenessPolicy)::_tao_class_id)
@@ -2227,12 +1617,12 @@ void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2241,6 +1631,12 @@ const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void)
   return "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3";
 }
 
+CORBA::Boolean
+PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2248,24 +1644,24 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f49), 
-  ACE_NTOHL (0x64556e69), 
-  ACE_NTOHL (0x7175656e), 
-  ACE_NTOHL (0x65737350), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f49),
+  ACE_NTOHL (0x64556e69),
+  ACE_NTOHL (0x7175656e),
+  ACE_NTOHL (0x65737350),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3
     19,
-  ACE_NTOHL (0x4964556e), 
-  ACE_NTOHL (0x69717565), 
-  ACE_NTOHL (0x6e657373), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x4964556e),
+  ACE_NTOHL (0x69717565),
+  ACE_NTOHL (0x6e657373),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = IdUniquenessPolicy
   };
 
@@ -2293,34 +1689,34 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f49), 
-  ACE_NTOHL (0x64417373), 
-  ACE_NTOHL (0x69676e6d), 
-  ACE_NTOHL (0x656e7450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x7956616c), 
-  ACE_NTOHL (0x75653a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f49),
+  ACE_NTOHL (0x64417373),
+  ACE_NTOHL (0x69676e6d),
+  ACE_NTOHL (0x656e7450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x7956616c),
+  ACE_NTOHL (0x75653a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicyValue:2.3
   24,
-  ACE_NTOHL (0x49644173), 
-  ACE_NTOHL (0x7369676e), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x49644173),
+  ACE_NTOHL (0x7369676e),
+  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
   ACE_NTOHL (0x6c756500),  // name = IdAssignmentPolicyValue
   2, // member count
   8,
-  ACE_NTOHL (0x55534552), 
+  ACE_NTOHL (0x55534552),
   ACE_NTOHL (0x5f494400),  // name = USER_ID
   10,
-  ACE_NTOHL (0x53595354), 
-  ACE_NTOHL (0x454d5f49), 
+  ACE_NTOHL (0x53595354),
+  ACE_NTOHL (0x454d5f49),
   ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
   };
 
@@ -2347,7 +1743,7 @@ TAO_NAMESPACE_END
 int PortableServer::IdAssignmentPolicy::_tao_class_id = 0;
 
 PortableServer::IdAssignmentPolicy_ptr
-tao_PortableServer_IdAssignmentPolicy_duplicate (
+PortableServer::tao_IdAssignmentPolicy_life::tao_duplicate (
     PortableServer::IdAssignmentPolicy_ptr p
   )
 {
@@ -2355,7 +1751,7 @@ tao_PortableServer_IdAssignmentPolicy_duplicate (
 }
 
 void
-tao_PortableServer_IdAssignmentPolicy_release (
+PortableServer::tao_IdAssignmentPolicy_life::tao_release (
     PortableServer::IdAssignmentPolicy_ptr p
   )
 {
@@ -2363,15 +1759,24 @@ tao_PortableServer_IdAssignmentPolicy_release (
 }
 
 PortableServer::IdAssignmentPolicy_ptr
-tao_PortableServer_IdAssignmentPolicy_nil (
+PortableServer::tao_IdAssignmentPolicy_life::tao_nil (
     void
   )
 {
   return PortableServer::IdAssignmentPolicy::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_IdAssignmentPolicy_life::tao_marshal (
+    PortableServer::IdAssignmentPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::IdAssignmentPolicy_ptr
-tao_PortableServer_IdAssignmentPolicy_narrow (
+PortableServer::tao_IdAssignmentPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2380,7 +1785,7 @@ tao_PortableServer_IdAssignmentPolicy_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_IdAssignmentPolicy_upcast (
+PortableServer::tao_IdAssignmentPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -2389,205 +1794,32 @@ tao_PortableServer_IdAssignmentPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_IdAssignmentPolicy_marshal (
-    PortableServer::IdAssignmentPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::IdAssignmentPolicy_var
-// *************************************************************
-
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void)
-  : ptr_ (IdAssignmentPolicy::_nil ())
-{}
-
-::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const ::PortableServer::IdAssignmentPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (IdAssignmentPolicy::_duplicate (p.ptr ()))
-{}
-
-PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::IdAssignmentPolicy_var &
-PortableServer::IdAssignmentPolicy_var::operator= (IdAssignmentPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::IdAssignmentPolicy_var &
-PortableServer::IdAssignmentPolicy_var::operator= (const ::PortableServer::IdAssignmentPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::IdAssignmentPolicy_var::operator const ::PortableServer::IdAssignmentPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::IdAssignmentPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
-  return val;
-}
-
-::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::tao_duplicate (IdAssignmentPolicy_ptr p)
-{
-  return ::PortableServer::IdAssignmentPolicy::_duplicate (p);
-}
-
-void
-PortableServer::IdAssignmentPolicy_var::tao_release (IdAssignmentPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::tao_nil (void)
-{
-  return ::PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::IdAssignmentPolicy_var::tao_upcast (void *src)
-{
-  IdAssignmentPolicy **tmp =
-    ACE_static_cast (IdAssignmentPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::IdAssignmentPolicy,
+        PortableServer::tao_IdAssignmentPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::IdAssignmentPolicy,
+        PortableServer::tao_IdAssignmentPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::IdAssignmentPolicy, \
+        PortableServer::tao_IdAssignmentPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::IdAssignmentPolicy, \
+        PortableServer::tao_IdAssignmentPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::IdAssignmentPolicy_out
-// *************************************************************
-
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (const ::PortableServer::IdAssignmentPolicy_out &p)
-  : ptr_ (ACE_const_cast (IdAssignmentPolicy_out &, p).ptr_)
-{}
-
-::PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (const ::PortableServer::IdAssignmentPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (IdAssignmentPolicy_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (const ::PortableServer::IdAssignmentPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (IdAssignmentPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::IdAssignmentPolicy_out::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 {}
@@ -2595,7 +1827,7 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {}
 
-void 
+void
 PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   IdAssignmentPolicy *tmp = ACE_static_cast (IdAssignmentPolicy *, _tao_void_pointer);
@@ -2611,7 +1843,7 @@ PortableServer::IdAssignmentPolicy::_narrow (
   return IdAssignmentPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::IdAssignmentPolicy_ptr 
+PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2621,7 +1853,7 @@ PortableServer::IdAssignmentPolicy::_unchecked_narrow (
     {
       return IdAssignmentPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           IdAssignmentPolicy_ptr,
@@ -2641,14 +1873,14 @@ PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, IdAssignmentPolicy)::_tao_class_id)
@@ -2681,12 +1913,12 @@ void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2695,6 +1927,12 @@ const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void)
   return "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3";
 }
 
+CORBA::Boolean
+PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2702,24 +1940,24 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f49), 
-  ACE_NTOHL (0x64417373), 
-  ACE_NTOHL (0x69676e6d), 
-  ACE_NTOHL (0x656e7450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f49),
+  ACE_NTOHL (0x64417373),
+  ACE_NTOHL (0x69676e6d),
+  ACE_NTOHL (0x656e7450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3
     19,
-  ACE_NTOHL (0x49644173), 
-  ACE_NTOHL (0x7369676e), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x49644173),
+  ACE_NTOHL (0x7369676e),
+  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = IdAssignmentPolicy
   };
 
@@ -2749,44 +1987,44 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   61,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f49), 
-  ACE_NTOHL (0x6d706c69), 
-  ACE_NTOHL (0x63697441), 
-  ACE_NTOHL (0x63746976), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e506f6c), 
-  ACE_NTOHL (0x69637956), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f49),
+  ACE_NTOHL (0x6d706c69),
+  ACE_NTOHL (0x63697441),
+  ACE_NTOHL (0x63746976),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e506f6c),
+  ACE_NTOHL (0x69637956),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x3a322e33),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:2.3
   30,
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x69636974), 
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76617469), 
-  ACE_NTOHL (0x6f6e506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x69636974),
+  ACE_NTOHL (0x41637469),
+  ACE_NTOHL (0x76617469),
+  ACE_NTOHL (0x6f6e506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x56616c75),
   ACE_NTOHL (0x65000000),  // name = ImplicitActivationPolicyValue
   2, // member count
   20,
-  ACE_NTOHL (0x494d504c), 
-  ACE_NTOHL (0x49434954), 
-  ACE_NTOHL (0x5f414354), 
-  ACE_NTOHL (0x49564154), 
+  ACE_NTOHL (0x494d504c),
+  ACE_NTOHL (0x49434954),
+  ACE_NTOHL (0x5f414354),
+  ACE_NTOHL (0x49564154),
   ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
   23,
-  ACE_NTOHL (0x4e4f5f49), 
-  ACE_NTOHL (0x4d504c49), 
-  ACE_NTOHL (0x4349545f), 
-  ACE_NTOHL (0x41435449), 
-  ACE_NTOHL (0x56415449), 
+  ACE_NTOHL (0x4e4f5f49),
+  ACE_NTOHL (0x4d504c49),
+  ACE_NTOHL (0x4349545f),
+  ACE_NTOHL (0x41435449),
+  ACE_NTOHL (0x56415449),
   ACE_NTOHL (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
   };
 
@@ -2813,7 +2051,7 @@ TAO_NAMESPACE_END
 int PortableServer::ImplicitActivationPolicy::_tao_class_id = 0;
 
 PortableServer::ImplicitActivationPolicy_ptr
-tao_PortableServer_ImplicitActivationPolicy_duplicate (
+PortableServer::tao_ImplicitActivationPolicy_life::tao_duplicate (
     PortableServer::ImplicitActivationPolicy_ptr p
   )
 {
@@ -2821,7 +2059,7 @@ tao_PortableServer_ImplicitActivationPolicy_duplicate (
 }
 
 void
-tao_PortableServer_ImplicitActivationPolicy_release (
+PortableServer::tao_ImplicitActivationPolicy_life::tao_release (
     PortableServer::ImplicitActivationPolicy_ptr p
   )
 {
@@ -2829,15 +2067,24 @@ tao_PortableServer_ImplicitActivationPolicy_release (
 }
 
 PortableServer::ImplicitActivationPolicy_ptr
-tao_PortableServer_ImplicitActivationPolicy_nil (
+PortableServer::tao_ImplicitActivationPolicy_life::tao_nil (
     void
   )
 {
   return PortableServer::ImplicitActivationPolicy::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_ImplicitActivationPolicy_life::tao_marshal (
+    PortableServer::ImplicitActivationPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::ImplicitActivationPolicy_ptr
-tao_PortableServer_ImplicitActivationPolicy_narrow (
+PortableServer::tao_ImplicitActivationPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2846,7 +2093,7 @@ tao_PortableServer_ImplicitActivationPolicy_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_ImplicitActivationPolicy_upcast (
+PortableServer::tao_ImplicitActivationPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -2855,205 +2102,32 @@ tao_PortableServer_ImplicitActivationPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_ImplicitActivationPolicy_marshal (
-    PortableServer::ImplicitActivationPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::ImplicitActivationPolicy_var
-// *************************************************************
-
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void)
-  : ptr_ (ImplicitActivationPolicy::_nil ())
-{}
-
-::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const ::PortableServer::ImplicitActivationPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ImplicitActivationPolicy::_duplicate (p.ptr ()))
-{}
-
-PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::ImplicitActivationPolicy_var &
-PortableServer::ImplicitActivationPolicy_var::operator= (ImplicitActivationPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ImplicitActivationPolicy_var &
-PortableServer::ImplicitActivationPolicy_var::operator= (const ::PortableServer::ImplicitActivationPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::ImplicitActivationPolicy_var::operator const ::PortableServer::ImplicitActivationPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ImplicitActivationPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
-  return val;
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::tao_duplicate (ImplicitActivationPolicy_ptr p)
-{
-  return ::PortableServer::ImplicitActivationPolicy::_duplicate (p);
-}
-
-void
-PortableServer::ImplicitActivationPolicy_var::tao_release (ImplicitActivationPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::tao_nil (void)
-{
-  return ::PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::ImplicitActivationPolicy_var::tao_upcast (void *src)
-{
-  ImplicitActivationPolicy **tmp =
-    ACE_static_cast (ImplicitActivationPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ImplicitActivationPolicy,
+        PortableServer::tao_ImplicitActivationPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ImplicitActivationPolicy,
+        PortableServer::tao_ImplicitActivationPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ImplicitActivationPolicy, \
+        PortableServer::tao_ImplicitActivationPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ImplicitActivationPolicy, \
+        PortableServer::tao_ImplicitActivationPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::ImplicitActivationPolicy_out
-// *************************************************************
-
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (const ::PortableServer::ImplicitActivationPolicy_out &p)
-  : ptr_ (ACE_const_cast (ImplicitActivationPolicy_out &, p).ptr_)
-{}
-
-::PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (const ::PortableServer::ImplicitActivationPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ImplicitActivationPolicy_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (const ::PortableServer::ImplicitActivationPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (ImplicitActivationPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ImplicitActivationPolicy_out::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 {}
@@ -3061,7 +2135,7 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {}
 
-void 
+void
 PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ImplicitActivationPolicy *tmp = ACE_static_cast (ImplicitActivationPolicy *, _tao_void_pointer);
@@ -3077,7 +2151,7 @@ PortableServer::ImplicitActivationPolicy::_narrow (
   return ImplicitActivationPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ImplicitActivationPolicy_ptr 
+PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3087,7 +2161,7 @@ PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
     {
       return ImplicitActivationPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ImplicitActivationPolicy_ptr,
@@ -3107,14 +2181,14 @@ PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_p
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, ImplicitActivationPolicy)::_tao_class_id)
@@ -3147,12 +2221,12 @@ void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3161,6 +2235,12 @@ const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (
   return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3";
 }
 
+CORBA::Boolean
+PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3168,27 +2248,27 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   56,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f49), 
-  ACE_NTOHL (0x6d706c69), 
-  ACE_NTOHL (0x63697441), 
-  ACE_NTOHL (0x63746976), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f49),
+  ACE_NTOHL (0x6d706c69),
+  ACE_NTOHL (0x63697441),
+  ACE_NTOHL (0x63746976),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3
     25,
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x69636974), 
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76617469), 
-  ACE_NTOHL (0x6f6e506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x69636974),
+  ACE_NTOHL (0x41637469),
+  ACE_NTOHL (0x76617469),
+  ACE_NTOHL (0x6f6e506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ImplicitActivationPolicy
   };
 
@@ -3216,36 +2296,36 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x74656e74), 
-  ACE_NTOHL (0x696f6e50), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x7956616c), 
-  ACE_NTOHL (0x75653a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f53),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x74656e74),
+  ACE_NTOHL (0x696f6e50),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x7956616c),
+  ACE_NTOHL (0x75653a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicyValue:2.3
   28,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e7452), 
-  ACE_NTOHL (0x6574656e), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x616e7452),
+  ACE_NTOHL (0x6574656e),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
   ACE_NTOHL (0x6c756500),  // name = ServantRetentionPolicyValue
   2, // member count
   7,
-  ACE_NTOHL (0x52455441), 
+  ACE_NTOHL (0x52455441),
   ACE_NTOHL (0x494e0000),  // name = RETAIN
   11,
-  ACE_NTOHL (0x4e4f4e5f), 
-  ACE_NTOHL (0x52455441), 
+  ACE_NTOHL (0x4e4f4e5f),
+  ACE_NTOHL (0x52455441),
   ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
   };
 
@@ -3272,7 +2352,7 @@ TAO_NAMESPACE_END
 int PortableServer::ServantRetentionPolicy::_tao_class_id = 0;
 
 PortableServer::ServantRetentionPolicy_ptr
-tao_PortableServer_ServantRetentionPolicy_duplicate (
+PortableServer::tao_ServantRetentionPolicy_life::tao_duplicate (
     PortableServer::ServantRetentionPolicy_ptr p
   )
 {
@@ -3280,7 +2360,7 @@ tao_PortableServer_ServantRetentionPolicy_duplicate (
 }
 
 void
-tao_PortableServer_ServantRetentionPolicy_release (
+PortableServer::tao_ServantRetentionPolicy_life::tao_release (
     PortableServer::ServantRetentionPolicy_ptr p
   )
 {
@@ -3288,15 +2368,24 @@ tao_PortableServer_ServantRetentionPolicy_release (
 }
 
 PortableServer::ServantRetentionPolicy_ptr
-tao_PortableServer_ServantRetentionPolicy_nil (
+PortableServer::tao_ServantRetentionPolicy_life::tao_nil (
     void
   )
 {
   return PortableServer::ServantRetentionPolicy::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_ServantRetentionPolicy_life::tao_marshal (
+    PortableServer::ServantRetentionPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::ServantRetentionPolicy_ptr
-tao_PortableServer_ServantRetentionPolicy_narrow (
+PortableServer::tao_ServantRetentionPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3305,7 +2394,7 @@ tao_PortableServer_ServantRetentionPolicy_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_ServantRetentionPolicy_upcast (
+PortableServer::tao_ServantRetentionPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -3314,205 +2403,32 @@ tao_PortableServer_ServantRetentionPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_ServantRetentionPolicy_marshal (
-    PortableServer::ServantRetentionPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::ServantRetentionPolicy_var
-// *************************************************************
-
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void)
-  : ptr_ (ServantRetentionPolicy::_nil ())
-{}
-
-::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const ::PortableServer::ServantRetentionPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServantRetentionPolicy::_duplicate (p.ptr ()))
-{}
-
-PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::ServantRetentionPolicy_var &
-PortableServer::ServantRetentionPolicy_var::operator= (ServantRetentionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ServantRetentionPolicy_var &
-PortableServer::ServantRetentionPolicy_var::operator= (const ::PortableServer::ServantRetentionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::ServantRetentionPolicy_var::operator const ::PortableServer::ServantRetentionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ServantRetentionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
-  return val;
-}
-
-::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::tao_duplicate (ServantRetentionPolicy_ptr p)
-{
-  return ::PortableServer::ServantRetentionPolicy::_duplicate (p);
-}
-
-void
-PortableServer::ServantRetentionPolicy_var::tao_release (ServantRetentionPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::tao_nil (void)
-{
-  return ::PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::ServantRetentionPolicy_var::tao_upcast (void *src)
-{
-  ServantRetentionPolicy **tmp =
-    ACE_static_cast (ServantRetentionPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantRetentionPolicy,
+        PortableServer::tao_ServantRetentionPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantRetentionPolicy,
+        PortableServer::tao_ServantRetentionPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantRetentionPolicy, \
+        PortableServer::tao_ServantRetentionPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantRetentionPolicy, \
+        PortableServer::tao_ServantRetentionPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::ServantRetentionPolicy_out
-// *************************************************************
-
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (const ::PortableServer::ServantRetentionPolicy_out &p)
-  : ptr_ (ACE_const_cast (ServantRetentionPolicy_out &, p).ptr_)
-{}
-
-::PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (const ::PortableServer::ServantRetentionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServantRetentionPolicy_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (const ::PortableServer::ServantRetentionPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (ServantRetentionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ServantRetentionPolicy_out::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 {}
@@ -3520,7 +2436,7 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {}
 
-void 
+void
 PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServantRetentionPolicy *tmp = ACE_static_cast (ServantRetentionPolicy *, _tao_void_pointer);
@@ -3536,7 +2452,7 @@ PortableServer::ServantRetentionPolicy::_narrow (
   return ServantRetentionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ServantRetentionPolicy_ptr 
+PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3546,7 +2462,7 @@ PortableServer::ServantRetentionPolicy::_unchecked_narrow (
     {
       return ServantRetentionPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ServantRetentionPolicy_ptr,
@@ -3566,14 +2482,14 @@ PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr o
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, ServantRetentionPolicy)::_tao_class_id)
@@ -3606,12 +2522,12 @@ void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3620,6 +2536,12 @@ const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (vo
   return "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3";
 }
 
+CORBA::Boolean
+PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3627,26 +2549,26 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x74656e74), 
-  ACE_NTOHL (0x696f6e50), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f53),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x74656e74),
+  ACE_NTOHL (0x696f6e50),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3
     23,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e7452), 
-  ACE_NTOHL (0x6574656e), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x616e7452),
+  ACE_NTOHL (0x6574656e),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = ServantRetentionPolicy
   };
 
@@ -3674,50 +2596,50 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f52), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73745072), 
-  ACE_NTOHL (0x6f636573), 
-  ACE_NTOHL (0x73696e67), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
-  ACE_NTOHL (0x6c75653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f52),
+  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x73745072),
+  ACE_NTOHL (0x6f636573),
+  ACE_NTOHL (0x73696e67),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x6c75653a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:2.3
   29,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737450), 
-  ACE_NTOHL (0x726f6365), 
-  ACE_NTOHL (0x7373696e), 
-  ACE_NTOHL (0x67506f6c), 
-  ACE_NTOHL (0x69637956), 
-  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737450),
+  ACE_NTOHL (0x726f6365),
+  ACE_NTOHL (0x7373696e),
+  ACE_NTOHL (0x67506f6c),
+  ACE_NTOHL (0x69637956),
+  ACE_NTOHL (0x616c7565),
   ACE_NTOHL (0x0),  // name = RequestProcessingPolicyValue
   3, // member count
   27,
-  ACE_NTOHL (0x5553455f), 
-  ACE_NTOHL (0x41435449), 
-  ACE_NTOHL (0x56455f4f), 
-  ACE_NTOHL (0x424a4543), 
-  ACE_NTOHL (0x545f4d41), 
-  ACE_NTOHL (0x505f4f4e), 
+  ACE_NTOHL (0x5553455f),
+  ACE_NTOHL (0x41435449),
+  ACE_NTOHL (0x56455f4f),
+  ACE_NTOHL (0x424a4543),
+  ACE_NTOHL (0x545f4d41),
+  ACE_NTOHL (0x505f4f4e),
   ACE_NTOHL (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
   20,
-  ACE_NTOHL (0x5553455f), 
-  ACE_NTOHL (0x44454641), 
-  ACE_NTOHL (0x554c545f), 
-  ACE_NTOHL (0x53455256), 
+  ACE_NTOHL (0x5553455f),
+  ACE_NTOHL (0x44454641),
+  ACE_NTOHL (0x554c545f),
+  ACE_NTOHL (0x53455256),
   ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
   20,
-  ACE_NTOHL (0x5553455f), 
-  ACE_NTOHL (0x53455256), 
-  ACE_NTOHL (0x414e545f), 
-  ACE_NTOHL (0x4d414e41), 
+  ACE_NTOHL (0x5553455f),
+  ACE_NTOHL (0x53455256),
+  ACE_NTOHL (0x414e545f),
+  ACE_NTOHL (0x4d414e41),
   ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
   };
 
@@ -3744,7 +2666,7 @@ TAO_NAMESPACE_END
 int PortableServer::RequestProcessingPolicy::_tao_class_id = 0;
 
 PortableServer::RequestProcessingPolicy_ptr
-tao_PortableServer_RequestProcessingPolicy_duplicate (
+PortableServer::tao_RequestProcessingPolicy_life::tao_duplicate (
     PortableServer::RequestProcessingPolicy_ptr p
   )
 {
@@ -3752,7 +2674,7 @@ tao_PortableServer_RequestProcessingPolicy_duplicate (
 }
 
 void
-tao_PortableServer_RequestProcessingPolicy_release (
+PortableServer::tao_RequestProcessingPolicy_life::tao_release (
     PortableServer::RequestProcessingPolicy_ptr p
   )
 {
@@ -3760,15 +2682,24 @@ tao_PortableServer_RequestProcessingPolicy_release (
 }
 
 PortableServer::RequestProcessingPolicy_ptr
-tao_PortableServer_RequestProcessingPolicy_nil (
+PortableServer::tao_RequestProcessingPolicy_life::tao_nil (
     void
   )
 {
   return PortableServer::RequestProcessingPolicy::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_RequestProcessingPolicy_life::tao_marshal (
+    PortableServer::RequestProcessingPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::RequestProcessingPolicy_ptr
-tao_PortableServer_RequestProcessingPolicy_narrow (
+PortableServer::tao_RequestProcessingPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3777,7 +2708,7 @@ tao_PortableServer_RequestProcessingPolicy_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_RequestProcessingPolicy_upcast (
+PortableServer::tao_RequestProcessingPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -3786,205 +2717,32 @@ tao_PortableServer_RequestProcessingPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_RequestProcessingPolicy_marshal (
-    PortableServer::RequestProcessingPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::RequestProcessingPolicy_var
-// *************************************************************
-
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void)
-  : ptr_ (RequestProcessingPolicy::_nil ())
-{}
-
-::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const ::PortableServer::RequestProcessingPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (RequestProcessingPolicy::_duplicate (p.ptr ()))
-{}
-
-PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::RequestProcessingPolicy_var &
-PortableServer::RequestProcessingPolicy_var::operator= (RequestProcessingPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::RequestProcessingPolicy_var &
-PortableServer::RequestProcessingPolicy_var::operator= (const ::PortableServer::RequestProcessingPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::RequestProcessingPolicy_var::operator const ::PortableServer::RequestProcessingPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::RequestProcessingPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
-  return val;
-}
-
-::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::tao_duplicate (RequestProcessingPolicy_ptr p)
-{
-  return ::PortableServer::RequestProcessingPolicy::_duplicate (p);
-}
-
-void
-PortableServer::RequestProcessingPolicy_var::tao_release (RequestProcessingPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::tao_nil (void)
-{
-  return ::PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::RequestProcessingPolicy_var::tao_upcast (void *src)
-{
-  RequestProcessingPolicy **tmp =
-    ACE_static_cast (RequestProcessingPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::RequestProcessingPolicy,
+        PortableServer::tao_RequestProcessingPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::RequestProcessingPolicy,
+        PortableServer::tao_RequestProcessingPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::RequestProcessingPolicy, \
+        PortableServer::tao_RequestProcessingPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::RequestProcessingPolicy, \
+        PortableServer::tao_RequestProcessingPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::RequestProcessingPolicy_out
-// *************************************************************
-
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (const ::PortableServer::RequestProcessingPolicy_out &p)
-  : ptr_ (ACE_const_cast (RequestProcessingPolicy_out &, p).ptr_)
-{}
-
-::PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (const ::PortableServer::RequestProcessingPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestProcessingPolicy_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (const ::PortableServer::RequestProcessingPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (RequestProcessingPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::RequestProcessingPolicy_out::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 {}
@@ -3992,7 +2750,7 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {}
 
-void 
+void
 PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestProcessingPolicy *tmp = ACE_static_cast (RequestProcessingPolicy *, _tao_void_pointer);
@@ -4008,7 +2766,7 @@ PortableServer::RequestProcessingPolicy::_narrow (
   return RequestProcessingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::RequestProcessingPolicy_ptr 
+PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4018,7 +2776,7 @@ PortableServer::RequestProcessingPolicy::_unchecked_narrow (
     {
       return RequestProcessingPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RequestProcessingPolicy_ptr,
@@ -4038,14 +2796,14 @@ PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, RequestProcessingPolicy)::_tao_class_id)
@@ -4078,12 +2836,12 @@ void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4092,6 +2850,12 @@ const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (v
   return "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3";
 }
 
+CORBA::Boolean
+PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4099,26 +2863,26 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f52), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73745072), 
-  ACE_NTOHL (0x6f636573), 
-  ACE_NTOHL (0x73696e67), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f52),
+  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x73745072),
+  ACE_NTOHL (0x6f636573),
+  ACE_NTOHL (0x73696e67),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3
     24,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737450), 
-  ACE_NTOHL (0x726f6365), 
-  ACE_NTOHL (0x7373696e), 
-  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737450),
+  ACE_NTOHL (0x726f6365),
+  ACE_NTOHL (0x7373696e),
+  ACE_NTOHL (0x67506f6c),
   ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy
   };
 
@@ -4147,7 +2911,7 @@ TAO_NAMESPACE_END
 int PortableServer::POAManager::_tao_class_id = 0;
 
 PortableServer::POAManager_ptr
-tao_PortableServer_POAManager_duplicate (
+PortableServer::tao_POAManager_life::tao_duplicate (
     PortableServer::POAManager_ptr p
   )
 {
@@ -4155,7 +2919,7 @@ tao_PortableServer_POAManager_duplicate (
 }
 
 void
-tao_PortableServer_POAManager_release (
+PortableServer::tao_POAManager_life::tao_release (
     PortableServer::POAManager_ptr p
   )
 {
@@ -4163,15 +2927,24 @@ tao_PortableServer_POAManager_release (
 }
 
 PortableServer::POAManager_ptr
-tao_PortableServer_POAManager_nil (
+PortableServer::tao_POAManager_life::tao_nil (
     void
   )
 {
   return PortableServer::POAManager::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_POAManager_life::tao_marshal (
+    PortableServer::POAManager_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::POAManager_ptr
-tao_PortableServer_POAManager_narrow (
+PortableServer::tao_POAManager_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -4180,7 +2953,7 @@ tao_PortableServer_POAManager_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_POAManager_upcast (
+PortableServer::tao_POAManager_cast::tao_upcast (
     void *src
   )
 {
@@ -4189,205 +2962,32 @@ tao_PortableServer_POAManager_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_POAManager_marshal (
-    PortableServer::POAManager_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::POAManager_var
-// *************************************************************
-
-PortableServer::POAManager_var::POAManager_var (void)
-  : ptr_ (POAManager::_nil ())
-{}
-
-::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::POAManager_var::POAManager_var (const ::PortableServer::POAManager_var &p)
-  : TAO_Base_var (),
-    ptr_ (POAManager::_duplicate (p.ptr ()))
-{}
-
-PortableServer::POAManager_var::~POAManager_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::POAManager_var &
-PortableServer::POAManager_var::operator= (POAManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::POAManager_var &
-PortableServer::POAManager_var::operator= (const ::PortableServer::POAManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::POAManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::POAManager_var::operator const ::PortableServer::POAManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::POAManager_ptr &
-PortableServer::POAManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::POAManager_ptr &
-PortableServer::POAManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::POAManager::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::POAManager_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::POAManager::_nil ();
-  return val;
-}
-
-::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::tao_duplicate (POAManager_ptr p)
-{
-  return ::PortableServer::POAManager::_duplicate (p);
-}
-
-void
-PortableServer::POAManager_var::tao_release (POAManager_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::tao_nil (void)
-{
-  return ::PortableServer::POAManager::_nil ();
-}
-
-::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::POAManager_var::tao_upcast (void *src)
-{
-  POAManager **tmp =
-    ACE_static_cast (POAManager **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::POAManager,
+        PortableServer::tao_POAManager_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::POAManager,
+        PortableServer::tao_POAManager_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::POAManager, \
+        PortableServer::tao_POAManager_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::POAManager, \
+        PortableServer::tao_POAManager_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::POAManager_out
-// *************************************************************
-
-PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::POAManager::_nil ();
-}
-
-PortableServer::POAManager_out::POAManager_out (POAManager_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::POAManager::_nil ();
-}
-
-PortableServer::POAManager_out::POAManager_out (const ::PortableServer::POAManager_out &p)
-  : ptr_ (ACE_const_cast (POAManager_out &, p).ptr_)
-{}
-
-::PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (const ::PortableServer::POAManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (POAManager_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (const ::PortableServer::POAManager_var &p)
-{
-  this->ptr_ = ::PortableServer::POAManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (POAManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::POAManager_out::operator ::PortableServer::POAManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::POAManager_ptr &
-PortableServer::POAManager_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::POAManager_ptr
-PortableServer::POAManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::POAManager::POAManager (void)
 {}
@@ -4395,7 +2995,7 @@ PortableServer::POAManager::POAManager (void)
 PortableServer::POAManager::~POAManager (void)
 {}
 
-void 
+void
 PortableServer::POAManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   POAManager *tmp = ACE_static_cast (POAManager *, _tao_void_pointer);
@@ -4411,7 +3011,7 @@ PortableServer::POAManager::_narrow (
   return POAManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::POAManager_ptr 
+PortableServer::POAManager_ptr
 PortableServer::POAManager::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4421,7 +3021,7 @@ PortableServer::POAManager::_unchecked_narrow (
     {
       return POAManager::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           POAManager_ptr,
@@ -4441,14 +3041,14 @@ PortableServer::POAManager::_duplicate (POAManager_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::POAManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, POAManager)::_tao_class_id)
@@ -4467,12 +3067,12 @@ void *PortableServer::POAManager::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4481,7 +3081,13 @@ const char* PortableServer::POAManager::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/POAManager:2.3";
 }
 
-// TAO_IDL - Generated from 
+CORBA::Boolean
+PortableServer::POAManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
@@ -4583,25 +3189,25 @@ static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   58,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f414d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x722f4164), 
-  ACE_NTOHL (0x61707465), 
-  ACE_NTOHL (0x72496e61), 
-  ACE_NTOHL (0x63746976), 
-  ACE_NTOHL (0x653a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f414d61),
+  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x722f4164),
+  ACE_NTOHL (0x61707465),
+  ACE_NTOHL (0x72496e61),
+  ACE_NTOHL (0x63746976),
+  ACE_NTOHL (0x653a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3
     16,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657249), 
-  ACE_NTOHL (0x6e616374), 
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x74657249),
+  ACE_NTOHL (0x6e616374),
   ACE_NTOHL (0x69766500),  // name = AdapterInactive
   0, // member count
   };
@@ -4624,20 +3230,20 @@ static const CORBA::Long _oc_PortableServer_POAManager[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f414d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x723a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f414d61),
+  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x723a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:2.3
     11,
-  ACE_NTOHL (0x504f414d), 
-  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x504f414d),
+  ACE_NTOHL (0x616e6167),
   ACE_NTOHL (0x65720000),  // name = POAManager
   };
 
@@ -4666,7 +3272,7 @@ TAO_NAMESPACE_END
 int PortableServer::AdapterActivator::_tao_class_id = 0;
 
 PortableServer::AdapterActivator_ptr
-tao_PortableServer_AdapterActivator_duplicate (
+PortableServer::tao_AdapterActivator_life::tao_duplicate (
     PortableServer::AdapterActivator_ptr p
   )
 {
@@ -4674,7 +3280,7 @@ tao_PortableServer_AdapterActivator_duplicate (
 }
 
 void
-tao_PortableServer_AdapterActivator_release (
+PortableServer::tao_AdapterActivator_life::tao_release (
     PortableServer::AdapterActivator_ptr p
   )
 {
@@ -4682,15 +3288,24 @@ tao_PortableServer_AdapterActivator_release (
 }
 
 PortableServer::AdapterActivator_ptr
-tao_PortableServer_AdapterActivator_nil (
+PortableServer::tao_AdapterActivator_life::tao_nil (
     void
   )
 {
   return PortableServer::AdapterActivator::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_AdapterActivator_life::tao_marshal (
+    PortableServer::AdapterActivator_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::AdapterActivator_ptr
-tao_PortableServer_AdapterActivator_narrow (
+PortableServer::tao_AdapterActivator_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -4699,7 +3314,7 @@ tao_PortableServer_AdapterActivator_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_AdapterActivator_upcast (
+PortableServer::tao_AdapterActivator_cast::tao_upcast (
     void *src
   )
 {
@@ -4708,205 +3323,32 @@ tao_PortableServer_AdapterActivator_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_AdapterActivator_marshal (
-    PortableServer::AdapterActivator_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::AdapterActivator_var
-// *************************************************************
-
-PortableServer::AdapterActivator_var::AdapterActivator_var (void)
-  : ptr_ (AdapterActivator::_nil ())
-{}
-
-::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::AdapterActivator_var::AdapterActivator_var (const ::PortableServer::AdapterActivator_var &p)
-  : TAO_Base_var (),
-    ptr_ (AdapterActivator::_duplicate (p.ptr ()))
-{}
-
-PortableServer::AdapterActivator_var::~AdapterActivator_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::AdapterActivator_var &
-PortableServer::AdapterActivator_var::operator= (AdapterActivator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::AdapterActivator_var &
-PortableServer::AdapterActivator_var::operator= (const ::PortableServer::AdapterActivator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::AdapterActivator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::AdapterActivator_var::operator const ::PortableServer::AdapterActivator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::AdapterActivator_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
-  return val;
-}
-
-::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::tao_duplicate (AdapterActivator_ptr p)
-{
-  return ::PortableServer::AdapterActivator::_duplicate (p);
-}
-
-void
-PortableServer::AdapterActivator_var::tao_release (AdapterActivator_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::tao_nil (void)
-{
-  return ::PortableServer::AdapterActivator::_nil ();
-}
-
-::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::AdapterActivator_var::tao_upcast (void *src)
-{
-  AdapterActivator **tmp =
-    ACE_static_cast (AdapterActivator **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::AdapterActivator,
+        PortableServer::tao_AdapterActivator_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::AdapterActivator,
+        PortableServer::tao_AdapterActivator_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::AdapterActivator, \
+        PortableServer::tao_AdapterActivator_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::AdapterActivator, \
+        PortableServer::tao_AdapterActivator_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::AdapterActivator_out
-// *************************************************************
-
-PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
-}
-
-PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
-}
-
-PortableServer::AdapterActivator_out::AdapterActivator_out (const ::PortableServer::AdapterActivator_out &p)
-  : ptr_ (ACE_const_cast (AdapterActivator_out &, p).ptr_)
-{}
-
-::PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (const ::PortableServer::AdapterActivator_out &p)
-{
-  this->ptr_ = ACE_const_cast (AdapterActivator_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (const ::PortableServer::AdapterActivator_var &p)
-{
-  this->ptr_ = ::PortableServer::AdapterActivator::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (AdapterActivator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::AdapterActivator_out::operator ::PortableServer::AdapterActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::AdapterActivator::AdapterActivator (void)
 {}
@@ -4914,7 +3356,7 @@ PortableServer::AdapterActivator::AdapterActivator (void)
 PortableServer::AdapterActivator::~AdapterActivator (void)
 {}
 
-void 
+void
 PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
 {
   AdapterActivator *tmp = ACE_static_cast (AdapterActivator *, _tao_void_pointer);
@@ -4930,7 +3372,7 @@ PortableServer::AdapterActivator::_narrow (
   return AdapterActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::AdapterActivator_ptr 
+PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4940,7 +3382,7 @@ PortableServer::AdapterActivator::_unchecked_narrow (
     {
       return AdapterActivator::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           AdapterActivator_ptr,
@@ -4960,14 +3402,14 @@ PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::AdapterActivator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, AdapterActivator)::_tao_class_id)
@@ -4986,12 +3428,12 @@ void *PortableServer::AdapterActivator::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -5000,6 +3442,12 @@ const char* PortableServer::AdapterActivator::_interface_repository_id (void) co
   return "IDL:omg.org/PortableServer/AdapterActivator:2.3";
 }
 
+CORBA::Boolean
+PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -5007,23 +3455,23 @@ static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f41), 
-  ACE_NTOHL (0x64617074), 
-  ACE_NTOHL (0x65724163), 
-  ACE_NTOHL (0x74697661), 
-  ACE_NTOHL (0x746f723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f41),
+  ACE_NTOHL (0x64617074),
+  ACE_NTOHL (0x65724163),
+  ACE_NTOHL (0x74697661),
+  ACE_NTOHL (0x746f723a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/AdapterActivator:2.3
     17,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657241), 
-  ACE_NTOHL (0x63746976), 
-  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x74657241),
+  ACE_NTOHL (0x63746976),
+  ACE_NTOHL (0x61746f72),
   ACE_NTOHL (0x0),  // name = AdapterActivator
   };
 
@@ -5050,7 +3498,7 @@ TAO_NAMESPACE_END
 int PortableServer::ServantManager::_tao_class_id = 0;
 
 PortableServer::ServantManager_ptr
-tao_PortableServer_ServantManager_duplicate (
+PortableServer::tao_ServantManager_life::tao_duplicate (
     PortableServer::ServantManager_ptr p
   )
 {
@@ -5058,7 +3506,7 @@ tao_PortableServer_ServantManager_duplicate (
 }
 
 void
-tao_PortableServer_ServantManager_release (
+PortableServer::tao_ServantManager_life::tao_release (
     PortableServer::ServantManager_ptr p
   )
 {
@@ -5066,15 +3514,24 @@ tao_PortableServer_ServantManager_release (
 }
 
 PortableServer::ServantManager_ptr
-tao_PortableServer_ServantManager_nil (
+PortableServer::tao_ServantManager_life::tao_nil (
     void
   )
 {
   return PortableServer::ServantManager::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_ServantManager_life::tao_marshal (
+    PortableServer::ServantManager_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::ServantManager_ptr
-tao_PortableServer_ServantManager_narrow (
+PortableServer::tao_ServantManager_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -5083,7 +3540,7 @@ tao_PortableServer_ServantManager_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_ServantManager_upcast (
+PortableServer::tao_ServantManager_cast::tao_upcast (
     void *src
   )
 {
@@ -5092,205 +3549,32 @@ tao_PortableServer_ServantManager_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_ServantManager_marshal (
-    PortableServer::ServantManager_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::ServantManager_var
-// *************************************************************
-
-PortableServer::ServantManager_var::ServantManager_var (void)
-  : ptr_ (ServantManager::_nil ())
-{}
-
-::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::ServantManager_var::ServantManager_var (const ::PortableServer::ServantManager_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServantManager::_duplicate (p.ptr ()))
-{}
-
-PortableServer::ServantManager_var::~ServantManager_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::ServantManager_var &
-PortableServer::ServantManager_var::operator= (ServantManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ServantManager_var &
-PortableServer::ServantManager_var::operator= (const ::PortableServer::ServantManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ServantManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::ServantManager_var::operator const ::PortableServer::ServantManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantManager::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ServantManager_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ServantManager::_nil ();
-  return val;
-}
-
-::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::tao_duplicate (ServantManager_ptr p)
-{
-  return ::PortableServer::ServantManager::_duplicate (p);
-}
-
-void
-PortableServer::ServantManager_var::tao_release (ServantManager_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::tao_nil (void)
-{
-  return ::PortableServer::ServantManager::_nil ();
-}
-
-::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::ServantManager_var::tao_upcast (void *src)
-{
-  ServantManager **tmp =
-    ACE_static_cast (ServantManager **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantManager,
+        PortableServer::tao_ServantManager_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantManager,
+        PortableServer::tao_ServantManager_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantManager, \
+        PortableServer::tao_ServantManager_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantManager, \
+        PortableServer::tao_ServantManager_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::ServantManager_out
-// *************************************************************
-
-PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ServantManager::_nil ();
-}
-
-PortableServer::ServantManager_out::ServantManager_out (ServantManager_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantManager::_nil ();
-}
-
-PortableServer::ServantManager_out::ServantManager_out (const ::PortableServer::ServantManager_out &p)
-  : ptr_ (ACE_const_cast (ServantManager_out &, p).ptr_)
-{}
-
-::PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (const ::PortableServer::ServantManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServantManager_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (const ::PortableServer::ServantManager_var &p)
-{
-  this->ptr_ = ::PortableServer::ServantManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (ServantManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ServantManager_out::operator ::PortableServer::ServantManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::ServantManager::ServantManager (void)
 {}
@@ -5298,7 +3582,7 @@ PortableServer::ServantManager::ServantManager (void)
 PortableServer::ServantManager::~ServantManager (void)
 {}
 
-void 
+void
 PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServantManager *tmp = ACE_static_cast (ServantManager *, _tao_void_pointer);
@@ -5314,7 +3598,7 @@ PortableServer::ServantManager::_narrow (
   return ServantManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ServantManager_ptr 
+PortableServer::ServantManager_ptr
 PortableServer::ServantManager::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5324,7 +3608,7 @@ PortableServer::ServantManager::_unchecked_narrow (
     {
       return ServantManager::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ServantManager_ptr,
@@ -5344,14 +3628,14 @@ PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::ServantManager::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
@@ -5370,12 +3654,12 @@ void *PortableServer::ServantManager::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -5384,6 +3668,12 @@ const char* PortableServer::ServantManager::_interface_repository_id (void) cons
   return "IDL:omg.org/PortableServer/ServantManager:2.3";
 }
 
+CORBA::Boolean
+PortableServer::ServantManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -5391,22 +3681,22 @@ static const CORBA::Long _oc_PortableServer_ServantManager[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e744d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x723a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f53),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6e744d61),
+  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x723a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantManager:2.3
     15,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e744d), 
-  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x616e744d),
+  ACE_NTOHL (0x616e6167),
   ACE_NTOHL (0x65720000),  // name = ServantManager
   };
 
@@ -5433,7 +3723,7 @@ TAO_NAMESPACE_END
 int PortableServer::ServantActivator::_tao_class_id = 0;
 
 PortableServer::ServantActivator_ptr
-tao_PortableServer_ServantActivator_duplicate (
+PortableServer::tao_ServantActivator_life::tao_duplicate (
     PortableServer::ServantActivator_ptr p
   )
 {
@@ -5441,7 +3731,7 @@ tao_PortableServer_ServantActivator_duplicate (
 }
 
 void
-tao_PortableServer_ServantActivator_release (
+PortableServer::tao_ServantActivator_life::tao_release (
     PortableServer::ServantActivator_ptr p
   )
 {
@@ -5449,15 +3739,24 @@ tao_PortableServer_ServantActivator_release (
 }
 
 PortableServer::ServantActivator_ptr
-tao_PortableServer_ServantActivator_nil (
+PortableServer::tao_ServantActivator_life::tao_nil (
     void
   )
 {
   return PortableServer::ServantActivator::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_ServantActivator_life::tao_marshal (
+    PortableServer::ServantActivator_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::ServantActivator_ptr
-tao_PortableServer_ServantActivator_narrow (
+PortableServer::tao_ServantActivator_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -5466,7 +3765,7 @@ tao_PortableServer_ServantActivator_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_ServantActivator_upcast (
+PortableServer::tao_ServantActivator_cast::tao_upcast (
     void *src
   )
 {
@@ -5475,205 +3774,32 @@ tao_PortableServer_ServantActivator_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_ServantActivator_marshal (
-    PortableServer::ServantActivator_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::ServantActivator_var
-// *************************************************************
-
-PortableServer::ServantActivator_var::ServantActivator_var (void)
-  : ptr_ (ServantActivator::_nil ())
-{}
-
-::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::ServantActivator_var::ServantActivator_var (const ::PortableServer::ServantActivator_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServantActivator::_duplicate (p.ptr ()))
-{}
-
-PortableServer::ServantActivator_var::~ServantActivator_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::ServantActivator_var &
-PortableServer::ServantActivator_var::operator= (ServantActivator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ServantActivator_var &
-PortableServer::ServantActivator_var::operator= (const ::PortableServer::ServantActivator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ServantActivator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::ServantActivator_var::operator const ::PortableServer::ServantActivator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ServantActivator_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
-  return val;
-}
-
-::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::tao_duplicate (ServantActivator_ptr p)
-{
-  return ::PortableServer::ServantActivator::_duplicate (p);
-}
-
-void
-PortableServer::ServantActivator_var::tao_release (ServantActivator_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::tao_nil (void)
-{
-  return ::PortableServer::ServantActivator::_nil ();
-}
-
-::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::ServantActivator_var::tao_upcast (void *src)
-{
-  ServantActivator **tmp =
-    ACE_static_cast (ServantActivator **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantActivator,
+        PortableServer::tao_ServantActivator_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantActivator,
+        PortableServer::tao_ServantActivator_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantActivator, \
+        PortableServer::tao_ServantActivator_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantActivator, \
+        PortableServer::tao_ServantActivator_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::ServantActivator_out
-// *************************************************************
-
-PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
-}
-
-PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
-}
-
-PortableServer::ServantActivator_out::ServantActivator_out (const ::PortableServer::ServantActivator_out &p)
-  : ptr_ (ACE_const_cast (ServantActivator_out &, p).ptr_)
-{}
-
-::PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (const ::PortableServer::ServantActivator_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServantActivator_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (const ::PortableServer::ServantActivator_var &p)
-{
-  this->ptr_ = ::PortableServer::ServantActivator::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (ServantActivator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ServantActivator_out::operator ::PortableServer::ServantActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::ServantActivator::ServantActivator (void)
 {}
@@ -5681,7 +3807,7 @@ PortableServer::ServantActivator::ServantActivator (void)
 PortableServer::ServantActivator::~ServantActivator (void)
 {}
 
-void 
+void
 PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServantActivator *tmp = ACE_static_cast (ServantActivator *, _tao_void_pointer);
@@ -5697,7 +3823,7 @@ PortableServer::ServantActivator::_narrow (
   return ServantActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ServantActivator_ptr 
+PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5707,7 +3833,7 @@ PortableServer::ServantActivator::_unchecked_narrow (
     {
       return ServantActivator::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ServantActivator_ptr,
@@ -5727,14 +3853,14 @@ PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, ServantActivator)::_tao_class_id)
@@ -5767,12 +3893,12 @@ void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -5781,6 +3907,12 @@ const char* PortableServer::ServantActivator::_interface_repository_id (void) co
   return "IDL:omg.org/PortableServer/ServantActivator:2.3";
 }
 
+CORBA::Boolean
+PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -5788,23 +3920,23 @@ static const CORBA::Long _oc_PortableServer_ServantActivator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e744163), 
-  ACE_NTOHL (0x74697661), 
-  ACE_NTOHL (0x746f723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f53),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6e744163),
+  ACE_NTOHL (0x74697661),
+  ACE_NTOHL (0x746f723a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ServantActivator:2.3
     17,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e7441), 
-  ACE_NTOHL (0x63746976), 
-  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x616e7441),
+  ACE_NTOHL (0x63746976),
+  ACE_NTOHL (0x61746f72),
   ACE_NTOHL (0x0),  // name = ServantActivator
   };
 
@@ -5831,7 +3963,7 @@ TAO_NAMESPACE_END
 int PortableServer::ServantLocator::_tao_class_id = 0;
 
 PortableServer::ServantLocator_ptr
-tao_PortableServer_ServantLocator_duplicate (
+PortableServer::tao_ServantLocator_life::tao_duplicate (
     PortableServer::ServantLocator_ptr p
   )
 {
@@ -5839,7 +3971,7 @@ tao_PortableServer_ServantLocator_duplicate (
 }
 
 void
-tao_PortableServer_ServantLocator_release (
+PortableServer::tao_ServantLocator_life::tao_release (
     PortableServer::ServantLocator_ptr p
   )
 {
@@ -5847,15 +3979,24 @@ tao_PortableServer_ServantLocator_release (
 }
 
 PortableServer::ServantLocator_ptr
-tao_PortableServer_ServantLocator_nil (
+PortableServer::tao_ServantLocator_life::tao_nil (
     void
   )
 {
   return PortableServer::ServantLocator::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_ServantLocator_life::tao_marshal (
+    PortableServer::ServantLocator_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::ServantLocator_ptr
-tao_PortableServer_ServantLocator_narrow (
+PortableServer::tao_ServantLocator_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -5864,7 +4005,7 @@ tao_PortableServer_ServantLocator_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_ServantLocator_upcast (
+PortableServer::tao_ServantLocator_cast::tao_upcast (
     void *src
   )
 {
@@ -5873,205 +4014,32 @@ tao_PortableServer_ServantLocator_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_ServantLocator_marshal (
-    PortableServer::ServantLocator_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::ServantLocator_var
-// *************************************************************
-
-PortableServer::ServantLocator_var::ServantLocator_var (void)
-  : ptr_ (ServantLocator::_nil ())
-{}
-
-::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::ServantLocator_var::ServantLocator_var (const ::PortableServer::ServantLocator_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServantLocator::_duplicate (p.ptr ()))
-{}
-
-PortableServer::ServantLocator_var::~ServantLocator_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::ServantLocator_var &
-PortableServer::ServantLocator_var::operator= (ServantLocator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ServantLocator_var &
-PortableServer::ServantLocator_var::operator= (const ::PortableServer::ServantLocator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ServantLocator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::ServantLocator_var::operator const ::PortableServer::ServantLocator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ServantLocator_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
-  return val;
-}
-
-::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::tao_duplicate (ServantLocator_ptr p)
-{
-  return ::PortableServer::ServantLocator::_duplicate (p);
-}
-
-void
-PortableServer::ServantLocator_var::tao_release (ServantLocator_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::tao_nil (void)
-{
-  return ::PortableServer::ServantLocator::_nil ();
-}
-
-::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::ServantLocator_var::tao_upcast (void *src)
-{
-  ServantLocator **tmp =
-    ACE_static_cast (ServantLocator **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantLocator,
+        PortableServer::tao_ServantLocator_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantLocator,
+        PortableServer::tao_ServantLocator_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantLocator, \
+        PortableServer::tao_ServantLocator_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantLocator, \
+        PortableServer::tao_ServantLocator_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::ServantLocator_out
-// *************************************************************
-
-PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
-}
-
-PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
-}
-
-PortableServer::ServantLocator_out::ServantLocator_out (const ::PortableServer::ServantLocator_out &p)
-  : ptr_ (ACE_const_cast (ServantLocator_out &, p).ptr_)
-{}
-
-::PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (const ::PortableServer::ServantLocator_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServantLocator_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (const ::PortableServer::ServantLocator_var &p)
-{
-  this->ptr_ = ::PortableServer::ServantLocator::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (ServantLocator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::ServantLocator_out::operator ::PortableServer::ServantLocator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::ServantLocator::ServantLocator (void)
 {}
@@ -6079,7 +4047,7 @@ PortableServer::ServantLocator::ServantLocator (void)
 PortableServer::ServantLocator::~ServantLocator (void)
 {}
 
-void 
+void
 PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServantLocator *tmp = ACE_static_cast (ServantLocator *, _tao_void_pointer);
@@ -6095,7 +4063,7 @@ PortableServer::ServantLocator::_narrow (
   return ServantLocator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::ServantLocator_ptr 
+PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6105,7 +4073,7 @@ PortableServer::ServantLocator::_unchecked_narrow (
     {
       return ServantLocator::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ServantLocator_ptr,
@@ -6125,14 +4093,14 @@ PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, ServantLocator)::_tao_class_id)
@@ -6165,12 +4133,12 @@ void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -6179,6 +4147,12 @@ const char* PortableServer::ServantLocator::_interface_repository_id (void) cons
   return "IDL:omg.org/PortableServer/ServantLocator:2.3";
 }
 
+CORBA::Boolean
+PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -6186,22 +4160,22 @@ static const CORBA::Long _oc_PortableServer_ServantLocator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e744c6f), 
-  ACE_NTOHL (0x6361746f), 
-  ACE_NTOHL (0x723a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f53),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6e744c6f),
+  ACE_NTOHL (0x6361746f),
+  ACE_NTOHL (0x723a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantLocator:2.3
     15,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e744c), 
-  ACE_NTOHL (0x6f636174), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x616e744c),
+  ACE_NTOHL (0x6f636174),
   ACE_NTOHL (0x6f720000),  // name = ServantLocator
   };
 
@@ -6230,7 +4204,7 @@ TAO_NAMESPACE_END
 int PortableServer::POA::_tao_class_id = 0;
 
 PortableServer::POA_ptr
-tao_PortableServer_POA_duplicate (
+PortableServer::tao_POA_life::tao_duplicate (
     PortableServer::POA_ptr p
   )
 {
@@ -6238,7 +4212,7 @@ tao_PortableServer_POA_duplicate (
 }
 
 void
-tao_PortableServer_POA_release (
+PortableServer::tao_POA_life::tao_release (
     PortableServer::POA_ptr p
   )
 {
@@ -6246,15 +4220,24 @@ tao_PortableServer_POA_release (
 }
 
 PortableServer::POA_ptr
-tao_PortableServer_POA_nil (
+PortableServer::tao_POA_life::tao_nil (
     void
   )
 {
   return PortableServer::POA::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_POA_life::tao_marshal (
+    PortableServer::POA_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::POA_ptr
-tao_PortableServer_POA_narrow (
+PortableServer::tao_POA_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -6263,7 +4246,7 @@ tao_PortableServer_POA_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_POA_upcast (
+PortableServer::tao_POA_cast::tao_upcast (
     void *src
   )
 {
@@ -6272,205 +4255,32 @@ tao_PortableServer_POA_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_POA_marshal (
-    PortableServer::POA_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::POA_var
-// *************************************************************
-
-PortableServer::POA_var::POA_var (void)
-  : ptr_ (POA::_nil ())
-{}
-
-::PortableServer::POA_ptr
-PortableServer::POA_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::POA_var::POA_var (const ::PortableServer::POA_var &p)
-  : TAO_Base_var (),
-    ptr_ (POA::_duplicate (p.ptr ()))
-{}
-
-PortableServer::POA_var::~POA_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::POA_var &
-PortableServer::POA_var::operator= (POA_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::POA_var &
-PortableServer::POA_var::operator= (const ::PortableServer::POA_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::POA::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::POA_var::operator const ::PortableServer::POA_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::POA_ptr
-PortableServer::POA_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::POA_ptr
-PortableServer::POA_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::POA_ptr &
-PortableServer::POA_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::POA_ptr &
-PortableServer::POA_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::POA::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::POA_ptr
-PortableServer::POA_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::POA_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::POA::_nil ();
-  return val;
-}
-
-::PortableServer::POA_ptr
-PortableServer::POA_var::tao_duplicate (POA_ptr p)
-{
-  return ::PortableServer::POA::_duplicate (p);
-}
-
-void
-PortableServer::POA_var::tao_release (POA_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::POA_ptr
-PortableServer::POA_var::tao_nil (void)
-{
-  return ::PortableServer::POA::_nil ();
-}
-
-::PortableServer::POA_ptr
-PortableServer::POA_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::POA_var::tao_upcast (void *src)
-{
-  POA **tmp =
-    ACE_static_cast (POA **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::POA,
+        PortableServer::tao_POA_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::POA,
+        PortableServer::tao_POA_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::POA, \
+        PortableServer::tao_POA_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::POA, \
+        PortableServer::tao_POA_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::POA_out
-// *************************************************************
-
-PortableServer::POA_out::POA_out (POA_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::POA::_nil ();
-}
-
-PortableServer::POA_out::POA_out (POA_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::POA::_nil ();
-}
-
-PortableServer::POA_out::POA_out (const ::PortableServer::POA_out &p)
-  : ptr_ (ACE_const_cast (POA_out &, p).ptr_)
-{}
-
-::PortableServer::POA_out &
-PortableServer::POA_out::operator= (const ::PortableServer::POA_out &p)
-{
-  this->ptr_ = ACE_const_cast (POA_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::POA_out &
-PortableServer::POA_out::operator= (const ::PortableServer::POA_var &p)
-{
-  this->ptr_ = ::PortableServer::POA::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::POA_out &
-PortableServer::POA_out::operator= (POA_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::POA_out::operator ::PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::POA_ptr &
-PortableServer::POA_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::POA_ptr
-PortableServer::POA_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::POA::POA (void)
 {}
@@ -6478,7 +4288,7 @@ PortableServer::POA::POA (void)
 PortableServer::POA::~POA (void)
 {}
 
-void 
+void
 PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *tmp = ACE_static_cast (POA *, _tao_void_pointer);
@@ -6494,7 +4304,7 @@ PortableServer::POA::_narrow (
   return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::POA_ptr 
+PortableServer::POA_ptr
 PortableServer::POA::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6504,7 +4314,7 @@ PortableServer::POA::_unchecked_narrow (
     {
       return POA::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           POA_ptr,
@@ -6524,14 +4334,14 @@ PortableServer::POA::_duplicate (POA_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, POA)::_tao_class_id)
@@ -6550,12 +4360,12 @@ void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -6564,7 +4374,13 @@ const char* PortableServer::POA::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/POA:2.3";
 }
 
-// TAO_IDL - Generated from 
+CORBA::Boolean
+PortableServer::POA::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
@@ -6666,26 +4482,26 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   56,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f41), 
-  ACE_NTOHL (0x64617074), 
-  ACE_NTOHL (0x6572416c), 
-  ACE_NTOHL (0x72656164), 
-  ACE_NTOHL (0x79457869), 
-  ACE_NTOHL (0x7374733a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f41),
+  ACE_NTOHL (0x64617074),
+  ACE_NTOHL (0x6572416c),
+  ACE_NTOHL (0x72656164),
+  ACE_NTOHL (0x79457869),
+  ACE_NTOHL (0x7374733a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3
     21,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x74657241), 
-  ACE_NTOHL (0x6c726561), 
-  ACE_NTOHL (0x64794578), 
-  ACE_NTOHL (0x69737473), 
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x74657241),
+  ACE_NTOHL (0x6c726561),
+  ACE_NTOHL (0x64794578),
+  ACE_NTOHL (0x69737473),
   ACE_NTOHL (0x0),  // name = AdapterAlreadyExists
   0, // member count
   };
@@ -6701,7 +4517,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists =
   &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
@@ -6803,25 +4619,25 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f41), 
-  ACE_NTOHL (0x64617074), 
-  ACE_NTOHL (0x65724e6f), 
-  ACE_NTOHL (0x6e457869), 
-  ACE_NTOHL (0x7374656e), 
-  ACE_NTOHL (0x743a322e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f41),
+  ACE_NTOHL (0x64617074),
+  ACE_NTOHL (0x65724e6f),
+  ACE_NTOHL (0x6e457869),
+  ACE_NTOHL (0x7374656e),
+  ACE_NTOHL (0x743a322e),
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3
     19,
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465724e), 
-  ACE_NTOHL (0x6f6e4578), 
-  ACE_NTOHL (0x69737465), 
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x7465724e),
+  ACE_NTOHL (0x6f6e4578),
+  ACE_NTOHL (0x69737465),
   ACE_NTOHL (0x6e740000),  // name = AdapterNonExistent
   0, // member count
   };
@@ -6837,7 +4653,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent =
   &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
@@ -6935,8 +4751,7 @@ void PortableServer::POA::InvalidPolicy::_tao_decode (
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy (
     CORBA::UShort _tao_index
-  )  
-  : CORBA::UserException (
+  )  : CORBA::UserException (
         "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
         "InvalidPolicy"
       )
@@ -6957,27 +4772,27 @@ static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f49), 
-  ACE_NTOHL (0x6e76616c), 
-  ACE_NTOHL (0x6964506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f49),
+  ACE_NTOHL (0x6e76616c),
+  ACE_NTOHL (0x6964506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a322e33),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3
     14,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696450), 
-  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696450),
+  ACE_NTOHL (0x6f6c6963),
   ACE_NTOHL (0x79000000),  // name = InvalidPolicy
   1, // member count
     6,
-  ACE_NTOHL (0x696e6465), 
+  ACE_NTOHL (0x696e6465),
   ACE_NTOHL (0x78000000),  // name = index
     CORBA::tk_ushort,
 
@@ -6996,7 +4811,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy (
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::NoServant::NoServant (void)
@@ -7098,21 +4913,21 @@ static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f4e), 
-  ACE_NTOHL (0x6f536572), 
-  ACE_NTOHL (0x76616e74), 
-  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f4e),
+  ACE_NTOHL (0x6f536572),
+  ACE_NTOHL (0x76616e74),
+  ACE_NTOHL (0x3a322e33),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:2.3
     10,
-  ACE_NTOHL (0x4e6f5365), 
-  ACE_NTOHL (0x7276616e), 
+  ACE_NTOHL (0x4e6f5365),
+  ACE_NTOHL (0x7276616e),
   ACE_NTOHL (0x74000000),  // name = NoServant
   0, // member count
   };
@@ -7130,7 +4945,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
@@ -7232,25 +5047,25 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f4f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x74416c72), 
-  ACE_NTOHL (0x65616479), 
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76653a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f4f),
+  ACE_NTOHL (0x626a6563),
+  ACE_NTOHL (0x74416c72),
+  ACE_NTOHL (0x65616479),
+  ACE_NTOHL (0x41637469),
+  ACE_NTOHL (0x76653a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3
     20,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x6374416c), 
-  ACE_NTOHL (0x72656164), 
-  ACE_NTOHL (0x79416374), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x6374416c),
+  ACE_NTOHL (0x72656164),
+  ACE_NTOHL (0x79416374),
   ACE_NTOHL (0x69766500),  // name = ObjectAlreadyActive
   0, // member count
   };
@@ -7266,7 +5081,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive =
   &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
@@ -7368,23 +5183,23 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f4f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x744e6f74), 
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76653a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f4f),
+  ACE_NTOHL (0x626a6563),
+  ACE_NTOHL (0x744e6f74),
+  ACE_NTOHL (0x41637469),
+  ACE_NTOHL (0x76653a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3
     16,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744e6f), 
-  ACE_NTOHL (0x74416374), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744e6f),
+  ACE_NTOHL (0x74416374),
   ACE_NTOHL (0x69766500),  // name = ObjectNotActive
   0, // member count
   };
@@ -7400,7 +5215,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive =
   &_tc_TAO_tc_PortableServer_POA_ObjectNotActive;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
@@ -7502,26 +5317,26 @@ static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   56,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e74416c), 
-  ACE_NTOHL (0x72656164), 
-  ACE_NTOHL (0x79416374), 
-  ACE_NTOHL (0x6976653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f53),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6e74416c),
+  ACE_NTOHL (0x72656164),
+  ACE_NTOHL (0x79416374),
+  ACE_NTOHL (0x6976653a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3
     21,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e7441), 
-  ACE_NTOHL (0x6c726561), 
-  ACE_NTOHL (0x64794163), 
-  ACE_NTOHL (0x74697665), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x616e7441),
+  ACE_NTOHL (0x6c726561),
+  ACE_NTOHL (0x64794163),
+  ACE_NTOHL (0x74697665),
   ACE_NTOHL (0x0),  // name = ServantAlreadyActive
   0, // member count
   };
@@ -7537,7 +5352,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive =
   &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
@@ -7639,24 +5454,24 @@ static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   52,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f53), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6e744e6f), 
-  ACE_NTOHL (0x74416374), 
-  ACE_NTOHL (0x6976653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f53),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6e744e6f),
+  ACE_NTOHL (0x74416374),
+  ACE_NTOHL (0x6976653a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/ServantNotActive:2.3
     17,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x616e744e), 
-  ACE_NTOHL (0x6f744163), 
-  ACE_NTOHL (0x74697665), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x616e744e),
+  ACE_NTOHL (0x6f744163),
+  ACE_NTOHL (0x74697665),
   ACE_NTOHL (0x0),  // name = ServantNotActive
   0, // member count
   };
@@ -7672,7 +5487,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive =
   &_tc_TAO_tc_PortableServer_POA_ServantNotActive;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
@@ -7774,22 +5589,22 @@ static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f57), 
-  ACE_NTOHL (0x726f6e67), 
-  ACE_NTOHL (0x41646170), 
-  ACE_NTOHL (0x7465723a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f57),
+  ACE_NTOHL (0x726f6e67),
+  ACE_NTOHL (0x41646170),
+  ACE_NTOHL (0x7465723a),
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:2.3
     13,
-  ACE_NTOHL (0x57726f6e), 
-  ACE_NTOHL (0x67416461), 
-  ACE_NTOHL (0x70746572), 
+  ACE_NTOHL (0x57726f6e),
+  ACE_NTOHL (0x67416461),
+  ACE_NTOHL (0x70746572),
   ACE_NTOHL (0x0),  // name = WrongAdapter
   0, // member count
   };
@@ -7805,7 +5620,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter =
   &_tc_TAO_tc_PortableServer_POA_WrongAdapter;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
@@ -7907,21 +5722,21 @@ static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f412f57), 
-  ACE_NTOHL (0x726f6e67), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f412f57),
+  ACE_NTOHL (0x726f6e67),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:2.3
     12,
-  ACE_NTOHL (0x57726f6e), 
-  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x57726f6e),
+  ACE_NTOHL (0x67506f6c),
   ACE_NTOHL (0x69637900),  // name = WrongPolicy
   0, // member count
   };
@@ -7944,14 +5759,14 @@ static const CORBA::Long _oc_PortableServer_POA[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f50), 
-  ACE_NTOHL (0x4f413a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f50),
+  ACE_NTOHL (0x4f413a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
     4,
   ACE_NTOHL (0x504f4100),  // name = POA
@@ -7980,7 +5795,7 @@ TAO_NAMESPACE_END
 int PortableServer::Current::_tao_class_id = 0;
 
 PortableServer::Current_ptr
-tao_PortableServer_Current_duplicate (
+PortableServer::tao_Current_life::tao_duplicate (
     PortableServer::Current_ptr p
   )
 {
@@ -7988,7 +5803,7 @@ tao_PortableServer_Current_duplicate (
 }
 
 void
-tao_PortableServer_Current_release (
+PortableServer::tao_Current_life::tao_release (
     PortableServer::Current_ptr p
   )
 {
@@ -7996,15 +5811,24 @@ tao_PortableServer_Current_release (
 }
 
 PortableServer::Current_ptr
-tao_PortableServer_Current_nil (
+PortableServer::tao_Current_life::tao_nil (
     void
   )
 {
   return PortableServer::Current::_nil ();
 }
 
+CORBA::Boolean
+PortableServer::tao_Current_life::tao_marshal (
+    PortableServer::Current_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 PortableServer::Current_ptr
-tao_PortableServer_Current_narrow (
+PortableServer::tao_Current_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -8013,7 +5837,7 @@ tao_PortableServer_Current_narrow (
 }
 
 CORBA::Object *
-tao_PortableServer_Current_upcast (
+PortableServer::tao_Current_cast::tao_upcast (
     void *src
   )
 {
@@ -8022,205 +5846,32 @@ tao_PortableServer_Current_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_PortableServer_Current_marshal (
-    PortableServer::Current_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// PortableServer::Current_var
-// *************************************************************
-
-PortableServer::Current_var::Current_var (void)
-  : ptr_ (Current::_nil ())
-{}
-
-::PortableServer::Current_ptr
-PortableServer::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-PortableServer::Current_var::Current_var (const ::PortableServer::Current_var &p)
-  : TAO_Base_var (),
-    ptr_ (Current::_duplicate (p.ptr ()))
-{}
-
-PortableServer::Current_var::~Current_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-PortableServer::Current_var &
-PortableServer::Current_var::operator= (Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::Current_var &
-PortableServer::Current_var::operator= (const ::PortableServer::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-PortableServer::Current_var::operator const ::PortableServer::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::PortableServer::Current_ptr
-PortableServer::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::Current_ptr
-PortableServer::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::PortableServer::Current_ptr &
-PortableServer::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::Current_ptr &
-PortableServer::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::Current::_nil ();
-  return this->ptr_;
-}
-
-::PortableServer::Current_ptr
-PortableServer::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::Current_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::Current::_nil ();
-  return val;
-}
-
-::PortableServer::Current_ptr
-PortableServer::Current_var::tao_duplicate (Current_ptr p)
-{
-  return ::PortableServer::Current::_duplicate (p);
-}
-
-void
-PortableServer::Current_var::tao_release (Current_ptr p)
-{
-  CORBA::release (p);
-}
-
-::PortableServer::Current_ptr
-PortableServer::Current_var::tao_nil (void)
-{
-  return ::PortableServer::Current::_nil ();
-}
-
-::PortableServer::Current_ptr
-PortableServer::Current_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableServer::Current_var::tao_upcast (void *src)
-{
-  Current **tmp =
-    ACE_static_cast (Current **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::Current,
+        PortableServer::tao_Current_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::Current,
+        PortableServer::tao_Current_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::Current, \
+        PortableServer::tao_Current_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::Current, \
+        PortableServer::tao_Current_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// PortableServer::Current_out
-// *************************************************************
-
-PortableServer::Current_out::Current_out (Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::Current::_nil ();
-}
-
-PortableServer::Current_out::Current_out (Current_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::Current::_nil ();
-}
-
-PortableServer::Current_out::Current_out (const ::PortableServer::Current_out &p)
-  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
-{}
-
-::PortableServer::Current_out &
-PortableServer::Current_out::operator= (const ::PortableServer::Current_out &p)
-{
-  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
-  return *this;
-}
-
-PortableServer::Current_out &
-PortableServer::Current_out::operator= (const ::PortableServer::Current_var &p)
-{
-  this->ptr_ = ::PortableServer::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-PortableServer::Current_out &
-PortableServer::Current_out::operator= (Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-PortableServer::Current_out::operator ::PortableServer::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::PortableServer::Current_ptr &
-PortableServer::Current_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::PortableServer::Current_ptr
-PortableServer::Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 PortableServer::Current::Current (void)
 {}
@@ -8228,7 +5879,7 @@ PortableServer::Current::Current (void)
 PortableServer::Current::~Current (void)
 {}
 
-void 
+void
 PortableServer::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
@@ -8244,7 +5895,7 @@ PortableServer::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableServer::Current_ptr 
+PortableServer::Current_ptr
 PortableServer::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -8254,7 +5905,7 @@ PortableServer::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           Current_ptr,
@@ -8274,14 +5925,14 @@ PortableServer::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::PortableServer, Current)::_tao_class_id)
@@ -8314,12 +5965,12 @@ void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -8328,7 +5979,13 @@ const char* PortableServer::Current::_interface_repository_id (void) const
   return "IDL:omg.org/PortableServer/Current:2.3";
 }
 
-// TAO_IDL - Generated from 
+CORBA::Boolean
+PortableServer::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::Current::NoContext::NoContext (void)
@@ -8430,22 +6087,22 @@ static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f43), 
-  ACE_NTOHL (0x75727265), 
-  ACE_NTOHL (0x6e742f4e), 
-  ACE_NTOHL (0x6f436f6e), 
-  ACE_NTOHL (0x74657874), 
-  ACE_NTOHL (0x3a322e33), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f43),
+  ACE_NTOHL (0x75727265),
+  ACE_NTOHL (0x6e742f4e),
+  ACE_NTOHL (0x6f436f6e),
+  ACE_NTOHL (0x74657874),
+  ACE_NTOHL (0x3a322e33),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:2.3
     10,
-  ACE_NTOHL (0x4e6f436f), 
-  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x4e6f436f),
+  ACE_NTOHL (0x6e746578),
   ACE_NTOHL (0x74000000),  // name = NoContext
   0, // member count
   };
@@ -8468,18 +6125,18 @@ static const CORBA::Long _oc_PortableServer_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65722f43), 
-  ACE_NTOHL (0x75727265), 
-  ACE_NTOHL (0x6e743a32), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65722f43),
+  ACE_NTOHL (0x75727265),
+  ACE_NTOHL (0x6e743a32),
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/Current:2.3
     8,
-  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x43757272),
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -8500,19 +6157,19 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    const PortableServer::ObjectId &_tao_elem
+    const PortableServer::POAList &_tao_elem
   )
 {
-  TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::insert_copy (
+  TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert_copy (
       _tao_any,
-      PortableServer::ObjectId::_tao_any_destructor,
-      PortableServer::_tc_ObjectId,
+      PortableServer::POAList::_tao_any_destructor,
+      PortableServer::_tc_POAList,
       _tao_elem
     );
 }
@@ -8520,13 +6177,13 @@ void operator<<= (
 // Non-copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
-    PortableServer::ObjectId *_tao_elem
+    PortableServer::POAList *_tao_elem
   )
 {
-  TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::insert (
+  TAO::Any_Dual_Impl_T<PortableServer::POAList>::insert (
       _tao_any,
-      PortableServer::ObjectId::_tao_any_destructor,
-      PortableServer::_tc_ObjectId,
+      PortableServer::POAList::_tao_any_destructor,
+      PortableServer::_tc_POAList,
       _tao_elem
     );
 }
@@ -8534,11 +6191,11 @@ void operator<<= (
 // Extraction to non-const pointer (deprecated).
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    PortableServer::ObjectId *&_tao_elem
+    PortableServer::POAList *&_tao_elem
   )
 {
   return _tao_any >>= ACE_const_cast (
-      const PortableServer::ObjectId *&,
+      const PortableServer::POAList *&,
       _tao_elem
     );
 }
@@ -8546,18 +6203,39 @@ CORBA::Boolean operator>>= (
 // Extraction to const pointer.
 CORBA::Boolean operator>>= (
     const CORBA::Any &_tao_any,
-    const PortableServer::ObjectId *&_tao_elem
+    const PortableServer::POAList *&_tao_elem
   )
 {
   return
-    TAO::Any_Dual_Impl_T<PortableServer::ObjectId>::extract (
+    TAO::Any_Dual_Impl_T<PortableServer::POAList>::extract (
         _tao_any,
-        PortableServer::ObjectId::_tao_any_destructor,
-        PortableServer::_tc_ObjectId,
+        PortableServer::POAList::_tao_any_destructor,
+        PortableServer::_tc_POAList,
         _tao_elem
       );
 }
 
+template<>
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<PortableServer::POAList>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::POAList>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<PortableServer::ObjectId>;
@@ -8567,7 +6245,7 @@ CORBA::Boolean operator>>= (
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8629,14 +6307,14 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8698,10 +6376,10 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>
+# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8790,7 +6468,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_ThreadPolicyValue,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -8798,7 +6476,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -8881,7 +6559,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_LifespanPolicyValue,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -8889,7 +6567,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -8970,7 +6648,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_IdUniquenessPolicyValue,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -8978,7 +6656,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -9059,7 +6737,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_IdAssignmentPolicyValue,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -9067,7 +6745,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -9150,7 +6828,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_ImplicitActivationPolicyValue,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -9158,7 +6836,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -9239,7 +6917,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_ServantRetentionPolicyValue,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -9247,7 +6925,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -9328,7 +7006,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_RequestProcessingPolicyValue,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -9336,7 +7014,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>
+# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -9779,34 +7457,34 @@ operator>>= (
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
-
+#if 0
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableServer::ObjectId &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
           ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableServer::ObjectId *)&_tao_sequence);
         if (oseq->mb ())
           return strm.write_octet_array_mb (oseq->mb ());
         else
           return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
       }
-      
+
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  
+
   return 0;
 }
 
@@ -9816,7 +7494,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -9826,18 +7504,18 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       if (ACE_BIT_DISABLED (strm.start ()->flags (),
       ACE_Message_Block::DONT_DELETE))
@@ -9847,7 +7525,7 @@ CORBA::Boolean operator>> (
         strm.orb_core ()->resource_factory ()->
         input_cdr_allocator_type_locked () == 1)
         {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
             ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
           oseq->replace (_tao_seq_len, strm.start ());
           oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -9858,17 +7536,17 @@ CORBA::Boolean operator>> (
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-  
+
   return 0;
 }
-
+#endif
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -9876,62 +7554,70 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-    
-  return 0;
-}
-  
-  CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::IDs &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
+
+    return 0;
+  }
+
+    CORBA::Boolean operator>> (
+      TAO_InputCDR &strm,
+      PortableServer::IDs &_tao_sequence
+    )
+  {
+    CORBA::ULong _tao_seq_len;
+
+    if (strm >> _tao_seq_len)
+      {
+        // Add a check to the length of the sequence
+        // to make sure it does not exceed the length
+        // of the stream. (See bug 58.)
+        if (_tao_seq_len > strm.length ())
+          {
+            return 0;
+          }
+
+        // Set the length of the sequence.
+        _tao_sequence.length (_tao_seq_len);
+
+        // If length is 0 we return true.
+        if (0 >= _tao_seq_len)
+          {
+            return 1;
+          }
+
+        // Retrieve all the elements.
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
-  return 0;
-}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 2f5d0ae3422..3e5a3a23c4d 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -26,15 +26,13 @@
 #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
+#include "tao/CurrentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "portableserver_export.h"
-#include "tao/CurrentC.h"
-#include "tao/Sequence.h"
 #include "tao/Exception.h"
 #include "tao/PolicyC.h"
 #include "tao/OctetSeqC.h"
@@ -74,7 +72,6 @@ class TAO_POA;
 
 TAO_NAMESPACE  PortableServer
 {
-  
   typedef TAO_ServantBase ServantBase;
   typedef TAO_ServantBase_var ServantBase_var;
   typedef TAO_RefCountServantBase RefCountServantBase;
@@ -84,400 +81,110 @@ TAO_NAMESPACE  PortableServer
   typedef TAO_DynamicImplementation DynamicImplementation;
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53
-  
-  class POA;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_PORTABLESERVER_POA___PTR_CH_)
-#define _PORTABLESERVER_POA___PTR_CH_
-  
-  typedef POA *POA_ptr;
+#if !defined (_PORTABLESERVER_POA__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_POA__ODDS_N_ENDS_CH_
 
-#endif /* end #if !defined */
+  class POA;
+  typedef POA *POA_ptr;
+  struct tao_POA_life;
+  typedef TAO_Objref_Var_T<POA, tao_POA_life> POA_var;
+  typedef TAO_Objref_Out_T<POA, tao_POA_life> POA_out;
 
-#if !defined (_PORTABLESERVER_POA___VAR_CH_)
-#define _PORTABLESERVER_POA___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export POA_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_POA_life
   {
-  public:
-    POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {} 
-    POA_var (const POA_var &); // copy constructor
-    ~POA_var (void); // destructor
-    
-    POA_var &operator= (POA_ptr);
-    POA_var &operator= (const POA_var &);
-    POA_ptr operator-> (void) const;
-    
-    operator const POA_ptr &() const;
-    operator POA_ptr &();
-    // in, inout, out, _retn 
-    POA_ptr in (void) const;
-    POA_ptr &inout (void);
-    POA_ptr &out (void);
-    POA_ptr _retn (void);
-    POA_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static POA_ptr tao_duplicate (POA_ptr);
     static void tao_release (POA_ptr);
     static POA_ptr tao_nil (void);
-    static POA_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        POA_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    POA_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    POA_var (const TAO_Base_var &rhs);
-    POA_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POA___OUT_CH_)
-#define _PORTABLESERVER_POA___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export POA_out
-  {
-  public:
-    POA_out (POA_ptr &);
-    POA_out (POA_var &);
-    POA_out (const POA_out &);
-    POA_out &operator= (const POA_out &);
-    POA_out &operator= (const POA_var &);
-    POA_out &operator= (POA_ptr);
-    operator POA_ptr &();
-    POA_ptr &ptr (void);
-    POA_ptr operator-> (void);
-  
-  private:
-    POA_ptr &ptr_;
   };
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_
-  
-  class TAO_PortableServer_Export _TAO_Unbounded_Object_Sequence_PortableServer_POAList
-    : public TAO_Unbounded_Base_Sequence
+  struct TAO_PortableServer_Export tao_POA_cast
   {
-  public:
-    _TAO_Unbounded_Object_Sequence_PortableServer_POAList (void);
-    _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_PortableServer_POAList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        POA* *value,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Object_Sequence_PortableServer_POAList (
-        const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs
-      );
-    _TAO_Unbounded_Object_Sequence_PortableServer_POAList &operator= (
-        const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs
-      );
-    virtual ~_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void);
-    
-    // = Accessors.
-    TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> operator[] (CORBA::ULong index) const;
-    
-    // = Static operations.
-    static POA **allocbuf (CORBA::ULong nelems);
-    static void freebuf (POA **buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    POA* *get_buffer (CORBA::Boolean orphan = 0);
-    const POA* *get_buffer (void) const;
-    virtual void _shrink_buffer (
-        CORBA::ULong nl,
-        CORBA::ULong ol
-      );
-    
-    virtual void _downcast (
-        void* target,
-        CORBA::Object *src
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static POA_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
       );
-    virtual CORBA::Object* _upcast (void *src) const;
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_PORTABLESERVER_POALIST_CH_)
-#define _PORTABLESERVER_POALIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class POAList;
-  class POAList_var;
-  
-  // *************************************************************
-  // PortableServer::POAList
-  // *************************************************************
-  
-  class TAO_PortableServer_Export POAList : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_PortableServer_POAList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<POA,POA_var>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        POAList,
+        TAO_Object_Manager<
+            PortableServer::POA,
+            PortableServer::POA_var,
+            PortableServer::tao_POA_life
+          >
+      >
+    POAList_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        POAList,
+        POAList_var,
+        TAO_Object_Manager<
+            PortableServer::POA,
+            PortableServer::POA_var,
+            PortableServer::tao_POA_life
+          >
+      >
+    POAList_out;
+
+  class TAO_PortableServer_Export POAList
+    : public
+        TAO_Unbounded_Object_Sequence<
+            PortableServer::POA,
+            PortableServer::POA_var,
+            PortableServer::tao_POA_life,
+            PortableServer::tao_POA_cast
+          >
   {
   public:
     POAList (void);
     POAList (CORBA::ULong max);
     POAList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        POA_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        POA_ptr* buffer,
         CORBA::Boolean release = 0
       );
     POAList (const POAList &);
     ~POAList (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef POAList_var _var_type;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_PORTABLESERVER_POALIST___VAR_CH_)
-#define _PORTABLESERVER_POALIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class PortableServer::POAList_var
-  // *************************************************************
-  
-  class TAO_PortableServer_Export POAList_var
-  {
-  public:
-    POAList_var (void);
-    POAList_var (POAList *);
-    POAList_var (const POAList_var &);
-    ~POAList_var (void);
-    
-    POAList_var &operator= (POAList *);
-    POAList_var &operator= (const POAList_var &);
-    POAList *operator-> (void);
-    const POAList *operator-> (void) const;
-    
-    operator const POAList &() const;
-    operator POAList &();
-    operator POAList &() const;
-    
-    // Variable-size base types only.
-    operator POAList *&();
-    
-    TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const POAList &in (void) const;
-    POAList &inout (void);
-    POAList *&out (void);
-    POAList *_retn (void);
-    POAList *ptr (void) const;
-  
-  private:
-    POAList *ptr_;
+    typedef POAList_var _var_type;
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POALIST___OUT_CH_)
-#define _PORTABLESERVER_POALIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_PortableServer_Export POAList_out
-  {
-  public:
-    POAList_out (POAList *&);
-    POAList_out (POAList_var &);
-    POAList_out (const POAList_out &);
-    POAList_out &operator= (const POAList_out &);
-    POAList_out &operator= (POAList *);
-    operator POAList *&();
-    POAList *&ptr (void);
-    POAList *operator-> (void);
-    TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-  
-  private:
-    POAList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const POAList_var &);
-  };
-
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAList;
-
-#if !defined (_PORTABLESERVER_OBJECTID_CH_)
-#define _PORTABLESERVER_OBJECTID_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
-  class ObjectId;
-  class ObjectId_var;
-  
-  // *************************************************************
-  // PortableServer::ObjectId
-  // *************************************************************
-  
-  class TAO_PortableServer_Export ObjectId : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    ObjectId (void);
-    ObjectId (CORBA::ULong max);
-    ObjectId (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::Octet *buffer, 
-        CORBA::Boolean release = 0
-      );
-    ObjectId (const ObjectId &);
-    ~ObjectId (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef ObjectId_var _var_type;
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    ObjectId (
-        CORBA::ULong length,
-        const ACE_Message_Block* mb
-      )
-      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-  };
 
-#endif /* end #if !defined */
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAList;
 
-#if !defined (_PORTABLESERVER_OBJECTID___VAR_CH_)
-#define _PORTABLESERVER_OBJECTID___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class PortableServer::ObjectId_var
-  // *************************************************************
-  
-  class TAO_PortableServer_Export ObjectId_var
-  {
-  public:
-    ObjectId_var (void);
-    ObjectId_var (ObjectId *);
-    ObjectId_var (const ObjectId_var &);
-    
-    // Fixed-size base types only.
-    ObjectId_var (const ObjectId &);
-    
-    ~ObjectId_var (void);
-    
-    ObjectId_var &operator= (ObjectId *);
-    ObjectId_var &operator= (const ObjectId_var &);
-    
-    // Fixed-size base types only.
-    ObjectId_var &operator= (const ObjectId &);
-    
-    ObjectId *operator-> (void);
-    const ObjectId *operator-> (void) const;
-    
-    operator const ObjectId &() const;
-    operator ObjectId &();
-    operator ObjectId &() const;
-    CORBA::Octet & operator[] (CORBA::ULong index);
-    const CORBA::Octet & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ObjectId &in (void) const;
-    ObjectId &inout (void);
-    ObjectId *&out (void);
-    ObjectId *_retn (void);
-    ObjectId *ptr (void) const;
-  
-  private:
-    ObjectId *ptr_;
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_OBJECTID___OUT_CH_)
-#define _PORTABLESERVER_OBJECTID___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_PortableServer_Export ObjectId_out
-  {
-  public:
-    ObjectId_out (ObjectId *&);
-    ObjectId_out (ObjectId_var &);
-    ObjectId_out (const ObjectId_out &);
-    ObjectId_out &operator= (const ObjectId_out &);
-    ObjectId_out &operator= (ObjectId *);
-    operator ObjectId *&();
-    ObjectId *&ptr (void);
-    ObjectId *operator-> (void);
-    CORBA::Octet & operator[] (CORBA::ULong index);
-  
-  private:
-    ObjectId *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ObjectId_var &);
-  };
+  typedef CORBA::OctetSeq ObjectId;
+  typedef CORBA::OctetSeq_var ObjectId_var;
+  typedef CORBA::OctetSeq_out ObjectId_out;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
-  
+
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   // TAO_IDL - Generated from
@@ -485,20 +192,20 @@ TAO_NAMESPACE  PortableServer
 
 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
 #define _PORTABLESERVER_FORWARDREQUEST_CH_
-  
+
   class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException
   {
   public:
-    
+
     CORBA::Object_var forward_reference;
     ForwardRequest (void);
     ForwardRequest (const ForwardRequest &);
     ~ForwardRequest (void);
 
     ForwardRequest &operator= (const ForwardRequest &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static ForwardRequest *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -510,32 +217,32 @@ TAO_NAMESPACE  PortableServer
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     ForwardRequest (
         const CORBA::Object_ptr  _tao_forward_reference
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
 
 #endif /* end #if !defined */
-  
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -545,19 +252,19 @@ TAO_NAMESPACE  PortableServer
 
 #if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_)
 #define _PORTABLESERVER_NOTAGROUPOBJECT_CH_
-  
+
   class TAO_PortableServer_Export NotAGroupObject : public CORBA::UserException
   {
   public:
-    
+
     NotAGroupObject (void);
     NotAGroupObject (const NotAGroupObject &);
     ~NotAGroupObject (void);
 
     NotAGroupObject &operator= (const NotAGroupObject &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static NotAGroupObject *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -569,344 +276,168 @@ TAO_NAMESPACE  PortableServer
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-    
+
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CH_
-  
-  class TAO_PortableServer_Export _TAO_Unbounded_Sequence_PortableServer_IDs
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_PortableServer_IDs (void);
-    _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_PortableServer_IDs (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ObjectId *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_PortableServer_IDs (
-        const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs
-      );
-    _TAO_Unbounded_Sequence_PortableServer_IDs &operator= (
-        const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_PortableServer_IDs (void);
-    
-    // = Accessors.
-    ObjectId &operator[] (CORBA::ULong i);
-    const ObjectId &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ObjectId *allocbuf (CORBA::ULong size);
-    static void freebuf (ObjectId *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ObjectId *get_buffer (CORBA::Boolean orphan = 0);
-    const ObjectId *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ObjectId *data,
-        CORBA::Boolean release
-      );
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_PORTABLESERVER_IDS_CH_)
-#define _PORTABLESERVER_IDS_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-  
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+
   class IDs;
-  class IDs_var;
-  
-  // *************************************************************
-  // PortableServer::IDs
-  // *************************************************************
-  
-  class TAO_PortableServer_Export IDs : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_PortableServer_IDs
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ObjectId>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_VarSeq_Var_T<
+        IDs,
+        PortableServer::ObjectId
+      >
+    IDs_var;
+
+  typedef
+    TAO_Seq_Out_T<
+        IDs,
+        IDs_var,
+        PortableServer::ObjectId
+      >
+    IDs_out;
+
+  class TAO_PortableServer_Export IDs
+    : public
+        TAO_Unbounded_Sequence<
+            PortableServer::ObjectId
+          >
   {
   public:
     IDs (void);
     IDs (CORBA::ULong max);
     IDs (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ObjectId *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ObjectId* buffer,
         CORBA::Boolean release = 0
       );
     IDs (const IDs &);
     ~IDs (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef IDs_var _var_type;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDS___VAR_CH_)
-#define _PORTABLESERVER_IDS___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class PortableServer::IDs_var
-  // *************************************************************
-  
-  class TAO_PortableServer_Export IDs_var
-  {
-  public:
-    IDs_var (void);
-    IDs_var (IDs *);
-    IDs_var (const IDs_var &);
-    ~IDs_var (void);
-    
-    IDs_var &operator= (IDs *);
-    IDs_var &operator= (const IDs_var &);
-    IDs *operator-> (void);
-    const IDs *operator-> (void) const;
-    
-    operator const IDs &() const;
-    operator IDs &();
-    operator IDs &() const;
-    
-    // Variable-size base types only.
-    operator IDs *&();
-    
-    ObjectId & operator[] (CORBA::ULong index);
-    const ObjectId & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const IDs &in (void) const;
-    IDs &inout (void);
-    IDs *&out (void);
-    IDs *_retn (void);
-    IDs *ptr (void) const;
-  
-  private:
-    IDs *ptr_;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_PORTABLESERVER_IDS___OUT_CH_)
-#define _PORTABLESERVER_IDS___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_PortableServer_Export IDs_out
-  {
-  public:
-    IDs_out (IDs *&);
-    IDs_out (IDs_var &);
-    IDs_out (const IDs_out &);
-    IDs_out &operator= (const IDs_out &);
-    IDs_out &operator= (IDs *);
-    operator IDs *&();
-    IDs *&ptr (void);
-    IDs *operator-> (void);
-    ObjectId & operator[] (CORBA::ULong index);
-  
-  private:
-    IDs *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const IDs_var &);
+    typedef IDs_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDs;
-  
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong THREAD_POLICY_ID = 16U;
-  
+
+  const CORBA::PolicyType THREAD_POLICY_ID = 16U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong LIFESPAN_POLICY_ID = 17U;
-  
+
+  const CORBA::PolicyType LIFESPAN_POLICY_ID = 17U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong ID_UNIQUENESS_POLICY_ID = 18U;
-  
+
+  const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong ID_ASSIGNMENT_POLICY_ID = 19U;
-  
+
+  const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong IMPLICIT_ACTIVATION_POLICY_ID = 20U;
-  
+
+  const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong SERVANT_RETENTION_POLICY_ID = 21U;
-  
+
+  const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ULong REQUEST_PROCESSING_POLICY_ID = 22U;
-  
+
+  const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22U;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ThreadPolicyValue
   {
     ORB_CTRL_MODEL,
     SINGLE_THREAD_MODEL
   };
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef ThreadPolicyValue &ThreadPolicyValue_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_THREADPOLICY__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_THREADPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_)
-#define _PORTABLESERVER_THREADPOLICY___PTR_CH_
-  
   class ThreadPolicy;
   typedef ThreadPolicy *ThreadPolicy_ptr;
+  struct tao_ThreadPolicy_life;
+  typedef TAO_Objref_Var_T<ThreadPolicy, tao_ThreadPolicy_life> ThreadPolicy_var;
+  typedef TAO_Objref_Out_T<ThreadPolicy, tao_ThreadPolicy_life> ThreadPolicy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_)
-#define _PORTABLESERVER_THREADPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ThreadPolicy_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_ThreadPolicy_life
   {
-  public:
-    ThreadPolicy_var (void); // default constructor
-    ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {} 
-    ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor
-    ~ThreadPolicy_var (void); // destructor
-    
-    ThreadPolicy_var &operator= (ThreadPolicy_ptr);
-    ThreadPolicy_var &operator= (const ThreadPolicy_var &);
-    ThreadPolicy_ptr operator-> (void) const;
-    
-    operator const ThreadPolicy_ptr &() const;
-    operator ThreadPolicy_ptr &();
-    // in, inout, out, _retn 
-    ThreadPolicy_ptr in (void) const;
-    ThreadPolicy_ptr &inout (void);
-    ThreadPolicy_ptr &out (void);
-    ThreadPolicy_ptr _retn (void);
-    ThreadPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ThreadPolicy_ptr tao_duplicate (ThreadPolicy_ptr);
     static void tao_release (ThreadPolicy_ptr);
     static ThreadPolicy_ptr tao_nil (void);
-    static ThreadPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ThreadPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ThreadPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ThreadPolicy_var (const TAO_Base_var &rhs);
-    ThreadPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CH_)
-#define _PORTABLESERVER_THREADPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ThreadPolicy_out
+  struct TAO_PortableServer_Export tao_ThreadPolicy_cast
   {
-  public:
-    ThreadPolicy_out (ThreadPolicy_ptr &);
-    ThreadPolicy_out (ThreadPolicy_var &);
-    ThreadPolicy_out (const ThreadPolicy_out &);
-    ThreadPolicy_out &operator= (const ThreadPolicy_out &);
-    ThreadPolicy_out &operator= (const ThreadPolicy_var &);
-    ThreadPolicy_out &operator= (ThreadPolicy_ptr);
-    operator ThreadPolicy_ptr &();
-    ThreadPolicy_ptr &ptr (void);
-    ThreadPolicy_ptr operator-> (void);
-  
-  private:
-    ThreadPolicy_ptr &ptr_;
+    static ThreadPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
-  
+
   class TAO_PortableServer_Export ThreadPolicy
     : public virtual CORBA::Policy
   {
@@ -914,168 +445,119 @@ TAO_NAMESPACE  PortableServer
     typedef ThreadPolicy_ptr _ptr_type;
     typedef ThreadPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-    
+
     static ThreadPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ThreadPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ThreadPolicy_ptr _nil (void)
       {
         return (ThreadPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ThreadPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ThreadPolicy (void);
     virtual ~ThreadPolicy (void);
-    
+
   private:
     ThreadPolicy (const ThreadPolicy &);
     void operator= (const ThreadPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicy;
-  
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum LifespanPolicyValue
   {
     TRANSIENT,
     PERSISTENT
   };
-  
+
   typedef LifespanPolicyValue &LifespanPolicyValue_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_LIFESPANPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___PTR_CH_
-  
   class LifespanPolicy;
   typedef LifespanPolicy *LifespanPolicy_ptr;
+  struct tao_LifespanPolicy_life;
+  typedef TAO_Objref_Var_T<LifespanPolicy, tao_LifespanPolicy_life> LifespanPolicy_var;
+  typedef TAO_Objref_Out_T<LifespanPolicy, tao_LifespanPolicy_life> LifespanPolicy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export LifespanPolicy_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_LifespanPolicy_life
   {
-  public:
-    LifespanPolicy_var (void); // default constructor
-    LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {} 
-    LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor
-    ~LifespanPolicy_var (void); // destructor
-    
-    LifespanPolicy_var &operator= (LifespanPolicy_ptr);
-    LifespanPolicy_var &operator= (const LifespanPolicy_var &);
-    LifespanPolicy_ptr operator-> (void) const;
-    
-    operator const LifespanPolicy_ptr &() const;
-    operator LifespanPolicy_ptr &();
-    // in, inout, out, _retn 
-    LifespanPolicy_ptr in (void) const;
-    LifespanPolicy_ptr &inout (void);
-    LifespanPolicy_ptr &out (void);
-    LifespanPolicy_ptr _retn (void);
-    LifespanPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static LifespanPolicy_ptr tao_duplicate (LifespanPolicy_ptr);
     static void tao_release (LifespanPolicy_ptr);
     static LifespanPolicy_ptr tao_nil (void);
-    static LifespanPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        LifespanPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    LifespanPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    LifespanPolicy_var (const TAO_Base_var &rhs);
-    LifespanPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export LifespanPolicy_out
+  struct TAO_PortableServer_Export tao_LifespanPolicy_cast
   {
-  public:
-    LifespanPolicy_out (LifespanPolicy_ptr &);
-    LifespanPolicy_out (LifespanPolicy_var &);
-    LifespanPolicy_out (const LifespanPolicy_out &);
-    LifespanPolicy_out &operator= (const LifespanPolicy_out &);
-    LifespanPolicy_out &operator= (const LifespanPolicy_var &);
-    LifespanPolicy_out &operator= (LifespanPolicy_ptr);
-    operator LifespanPolicy_ptr &();
-    LifespanPolicy_ptr &ptr (void);
-    LifespanPolicy_ptr operator-> (void);
-  
-  private:
-    LifespanPolicy_ptr &ptr_;
+    static LifespanPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY_CH_
-  
+
   class TAO_PortableServer_Export LifespanPolicy
     : public virtual CORBA::Policy
   {
@@ -1083,166 +565,117 @@ TAO_NAMESPACE  PortableServer
     typedef LifespanPolicy_ptr _ptr_type;
     typedef LifespanPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-    
+
     static LifespanPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static LifespanPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static LifespanPolicy_ptr _nil (void)
       {
         return (LifespanPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::LifespanPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     LifespanPolicy (void);
     virtual ~LifespanPolicy (void);
-    
+
   private:
     LifespanPolicy (const LifespanPolicy &);
     void operator= (const LifespanPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum IdUniquenessPolicyValue
   {
     UNIQUE_ID,
     MULTIPLE_ID
   };
-  
+
   typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_
-  
   class IdUniquenessPolicy;
   typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
+  struct tao_IdUniquenessPolicy_life;
+  typedef TAO_Objref_Var_T<IdUniquenessPolicy, tao_IdUniquenessPolicy_life> IdUniquenessPolicy_var;
+  typedef TAO_Objref_Out_T<IdUniquenessPolicy, tao_IdUniquenessPolicy_life> IdUniquenessPolicy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export IdUniquenessPolicy_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_IdUniquenessPolicy_life
   {
-  public:
-    IdUniquenessPolicy_var (void); // default constructor
-    IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {} 
-    IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor
-    ~IdUniquenessPolicy_var (void); // destructor
-    
-    IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr);
-    IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_ptr operator-> (void) const;
-    
-    operator const IdUniquenessPolicy_ptr &() const;
-    operator IdUniquenessPolicy_ptr &();
-    // in, inout, out, _retn 
-    IdUniquenessPolicy_ptr in (void) const;
-    IdUniquenessPolicy_ptr &inout (void);
-    IdUniquenessPolicy_ptr &out (void);
-    IdUniquenessPolicy_ptr _retn (void);
-    IdUniquenessPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static IdUniquenessPolicy_ptr tao_duplicate (IdUniquenessPolicy_ptr);
     static void tao_release (IdUniquenessPolicy_ptr);
     static IdUniquenessPolicy_ptr tao_nil (void);
-    static IdUniquenessPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        IdUniquenessPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    IdUniquenessPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    IdUniquenessPolicy_var (const TAO_Base_var &rhs);
-    IdUniquenessPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export IdUniquenessPolicy_out
+  struct TAO_PortableServer_Export tao_IdUniquenessPolicy_cast
   {
-  public:
-    IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &);
-    IdUniquenessPolicy_out (IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_out (const IdUniquenessPolicy_out &);
-    IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_out &);
-    IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_ptr);
-    operator IdUniquenessPolicy_ptr &();
-    IdUniquenessPolicy_ptr &ptr (void);
-    IdUniquenessPolicy_ptr operator-> (void);
-  
-  private:
-    IdUniquenessPolicy_ptr &ptr_;
+    static IdUniquenessPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
-  
+
   class TAO_PortableServer_Export IdUniquenessPolicy
     : public virtual CORBA::Policy
   {
@@ -1250,166 +683,117 @@ TAO_NAMESPACE  PortableServer
     typedef IdUniquenessPolicy_ptr _ptr_type;
     typedef IdUniquenessPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-    
+
     static IdUniquenessPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IdUniquenessPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IdUniquenessPolicy_ptr _nil (void)
       {
         return (IdUniquenessPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::IdUniquenessPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     IdUniquenessPolicy (void);
     virtual ~IdUniquenessPolicy (void);
-    
+
   private:
     IdUniquenessPolicy (const IdUniquenessPolicy &);
     void operator= (const IdUniquenessPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum IdAssignmentPolicyValue
   {
     USER_ID,
     SYSTEM_ID
   };
-  
+
   typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_
-  
   class IdAssignmentPolicy;
   typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
+  struct tao_IdAssignmentPolicy_life;
+  typedef TAO_Objref_Var_T<IdAssignmentPolicy, tao_IdAssignmentPolicy_life> IdAssignmentPolicy_var;
+  typedef TAO_Objref_Out_T<IdAssignmentPolicy, tao_IdAssignmentPolicy_life> IdAssignmentPolicy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export IdAssignmentPolicy_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_IdAssignmentPolicy_life
   {
-  public:
-    IdAssignmentPolicy_var (void); // default constructor
-    IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {} 
-    IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor
-    ~IdAssignmentPolicy_var (void); // destructor
-    
-    IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr);
-    IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_ptr operator-> (void) const;
-    
-    operator const IdAssignmentPolicy_ptr &() const;
-    operator IdAssignmentPolicy_ptr &();
-    // in, inout, out, _retn 
-    IdAssignmentPolicy_ptr in (void) const;
-    IdAssignmentPolicy_ptr &inout (void);
-    IdAssignmentPolicy_ptr &out (void);
-    IdAssignmentPolicy_ptr _retn (void);
-    IdAssignmentPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static IdAssignmentPolicy_ptr tao_duplicate (IdAssignmentPolicy_ptr);
     static void tao_release (IdAssignmentPolicy_ptr);
     static IdAssignmentPolicy_ptr tao_nil (void);
-    static IdAssignmentPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        IdAssignmentPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    IdAssignmentPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    IdAssignmentPolicy_var (const TAO_Base_var &rhs);
-    IdAssignmentPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export IdAssignmentPolicy_out
+  struct TAO_PortableServer_Export tao_IdAssignmentPolicy_cast
   {
-  public:
-    IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &);
-    IdAssignmentPolicy_out (IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_out (const IdAssignmentPolicy_out &);
-    IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_out &);
-    IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_ptr);
-    operator IdAssignmentPolicy_ptr &();
-    IdAssignmentPolicy_ptr &ptr (void);
-    IdAssignmentPolicy_ptr operator-> (void);
-  
-  private:
-    IdAssignmentPolicy_ptr &ptr_;
+    static IdAssignmentPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
-  
+
   class TAO_PortableServer_Export IdAssignmentPolicy
     : public virtual CORBA::Policy
   {
@@ -1417,168 +801,119 @@ TAO_NAMESPACE  PortableServer
     typedef IdAssignmentPolicy_ptr _ptr_type;
     typedef IdAssignmentPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-    
+
     static IdAssignmentPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IdAssignmentPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IdAssignmentPolicy_ptr _nil (void)
       {
         return (IdAssignmentPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::IdAssignmentPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     IdAssignmentPolicy (void);
     virtual ~IdAssignmentPolicy (void);
-    
+
   private:
     IdAssignmentPolicy (const IdAssignmentPolicy &);
     void operator= (const IdAssignmentPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ImplicitActivationPolicyValue
   {
     IMPLICIT_ACTIVATION,
     NO_IMPLICIT_ACTIVATION
   };
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_
-  
   class ImplicitActivationPolicy;
   typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
+  struct tao_ImplicitActivationPolicy_life;
+  typedef TAO_Objref_Var_T<ImplicitActivationPolicy, tao_ImplicitActivationPolicy_life> ImplicitActivationPolicy_var;
+  typedef TAO_Objref_Out_T<ImplicitActivationPolicy, tao_ImplicitActivationPolicy_life> ImplicitActivationPolicy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ImplicitActivationPolicy_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_ImplicitActivationPolicy_life
   {
-  public:
-    ImplicitActivationPolicy_var (void); // default constructor
-    ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {} 
-    ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor
-    ~ImplicitActivationPolicy_var (void); // destructor
-    
-    ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr);
-    ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_ptr operator-> (void) const;
-    
-    operator const ImplicitActivationPolicy_ptr &() const;
-    operator ImplicitActivationPolicy_ptr &();
-    // in, inout, out, _retn 
-    ImplicitActivationPolicy_ptr in (void) const;
-    ImplicitActivationPolicy_ptr &inout (void);
-    ImplicitActivationPolicy_ptr &out (void);
-    ImplicitActivationPolicy_ptr _retn (void);
-    ImplicitActivationPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ImplicitActivationPolicy_ptr tao_duplicate (ImplicitActivationPolicy_ptr);
     static void tao_release (ImplicitActivationPolicy_ptr);
     static ImplicitActivationPolicy_ptr tao_nil (void);
-    static ImplicitActivationPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ImplicitActivationPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ImplicitActivationPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ImplicitActivationPolicy_var (const TAO_Base_var &rhs);
-    ImplicitActivationPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ImplicitActivationPolicy_out
+  struct TAO_PortableServer_Export tao_ImplicitActivationPolicy_cast
   {
-  public:
-    ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &);
-    ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_out (const ImplicitActivationPolicy_out &);
-    ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_out &);
-    ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_ptr);
-    operator ImplicitActivationPolicy_ptr &();
-    ImplicitActivationPolicy_ptr &ptr (void);
-    ImplicitActivationPolicy_ptr operator-> (void);
-  
-  private:
-    ImplicitActivationPolicy_ptr &ptr_;
+    static ImplicitActivationPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
-  
+
   class TAO_PortableServer_Export ImplicitActivationPolicy
     : public virtual CORBA::Policy
   {
@@ -1586,170 +921,121 @@ TAO_NAMESPACE  PortableServer
     typedef ImplicitActivationPolicy_ptr _ptr_type;
     typedef ImplicitActivationPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-    
+
     static ImplicitActivationPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ImplicitActivationPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ImplicitActivationPolicy_ptr _nil (void)
       {
         return (ImplicitActivationPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ImplicitActivationPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ImplicitActivationPolicy (void);
     virtual ~ImplicitActivationPolicy (void);
-    
+
   private:
     ImplicitActivationPolicy (const ImplicitActivationPolicy &);
     void operator= (const ImplicitActivationPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy;
-  
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ServantRetentionPolicyValue
   {
     RETAIN,
     NON_RETAIN
   };
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
- typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-  
+  typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_
-  
   class ServantRetentionPolicy;
   typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
+  struct tao_ServantRetentionPolicy_life;
+  typedef TAO_Objref_Var_T<ServantRetentionPolicy, tao_ServantRetentionPolicy_life> ServantRetentionPolicy_var;
+  typedef TAO_Objref_Out_T<ServantRetentionPolicy, tao_ServantRetentionPolicy_life> ServantRetentionPolicy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ServantRetentionPolicy_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_ServantRetentionPolicy_life
   {
-  public:
-    ServantRetentionPolicy_var (void); // default constructor
-    ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {} 
-    ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor
-    ~ServantRetentionPolicy_var (void); // destructor
-    
-    ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr);
-    ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_ptr operator-> (void) const;
-    
-    operator const ServantRetentionPolicy_ptr &() const;
-    operator ServantRetentionPolicy_ptr &();
-    // in, inout, out, _retn 
-    ServantRetentionPolicy_ptr in (void) const;
-    ServantRetentionPolicy_ptr &inout (void);
-    ServantRetentionPolicy_ptr &out (void);
-    ServantRetentionPolicy_ptr _retn (void);
-    ServantRetentionPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServantRetentionPolicy_ptr tao_duplicate (ServantRetentionPolicy_ptr);
     static void tao_release (ServantRetentionPolicy_ptr);
     static ServantRetentionPolicy_ptr tao_nil (void);
-    static ServantRetentionPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServantRetentionPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServantRetentionPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServantRetentionPolicy_var (const TAO_Base_var &rhs);
-    ServantRetentionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ServantRetentionPolicy_out
+  struct TAO_PortableServer_Export tao_ServantRetentionPolicy_cast
   {
-  public:
-    ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &);
-    ServantRetentionPolicy_out (ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_out (const ServantRetentionPolicy_out &);
-    ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_out &);
-    ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_ptr);
-    operator ServantRetentionPolicy_ptr &();
-    ServantRetentionPolicy_ptr &ptr (void);
-    ServantRetentionPolicy_ptr operator-> (void);
-  
-  private:
-    ServantRetentionPolicy_ptr &ptr_;
+    static ServantRetentionPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-  
+
   class TAO_PortableServer_Export ServantRetentionPolicy
     : public virtual CORBA::Policy
   {
@@ -1757,171 +1043,122 @@ TAO_NAMESPACE  PortableServer
     typedef ServantRetentionPolicy_ptr _ptr_type;
     typedef ServantRetentionPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-    
+
     static ServantRetentionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantRetentionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantRetentionPolicy_ptr _nil (void)
       {
         return (ServantRetentionPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ServantRetentionPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ServantRetentionPolicy (void);
     virtual ~ServantRetentionPolicy (void);
-    
+
   private:
     ServantRetentionPolicy (const ServantRetentionPolicy &);
     void operator= (const ServantRetentionPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicy;
-  
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum RequestProcessingPolicyValue
   {
     USE_ACTIVE_OBJECT_MAP_ONLY,
     USE_DEFAULT_SERVANT,
     USE_SERVANT_MANAGER
   };
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_
-  
   class RequestProcessingPolicy;
   typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
+  struct tao_RequestProcessingPolicy_life;
+  typedef TAO_Objref_Var_T<RequestProcessingPolicy, tao_RequestProcessingPolicy_life> RequestProcessingPolicy_var;
+  typedef TAO_Objref_Out_T<RequestProcessingPolicy, tao_RequestProcessingPolicy_life> RequestProcessingPolicy_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export RequestProcessingPolicy_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_RequestProcessingPolicy_life
   {
-  public:
-    RequestProcessingPolicy_var (void); // default constructor
-    RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {} 
-    RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor
-    ~RequestProcessingPolicy_var (void); // destructor
-    
-    RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr);
-    RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_ptr operator-> (void) const;
-    
-    operator const RequestProcessingPolicy_ptr &() const;
-    operator RequestProcessingPolicy_ptr &();
-    // in, inout, out, _retn 
-    RequestProcessingPolicy_ptr in (void) const;
-    RequestProcessingPolicy_ptr &inout (void);
-    RequestProcessingPolicy_ptr &out (void);
-    RequestProcessingPolicy_ptr _retn (void);
-    RequestProcessingPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RequestProcessingPolicy_ptr tao_duplicate (RequestProcessingPolicy_ptr);
     static void tao_release (RequestProcessingPolicy_ptr);
     static RequestProcessingPolicy_ptr tao_nil (void);
-    static RequestProcessingPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RequestProcessingPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RequestProcessingPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RequestProcessingPolicy_var (const TAO_Base_var &rhs);
-    RequestProcessingPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export RequestProcessingPolicy_out
+  struct TAO_PortableServer_Export tao_RequestProcessingPolicy_cast
   {
-  public:
-    RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &);
-    RequestProcessingPolicy_out (RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_out (const RequestProcessingPolicy_out &);
-    RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_out &);
-    RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_ptr);
-    operator RequestProcessingPolicy_ptr &();
-    RequestProcessingPolicy_ptr &ptr (void);
-    RequestProcessingPolicy_ptr operator-> (void);
-  
-  private:
-    RequestProcessingPolicy_ptr &ptr_;
+    static RequestProcessingPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-  
+
   class TAO_PortableServer_Export RequestProcessingPolicy
     : public virtual CORBA::Policy
   {
@@ -1929,152 +1166,103 @@ TAO_NAMESPACE  PortableServer
     typedef RequestProcessingPolicy_ptr _ptr_type;
     typedef RequestProcessingPolicy_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-    
+
     static RequestProcessingPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestProcessingPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestProcessingPolicy_ptr _nil (void)
       {
         return (RequestProcessingPolicy_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::RequestProcessingPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     RequestProcessingPolicy (void);
     virtual ~RequestProcessingPolicy (void);
-    
+
   private:
     RequestProcessingPolicy (const RequestProcessingPolicy &);
     void operator= (const RequestProcessingPolicy &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicy;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-#if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
-#define _PORTABLESERVER_POAMANAGER___PTR_CH_
-  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_POAMANAGER__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_POAMANAGER__ODDS_N_ENDS_CH_
+
   class POAManager;
   typedef POAManager *POAManager_ptr;
+  struct tao_POAManager_life;
+  typedef TAO_Objref_Var_T<POAManager, tao_POAManager_life> POAManager_var;
+  typedef TAO_Objref_Out_T<POAManager, tao_POAManager_life> POAManager_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_)
-#define _PORTABLESERVER_POAMANAGER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export POAManager_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_POAManager_life
   {
-  public:
-    POAManager_var (void); // default constructor
-    POAManager_var (POAManager_ptr p) : ptr_ (p) {} 
-    POAManager_var (const POAManager_var &); // copy constructor
-    ~POAManager_var (void); // destructor
-    
-    POAManager_var &operator= (POAManager_ptr);
-    POAManager_var &operator= (const POAManager_var &);
-    POAManager_ptr operator-> (void) const;
-    
-    operator const POAManager_ptr &() const;
-    operator POAManager_ptr &();
-    // in, inout, out, _retn 
-    POAManager_ptr in (void) const;
-    POAManager_ptr &inout (void);
-    POAManager_ptr &out (void);
-    POAManager_ptr _retn (void);
-    POAManager_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static POAManager_ptr tao_duplicate (POAManager_ptr);
     static void tao_release (POAManager_ptr);
     static POAManager_ptr tao_nil (void);
-    static POAManager_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        POAManager_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    POAManager_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    POAManager_var (const TAO_Base_var &rhs);
-    POAManager_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POAMANAGER___OUT_CH_)
-#define _PORTABLESERVER_POAMANAGER___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export POAManager_out
+  struct TAO_PortableServer_Export tao_POAManager_cast
   {
-  public:
-    POAManager_out (POAManager_ptr &);
-    POAManager_out (POAManager_var &);
-    POAManager_out (const POAManager_out &);
-    POAManager_out &operator= (const POAManager_out &);
-    POAManager_out &operator= (const POAManager_var &);
-    POAManager_out &operator= (POAManager_ptr);
-    operator POAManager_ptr &();
-    POAManager_ptr &ptr (void);
-    POAManager_ptr operator-> (void);
-  
-  private:
-    POAManager_ptr &ptr_;
+    static POAManager_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_POAMANAGER_CH_)
 #define _PORTABLESERVER_POAMANAGER_CH_
-  
+
   class TAO_PortableServer_Export POAManager
     : public virtual CORBA::Object
   {
@@ -2082,45 +1270,45 @@ TAO_NAMESPACE  PortableServer
     typedef POAManager_ptr _ptr_type;
     typedef POAManager_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static POAManager_ptr _duplicate (POAManager_ptr obj);
-    
+
     static POAManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static POAManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static POAManager_ptr _nil (void)
       {
         return (POAManager_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
 #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
-    
+
     class TAO_PortableServer_Export AdapterInactive : public CORBA::UserException
     {
     public:
-      
+
       AdapterInactive (void);
       AdapterInactive (const AdapterInactive &);
       ~AdapterInactive (void);
 
       AdapterInactive &operator= (const AdapterInactive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static AdapterInactive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2132,28 +1320,28 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_AdapterInactive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-    
+
     enum State
     {
       HOLDING,
@@ -2161,17 +1349,17 @@ TAO_NAMESPACE  PortableServer
       DISCARDING,
       INACTIVE
     };
-    
+
     typedef State &State_out;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_State;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void activate (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2179,12 +1367,12 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void hold_requests (
         CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2193,10 +1381,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void discard_requests (
         CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2205,10 +1393,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void deactivate (
         CORBA::Boolean etherealize_objects,
         CORBA::Boolean wait_for_completion
@@ -2218,138 +1406,85 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-    
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POAManager::State get_state (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     POAManager (void);
     virtual ~POAManager (void);
-    
-    friend class _TAO_POAManager_Remote_Proxy_Impl;
-    friend class _TAO_POAManager_ThruPOA_Proxy_Impl;
-    friend class _TAO_POAManager_Direct_Proxy_Impl;
-  
+
   private:
     POAManager (const POAManager &);
     void operator= (const POAManager &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAManager;
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
-  
   class AdapterActivator;
   typedef AdapterActivator *AdapterActivator_ptr;
+  struct tao_AdapterActivator_life;
+  typedef TAO_Objref_Var_T<AdapterActivator, tao_AdapterActivator_life> AdapterActivator_var;
+  typedef TAO_Objref_Out_T<AdapterActivator, tao_AdapterActivator_life> AdapterActivator_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export AdapterActivator_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_AdapterActivator_life
   {
-  public:
-    AdapterActivator_var (void); // default constructor
-    AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {} 
-    AdapterActivator_var (const AdapterActivator_var &); // copy constructor
-    ~AdapterActivator_var (void); // destructor
-    
-    AdapterActivator_var &operator= (AdapterActivator_ptr);
-    AdapterActivator_var &operator= (const AdapterActivator_var &);
-    AdapterActivator_ptr operator-> (void) const;
-    
-    operator const AdapterActivator_ptr &() const;
-    operator AdapterActivator_ptr &();
-    // in, inout, out, _retn 
-    AdapterActivator_ptr in (void) const;
-    AdapterActivator_ptr &inout (void);
-    AdapterActivator_ptr &out (void);
-    AdapterActivator_ptr _retn (void);
-    AdapterActivator_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static AdapterActivator_ptr tao_duplicate (AdapterActivator_ptr);
     static void tao_release (AdapterActivator_ptr);
     static AdapterActivator_ptr tao_nil (void);
-    static AdapterActivator_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        AdapterActivator_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    AdapterActivator_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    AdapterActivator_var (const TAO_Base_var &rhs);
-    AdapterActivator_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export AdapterActivator_out
+  struct TAO_PortableServer_Export tao_AdapterActivator_cast
   {
-  public:
-    AdapterActivator_out (AdapterActivator_ptr &);
-    AdapterActivator_out (AdapterActivator_var &);
-    AdapterActivator_out (const AdapterActivator_out &);
-    AdapterActivator_out &operator= (const AdapterActivator_out &);
-    AdapterActivator_out &operator= (const AdapterActivator_var &);
-    AdapterActivator_out &operator= (AdapterActivator_ptr);
-    operator AdapterActivator_ptr &();
-    AdapterActivator_ptr &ptr (void);
-    AdapterActivator_ptr operator-> (void);
-  
-  private:
-    AdapterActivator_ptr &ptr_;
+    static AdapterActivator_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
-  
+
   class TAO_PortableServer_Export AdapterActivator
     : public virtual CORBA::Object
   {
@@ -2357,30 +1492,30 @@ TAO_NAMESPACE  PortableServer
     typedef AdapterActivator_ptr _ptr_type;
     typedef AdapterActivator_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-    
+
     static AdapterActivator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AdapterActivator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static AdapterActivator_ptr _nil (void)
       {
         return (AdapterActivator_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean unknown_adapter (
         PortableServer::POA_ptr parent,
         const char * name
@@ -2389,120 +1524,71 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     AdapterActivator (void);
     virtual ~AdapterActivator (void);
-    
+
   private:
     AdapterActivator (const AdapterActivator &);
     void operator= (const AdapterActivator &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterActivator;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_SERVANTMANAGER__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___PTR_CH_
-  
   class ServantManager;
   typedef ServantManager *ServantManager_ptr;
+  struct tao_ServantManager_life;
+  typedef TAO_Objref_Var_T<ServantManager, tao_ServantManager_life> ServantManager_var;
+  typedef TAO_Objref_Out_T<ServantManager, tao_ServantManager_life> ServantManager_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ServantManager_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_ServantManager_life
   {
-  public:
-    ServantManager_var (void); // default constructor
-    ServantManager_var (ServantManager_ptr p) : ptr_ (p) {} 
-    ServantManager_var (const ServantManager_var &); // copy constructor
-    ~ServantManager_var (void); // destructor
-    
-    ServantManager_var &operator= (ServantManager_ptr);
-    ServantManager_var &operator= (const ServantManager_var &);
-    ServantManager_ptr operator-> (void) const;
-    
-    operator const ServantManager_ptr &() const;
-    operator ServantManager_ptr &();
-    // in, inout, out, _retn 
-    ServantManager_ptr in (void) const;
-    ServantManager_ptr &inout (void);
-    ServantManager_ptr &out (void);
-    ServantManager_ptr _retn (void);
-    ServantManager_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServantManager_ptr tao_duplicate (ServantManager_ptr);
     static void tao_release (ServantManager_ptr);
     static ServantManager_ptr tao_nil (void);
-    static ServantManager_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServantManager_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServantManager_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServantManager_var (const TAO_Base_var &rhs);
-    ServantManager_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ServantManager_out
+  struct TAO_PortableServer_Export tao_ServantManager_cast
   {
-  public:
-    ServantManager_out (ServantManager_ptr &);
-    ServantManager_out (ServantManager_var &);
-    ServantManager_out (const ServantManager_out &);
-    ServantManager_out &operator= (const ServantManager_out &);
-    ServantManager_out &operator= (const ServantManager_var &);
-    ServantManager_out &operator= (ServantManager_ptr);
-    operator ServantManager_ptr &();
-    ServantManager_ptr &ptr (void);
-    ServantManager_ptr operator-> (void);
-  
-  private:
-    ServantManager_ptr &ptr_;
+    static ServantManager_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER_CH_
-  
+
   class TAO_PortableServer_Export ServantManager
     : public virtual CORBA::Object
   {
@@ -2510,140 +1596,91 @@ TAO_NAMESPACE  PortableServer
     typedef ServantManager_ptr _ptr_type;
     typedef ServantManager_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-    
+
     static ServantManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantManager_ptr _nil (void)
       {
         return (ServantManager_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ServantManager (void);
     virtual ~ServantManager (void);
-    
+
   private:
     ServantManager (const ServantManager &);
     void operator= (const ServantManager &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantManager;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_SERVANTACTIVATOR__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_
-  
   class ServantActivator;
   typedef ServantActivator *ServantActivator_ptr;
+  struct tao_ServantActivator_life;
+  typedef TAO_Objref_Var_T<ServantActivator, tao_ServantActivator_life> ServantActivator_var;
+  typedef TAO_Objref_Out_T<ServantActivator, tao_ServantActivator_life> ServantActivator_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ServantActivator_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_ServantActivator_life
   {
-  public:
-    ServantActivator_var (void); // default constructor
-    ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {} 
-    ServantActivator_var (const ServantActivator_var &); // copy constructor
-    ~ServantActivator_var (void); // destructor
-    
-    ServantActivator_var &operator= (ServantActivator_ptr);
-    ServantActivator_var &operator= (const ServantActivator_var &);
-    ServantActivator_ptr operator-> (void) const;
-    
-    operator const ServantActivator_ptr &() const;
-    operator ServantActivator_ptr &();
-    // in, inout, out, _retn 
-    ServantActivator_ptr in (void) const;
-    ServantActivator_ptr &inout (void);
-    ServantActivator_ptr &out (void);
-    ServantActivator_ptr _retn (void);
-    ServantActivator_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServantActivator_ptr tao_duplicate (ServantActivator_ptr);
     static void tao_release (ServantActivator_ptr);
     static ServantActivator_ptr tao_nil (void);
-    static ServantActivator_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServantActivator_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServantActivator_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServantActivator_var (const TAO_Base_var &rhs);
-    ServantActivator_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ServantActivator_out
+  struct TAO_PortableServer_Export tao_ServantActivator_cast
   {
-  public:
-    ServantActivator_out (ServantActivator_ptr &);
-    ServantActivator_out (ServantActivator_var &);
-    ServantActivator_out (const ServantActivator_out &);
-    ServantActivator_out &operator= (const ServantActivator_out &);
-    ServantActivator_out &operator= (const ServantActivator_var &);
-    ServantActivator_out &operator= (ServantActivator_ptr);
-    operator ServantActivator_ptr &();
-    ServantActivator_ptr &ptr (void);
-    ServantActivator_ptr operator-> (void);
-  
-  private:
-    ServantActivator_ptr &ptr_;
+    static ServantActivator_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR_CH_
-  
+
   class TAO_PortableServer_Export ServantActivator
     : public virtual PortableServer::ServantManager
   {
@@ -2651,30 +1688,30 @@ TAO_NAMESPACE  PortableServer
     typedef ServantActivator_ptr _ptr_type;
     typedef ServantActivator_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-    
+
     static ServantActivator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantActivator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantActivator_ptr _nil (void)
       {
         return (ServantActivator_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant incarnate (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter
@@ -2690,10 +1727,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void etherealize (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -2705,120 +1742,71 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ServantActivator (void);
     virtual ~ServantActivator (void);
-    
+
   private:
     ServantActivator (const ServantActivator &);
     void operator= (const ServantActivator &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantActivator;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_SERVANTLOCATOR__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_SERVANTLOCATOR__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___PTR_CH_
-  
   class ServantLocator;
   typedef ServantLocator *ServantLocator_ptr;
+  struct tao_ServantLocator_life;
+  typedef TAO_Objref_Var_T<ServantLocator, tao_ServantLocator_life> ServantLocator_var;
+  typedef TAO_Objref_Out_T<ServantLocator, tao_ServantLocator_life> ServantLocator_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export ServantLocator_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_ServantLocator_life
   {
-  public:
-    ServantLocator_var (void); // default constructor
-    ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {} 
-    ServantLocator_var (const ServantLocator_var &); // copy constructor
-    ~ServantLocator_var (void); // destructor
-    
-    ServantLocator_var &operator= (ServantLocator_ptr);
-    ServantLocator_var &operator= (const ServantLocator_var &);
-    ServantLocator_ptr operator-> (void) const;
-    
-    operator const ServantLocator_ptr &() const;
-    operator ServantLocator_ptr &();
-    // in, inout, out, _retn 
-    ServantLocator_ptr in (void) const;
-    ServantLocator_ptr &inout (void);
-    ServantLocator_ptr &out (void);
-    ServantLocator_ptr _retn (void);
-    ServantLocator_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServantLocator_ptr tao_duplicate (ServantLocator_ptr);
     static void tao_release (ServantLocator_ptr);
     static ServantLocator_ptr tao_nil (void);
-    static ServantLocator_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServantLocator_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServantLocator_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServantLocator_var (const TAO_Base_var &rhs);
-    ServantLocator_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export ServantLocator_out
+  struct TAO_PortableServer_Export tao_ServantLocator_cast
   {
-  public:
-    ServantLocator_out (ServantLocator_ptr &);
-    ServantLocator_out (ServantLocator_var &);
-    ServantLocator_out (const ServantLocator_out &);
-    ServantLocator_out &operator= (const ServantLocator_out &);
-    ServantLocator_out &operator= (const ServantLocator_var &);
-    ServantLocator_out &operator= (ServantLocator_ptr);
-    operator ServantLocator_ptr &();
-    ServantLocator_ptr &ptr (void);
-    ServantLocator_ptr operator-> (void);
-  
-  private:
-    ServantLocator_ptr &ptr_;
+    static ServantLocator_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR_CH_
-  
+
   class TAO_PortableServer_Export ServantLocator
     : public virtual PortableServer::ServantManager
   {
@@ -2828,30 +1816,30 @@ TAO_NAMESPACE  PortableServer
     typedef ServantLocator_ptr _ptr_type;
     typedef ServantLocator_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-    
+
     static ServantLocator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantLocator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantLocator_ptr _nil (void)
       {
         return (ServantLocator_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant preinvoke (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -2869,10 +1857,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void postinvoke (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -2884,122 +1872,39 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     ServantLocator (void);
     virtual ~ServantLocator (void);
-    
+
   private:
     ServantLocator (const ServantLocator &);
     void operator= (const ServantLocator &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantLocator;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
-
-#if !defined (_PORTABLESERVER_POA___PTR_CH_)
-#define _PORTABLESERVER_POA___PTR_CH_
-  
-  class POA;
-  typedef POA *POA_ptr;
-
-#endif /* end #if !defined */
 
-#if !defined (_PORTABLESERVER_POA___VAR_CH_)
-#define _PORTABLESERVER_POA___VAR_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export POA_var : public TAO_Base_var
-  {
-  public:
-    POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {} 
-    POA_var (const POA_var &); // copy constructor
-    ~POA_var (void); // destructor
-    
-    POA_var &operator= (POA_ptr);
-    POA_var &operator= (const POA_var &);
-    POA_ptr operator-> (void) const;
-    
-    operator const POA_ptr &() const;
-    operator POA_ptr &();
-    // in, inout, out, _retn 
-    POA_ptr in (void) const;
-    POA_ptr &inout (void);
-    POA_ptr &out (void);
-    POA_ptr _retn (void);
-    POA_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
-    static POA_ptr tao_duplicate (POA_ptr);
-    static void tao_release (POA_ptr);
-    static POA_ptr tao_nil (void);
-    static POA_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
-      );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    POA_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    POA_var (const TAO_Base_var &rhs);
-    POA_var &operator= (const TAO_Base_var &rhs);
-  };
-
-#endif /* end #if !defined */
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#if !defined (_PORTABLESERVER_POA___OUT_CH_)
-#define _PORTABLESERVER_POA___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export POA_out
-  {
-  public:
-    POA_out (POA_ptr &);
-    POA_out (POA_var &);
-    POA_out (const POA_out &);
-    POA_out &operator= (const POA_out &);
-    POA_out &operator= (const POA_var &);
-    POA_out &operator= (POA_ptr);
-    operator POA_ptr &();
-    POA_ptr &ptr (void);
-    POA_ptr operator-> (void);
-  
-  private:
-    POA_ptr &ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantLocator;
 
-#endif /* end #if !defined */
-  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
-  
+
   class TAO_PortableServer_Export POA
     : public virtual CORBA::Object
   {
@@ -3007,50 +1912,50 @@ TAO_NAMESPACE  PortableServer
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
-    
+
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static POA_ptr _nil (void)
       {
         return (POA_ptr)0;
       }
-    
+
     virtual TAO_POA* _tao_poa_downcast (void)
       {
         return 0;
       }
 
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
 #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-    
+
     class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException
     {
     public:
-      
+
       AdapterAlreadyExists (void);
       AdapterAlreadyExists (const AdapterAlreadyExists &);
       ~AdapterAlreadyExists (void);
 
       AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static AdapterAlreadyExists *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3062,43 +1967,43 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_AdapterAlreadyExists;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
 #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
-    
+
     class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException
     {
     public:
-      
+
       AdapterNonExistent (void);
       AdapterNonExistent (const AdapterNonExistent &);
       ~AdapterNonExistent (void);
 
       AdapterNonExistent &operator= (const AdapterNonExistent &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static AdapterNonExistent *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3110,44 +2015,44 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_AdapterNonExistent;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
 #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
-    
+
     class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException
     {
     public:
-      
+
       CORBA::UShort index;
       InvalidPolicy (void);
       InvalidPolicy (const InvalidPolicy &);
       ~InvalidPolicy (void);
 
       InvalidPolicy &operator= (const InvalidPolicy &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static InvalidPolicy *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3159,32 +2064,32 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-      
+
       InvalidPolicy (
           CORBA::UShort _tao_index
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_InvalidPolicy;
 
 #endif /* end #if !defined */
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
@@ -3192,19 +2097,19 @@ TAO_NAMESPACE  PortableServer
 
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
-    
+
     class TAO_PortableServer_Export NoServant : public CORBA::UserException
     {
     public:
-      
+
       NoServant (void);
       NoServant (const NoServant &);
       ~NoServant (void);
 
       NoServant &operator= (const NoServant &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static NoServant *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3216,25 +2121,25 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_NoServant;
 
 #endif /* end #if !defined */
-    
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
@@ -3242,19 +2147,19 @@ TAO_NAMESPACE  PortableServer
 
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-    
+
     class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException
     {
     public:
-      
+
       ObjectAlreadyActive (void);
       ObjectAlreadyActive (const ObjectAlreadyActive &);
       ~ObjectAlreadyActive (void);
 
       ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static ObjectAlreadyActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3266,43 +2171,43 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_ObjectAlreadyActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
-    
+
     class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException
     {
     public:
-      
+
       ObjectNotActive (void);
       ObjectNotActive (const ObjectNotActive &);
       ~ObjectNotActive (void);
 
       ObjectNotActive &operator= (const ObjectNotActive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static ObjectNotActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3314,43 +2219,43 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_ObjectNotActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-    
+
     class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException
     {
     public:
-      
+
       ServantAlreadyActive (void);
       ServantAlreadyActive (const ServantAlreadyActive &);
       ~ServantAlreadyActive (void);
 
       ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static ServantAlreadyActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3362,43 +2267,43 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_ServantAlreadyActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
-    
+
     class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException
     {
     public:
-      
+
       ServantNotActive (void);
       ServantNotActive (const ServantNotActive &);
       ~ServantNotActive (void);
 
       ServantNotActive &operator= (const ServantNotActive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static ServantNotActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3410,43 +2315,43 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_ServantNotActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
 #define _PORTABLESERVER_POA_WRONGADAPTER_CH_
-    
+
     class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException
     {
     public:
-      
+
       WrongAdapter (void);
       WrongAdapter (const WrongAdapter &);
       ~WrongAdapter (void);
 
       WrongAdapter &operator= (const WrongAdapter &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static WrongAdapter *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3458,43 +2363,43 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_WrongAdapter;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
 #define _PORTABLESERVER_POA_WRONGPOLICY_CH_
-    
+
     class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException
     {
     public:
-      
+
       WrongPolicy (void);
       WrongPolicy (const WrongPolicy &);
       ~WrongPolicy (void);
 
       WrongPolicy &operator= (const WrongPolicy &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static WrongPolicy *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -3506,28 +2411,28 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_WrongPolicy;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr create_POA (
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
@@ -3539,10 +2444,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::AdapterAlreadyExists
         , PortableServer::POA::InvalidPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr find_POA (
         const char * adapter_name,
         CORBA::Boolean activate_it
@@ -3552,10 +2457,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::AdapterNonExistent
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         CORBA::Boolean etherealize_objects,
         CORBA::Boolean wait_for_completion
@@ -3564,12 +2469,12 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
         PortableServer::ThreadPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3577,12 +2482,12 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
         PortableServer::LifespanPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3590,10 +2495,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
         PortableServer::IdUniquenessPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3601,10 +2506,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
         PortableServer::IdAssignmentPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3612,12 +2517,12 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
         PortableServer::ImplicitActivationPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3625,10 +2530,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
         PortableServer::ServantRetentionPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3636,10 +2541,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
         PortableServer::RequestProcessingPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3647,64 +2552,64 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * the_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr the_parent (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POAList * the_children (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POAManager_ptr the_POAManager (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::AdapterActivator_ptr the_activator (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void the_activator (
         PortableServer::AdapterActivator_ptr the_activator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3712,10 +2617,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -3723,10 +2628,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3735,10 +2640,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant get_servant (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -3747,10 +2652,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::NoServant
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_servant (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3759,12 +2664,12 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * activate_object (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3774,10 +2679,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ServantAlreadyActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void activate_object_with_id (
         const PortableServer::ObjectId & id,
         PortableServer::Servant p_servant
@@ -3789,10 +2694,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ObjectAlreadyActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void deactivate_object (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3802,10 +2707,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr create_reference (
         const char * intf
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3814,10 +2719,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId & oid,
         const char * intf
@@ -3827,10 +2732,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * servant_to_id (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3840,10 +2745,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ServantNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr servant_to_reference (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3853,10 +2758,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ServantNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant reference_to_servant (
         CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3867,10 +2772,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::WrongAdapter
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * reference_to_id (
         CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3880,10 +2785,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::WrongAdapter
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3893,10 +2798,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr id_to_reference (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3906,22 +2811,22 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * create_id_for_reference (
         CORBA::Object_ptr the_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3930,10 +2835,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::IDs * reference_to_ids (
         CORBA::Object_ptr the_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3942,10 +2847,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void associate_reference_with_id (
         CORBA::Object_ptr ref,
         const PortableServer::ObjectId & oid
@@ -3955,10 +2860,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void disassociate_reference_with_id (
         CORBA::Object_ptr ref,
         const PortableServer::ObjectId & oid
@@ -3968,122 +2873,73 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-    
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     POA (void);
     virtual ~POA (void);
-    
+
   private:
     POA (const POA &);
     void operator= (const POA &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+
+#if !defined (_PORTABLESERVER_CURRENT__ODDS_N_ENDS_CH_)
+#define _PORTABLESERVER_CURRENT__ODDS_N_ENDS_CH_
 
-#if !defined (_PORTABLESERVER_CURRENT___PTR_CH_)
-#define _PORTABLESERVER_CURRENT___PTR_CH_
-  
   class Current;
   typedef Current *Current_ptr;
+  struct tao_Current_life;
+  typedef TAO_Objref_Var_T<Current, tao_Current_life> Current_var;
+  typedef TAO_Objref_Out_T<Current, tao_Current_life> Current_out;
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_CURRENT___VAR_CH_)
-#define _PORTABLESERVER_CURRENT___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_PortableServer_Export Current_var : public TAO_Base_var
+  struct TAO_PortableServer_Export tao_Current_life
   {
-  public:
-    Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {} 
-    Current_var (const Current_var &); // copy constructor
-    ~Current_var (void); // destructor
-    
-    Current_var &operator= (Current_ptr);
-    Current_var &operator= (const Current_var &);
-    Current_ptr operator-> (void) const;
-    
-    operator const Current_ptr &() const;
-    operator Current_ptr &();
-    // in, inout, out, _retn 
-    Current_ptr in (void) const;
-    Current_ptr &inout (void);
-    Current_ptr &out (void);
-    Current_ptr _retn (void);
-    Current_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Current_ptr tao_duplicate (Current_ptr);
     static void tao_release (Current_ptr);
     static Current_ptr tao_nil (void);
-    static Current_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Current_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Current_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Current_var (const TAO_Base_var &rhs);
-    Current_var &operator= (const TAO_Base_var &rhs);
   };
 
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_CURRENT___OUT_CH_)
-#define _PORTABLESERVER_CURRENT___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_PortableServer_Export Current_out
+  struct TAO_PortableServer_Export tao_Current_cast
   {
-  public:
-    Current_out (Current_ptr &);
-    Current_out (Current_var &);
-    Current_out (const Current_out &);
-    Current_out &operator= (const Current_out &);
-    Current_out &operator= (const Current_var &);
-    Current_out &operator= (Current_ptr);
-    operator Current_ptr &();
-    Current_ptr &ptr (void);
-    Current_ptr operator-> (void);
-  
-  private:
-    Current_ptr &ptr_;
+    static Current_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_CURRENT_CH_)
 #define _PORTABLESERVER_CURRENT_CH_
-  
+
   class TAO_PortableServer_Export Current
     : public virtual CORBA::Current
   {
@@ -4091,45 +2947,45 @@ TAO_NAMESPACE  PortableServer
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
     static int _tao_class_id;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
 #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
-    
+
     class TAO_PortableServer_Export NoContext : public CORBA::UserException
     {
     public:
-      
+
       NoContext (void);
       NoContext (const NoContext &);
       ~NoContext (void);
 
       NoContext &operator= (const NoContext &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static NoContext *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -4141,28 +2997,28 @@ TAO_NAMESPACE  PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-      
+
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr _tc_NoContext;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr get_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -4170,10 +3026,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::Current::NoContext
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * get_object_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -4181,29 +3037,29 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::Current::NoContext
       )) = 0;
-    
+
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
-    
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     Current (void);
     virtual ~Current (void);
-    
+
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
   TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
@@ -4219,11 +3075,16 @@ TAO_NAMESPACE_CLOSE // module PortableServer
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
-
+/*
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ObjectId &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
+*/
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAList &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAList*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAList *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAList *&);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
@@ -4520,23 +3381,6 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const
 
 #ifndef __ACE_INLINE__
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_PortableServer_ObjectId_H_
-#define _TAO_CDR_OP_PortableServer_ObjectId_H_
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::ObjectId &
-  );
-TAO_PortableServer_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    PortableServer::ObjectId &
-  );
-
-#endif /* _TAO_CDR_OP_PortableServer_ObjectId_H_ */
-
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 // TAO_IDL - Generated from
@@ -4626,7 +3470,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "PortableServerC.i"
@@ -4642,4 +3486,3 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index 2c36e34a1fa..1f2816eb6b4 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -20,1170 +20,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_
-
-ACE_INLINE
-PortableServer::POA **
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (CORBA::ULong nelems)
-{
-  PortableServer::POA **buf = 0;
-  
-  ACE_NEW_RETURN (buf, PortableServer::POA*[nelems], 0);
-  
-  for (CORBA::ULong i = 0; i < nelems; i++)
-    {
-      buf[i] = PortableServer::POA::_nil ();
-    }
-  
-  return buf;
-}
-
-ACE_INLINE
-void 
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (PortableServer::POA **buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-  
-  delete[] buffer;
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
-{
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    PortableServer::POA* *value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList(
-    const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      PortableServer::POA **tmp1 =
-        _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
-      PortableServer::POA ** const tmp2 =
-        ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList &
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator= (
-    const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      PortableServer::POA **tmp =
-        ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          CORBA::release (tmp[i]);
-          tmp[i] = PortableServer::POA::_nil ();
-        }
-      
-      if (this->maximum_ < rhs.maximum_)
-        {
-          _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
-          this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  PortableServer::POA **tmp1 =
-    ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
-  
-  PortableServer::POA ** const tmp2 =
-    ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator[] (CORBA::ULong index) const
-{
-  ACE_ASSERT (index < this->maximum_);
-  PortableServer::POA ** const tmp =
-    ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> (tmp + index, this->release_);
-}
-
-ACE_INLINE
-PortableServer::POA* *
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (CORBA::Boolean orphan)
-{
-  PortableServer::POA **result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(PortableServer::POA**,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const PortableServer::POA* *
-PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_PORTABLESERVER_POALIST_CI_)
-#define _PORTABLESERVER_POALIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class PortableServer::POAList_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POAList_var::POAList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-PortableServer::POAList_var::POAList_var (POAList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-PortableServer::POAList_var::POAList_var (const ::PortableServer::POAList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::PortableServer::POAList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-PortableServer::POAList_var::~POAList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAList_var &
-PortableServer::POAList_var::operator= (POAList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::PortableServer::POAList_var &
-PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          POAList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              POAList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              POAList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::PortableServer::POAList *
-PortableServer::POAList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::POAList *
-PortableServer::POAList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAList_var::operator const ::PortableServer::POAList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
-PortableServer::POAList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::PortableServer::POAList &
-PortableServer::POAList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::POAList &
-PortableServer::POAList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::POAList *&
-PortableServer::POAList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::POAList *
-PortableServer::POAList_var::_retn (void)
-{
-  ::PortableServer::POAList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::PortableServer::POAList *
-PortableServer::POAList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class PortableServer::POAList_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POAList_out::POAList_out (POAList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::POAList_out::POAList_out (POAList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::POAList_out::POAList_out (const ::PortableServer::POAList_out &p)
-  : ptr_ (ACE_const_cast (POAList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::PortableServer::POAList_out &
-PortableServer::POAList_out::operator= (const ::PortableServer::POAList_out &p)
-{
-  this->ptr_ = ACE_const_cast (POAList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::PortableServer::POAList_out &
-PortableServer::POAList_out::operator= (POAList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POAList_out::operator ::PortableServer::POAList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::POAList *&
-PortableServer::POAList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::POAList *
-PortableServer::POAList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
-PortableServer::POAList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_OBJECTID_CI_)
-#define _PORTABLESERVER_OBJECTID_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class PortableServer::ObjectId_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ObjectId_var::ObjectId_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-PortableServer::ObjectId_var::ObjectId_var (ObjectId *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::PortableServer::ObjectId (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size base types only.
-ACE_INLINE
-PortableServer::ObjectId_var::ObjectId_var (const ::PortableServer::ObjectId &p)
-{
-  ACE_NEW (this->ptr_, ::PortableServer::ObjectId (p));
-}
-
-ACE_INLINE
-PortableServer::ObjectId_var::~ObjectId_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ObjectId_var &
-PortableServer::ObjectId_var::operator= (ObjectId *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId_var &
-PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ObjectId *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ObjectId (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ObjectId *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// Fixed-size types only.
-ACE_INLINE
-::PortableServer::ObjectId_var &
-PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId &p)
-{
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::PortableServer::ObjectId (p), *this);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::PortableServer::ObjectId *
-PortableServer::ObjectId_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId *
-PortableServer::ObjectId_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ObjectId_var::operator const ::PortableServer::ObjectId &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Octet &
-PortableServer::ObjectId_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::Octet &
-PortableServer::ObjectId_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::PortableServer::ObjectId &
-PortableServer::ObjectId_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId &
-PortableServer::ObjectId_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId *&
-PortableServer::ObjectId_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId *
-PortableServer::ObjectId_var::_retn (void)
-{
-  ::PortableServer::ObjectId *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId *
-PortableServer::ObjectId_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class PortableServer::ObjectId_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ObjectId_out::ObjectId_out (ObjectId *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::ObjectId_out::ObjectId_out (ObjectId_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::ObjectId_out::ObjectId_out (const ::PortableServer::ObjectId_out &p)
-  : ptr_ (ACE_const_cast (ObjectId_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::PortableServer::ObjectId_out &
-PortableServer::ObjectId_out::operator= (const ::PortableServer::ObjectId_out &p)
-{
-  this->ptr_ = ACE_const_cast (ObjectId_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId_out &
-PortableServer::ObjectId_out::operator= (ObjectId *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ObjectId_out::operator ::PortableServer::ObjectId *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId *&
-PortableServer::ObjectId_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::ObjectId *
-PortableServer::ObjectId_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Octet &
-PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CI_
-
-ACE_INLINE
-PortableServer::ObjectId *
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (CORBA::ULong size)
-{
-  PortableServer::ObjectId *retval = 0;
-  ACE_NEW_RETURN (retval, PortableServer::ObjectId[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (PortableServer::ObjectId *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (void)
-{
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    PortableServer::ObjectId *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (
-    const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      PortableServer::ObjectId *tmp1 =
-        _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (this->maximum_);
-      PortableServer::ObjectId * const tmp2 =
-        ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs &
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator= (
-    const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          PortableServer::ObjectId *tmp =
-            ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  PortableServer::ObjectId *tmp1 =
-    ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
-  PortableServer::ObjectId * const tmp2 =
-    ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-PortableServer::ObjectId &
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  PortableServer::ObjectId* tmp =
-    ACE_reinterpret_cast (PortableServer::ObjectId*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const PortableServer::ObjectId &
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  PortableServer::ObjectId * const tmp =
-    ACE_reinterpret_cast (PortableServer::ObjectId* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-PortableServer::ObjectId *
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::get_buffer (CORBA::Boolean orphan)
-{
-  PortableServer::ObjectId *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (PortableServer::ObjectId*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(PortableServer::ObjectId*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const PortableServer::ObjectId *
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const PortableServer::ObjectId * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    PortableServer::ObjectId *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      PortableServer::ObjectId *tmp =
-        ACE_reinterpret_cast (PortableServer::ObjectId*, this->buffer_);
-      _TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_PORTABLESERVER_IDS_CI_)
-#define _PORTABLESERVER_IDS_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class PortableServer::IDs_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IDs_var::IDs_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-PortableServer::IDs_var::IDs_var (IDs *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-PortableServer::IDs_var::IDs_var (const ::PortableServer::IDs_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::PortableServer::IDs (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-PortableServer::IDs_var::~IDs_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IDs_var &
-PortableServer::IDs_var::operator= (IDs *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::PortableServer::IDs_var &
-PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          IDs *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              IDs (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              IDs *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::PortableServer::IDs *
-PortableServer::IDs_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::IDs *
-PortableServer::IDs_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IDs_var::operator const ::PortableServer::IDs &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ObjectId &
-PortableServer::IDs_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const PortableServer::ObjectId &
-PortableServer::IDs_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const PortableServer::ObjectId &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::PortableServer::IDs &
-PortableServer::IDs_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::IDs &
-PortableServer::IDs_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::IDs *&
-PortableServer::IDs_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::IDs *
-PortableServer::IDs_var::_retn (void)
-{
-  ::PortableServer::IDs *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::PortableServer::IDs *
-PortableServer::IDs_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class PortableServer::IDs_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IDs_out::IDs_out (IDs *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::IDs_out::IDs_out (IDs_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::IDs_out::IDs_out (const ::PortableServer::IDs_out &p)
-  : ptr_ (ACE_const_cast (IDs_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::PortableServer::IDs_out &
-PortableServer::IDs_out::operator= (const ::PortableServer::IDs_out &p)
-{
-  this->ptr_ = ACE_const_cast (IDs_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::PortableServer::IDs_out &
-PortableServer::IDs_out::operator= (IDs *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::IDs_out::operator ::PortableServer::IDs *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::IDs *&
-PortableServer::IDs_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::PortableServer::IDs *
-PortableServer::IDs_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ObjectId &
-PortableServer::IDs_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_THREADPOLICY___CI_)
 #define _PORTABLESERVER_THREADPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1213,21 +55,11 @@ TAO::Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___CI_)
 #define _PORTABLESERVER_LIFESPANPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1263,13 +95,6 @@ TAO::Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___CI_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1304,14 +129,6 @@ TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputC
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___CI_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1341,21 +158,11 @@ TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputC
 
 #endif /* end #if !defined */
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1390,14 +197,6 @@ TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1425,6 +224,7 @@ TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_In
   return 0;
 }
 
+
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
@@ -1432,14 +232,6 @@ TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_In
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1469,21 +261,12 @@ TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_I
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_POAMANAGER___CI_)
 #define _PORTABLESERVER_POAMANAGER___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableServer::POAManager::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1513,21 +296,11 @@ TAO::Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
 
 #endif /* end #if !defined */
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___CI_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1563,13 +336,6 @@ TAO::Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___CI_)
 #define _PORTABLESERVER_SERVANTMANAGER___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableServer::ServantManager::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1604,14 +370,6 @@ TAO::Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___CI_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___CI_
-
-ACE_INLINE
-CORBA::Boolean
-PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1647,13 +405,6 @@ TAO::Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___CI_)
 #define _PORTABLESERVER_SERVANTLOCATOR___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1683,21 +434,12 @@ TAO::Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_PORTABLESERVER_POA___CI_)
 #define _PORTABLESERVER_POA___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableServer::POA::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1733,13 +475,6 @@ TAO::Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
 #if !defined (_PORTABLESERVER_CURRENT___CI_)
 #define _PORTABLESERVER_CURRENT___CI_
 
-ACE_INLINE
-CORBA::Boolean
-PortableServer::Current::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1769,28 +504,10 @@ TAO::Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_PortableServer_ObjectId_I_
-#define _TAO_CDR_OP_PortableServer_ObjectId_I_
-
-CORBA::Boolean TAO_PortableServer_Export operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::ObjectId &
-  );
-
-CORBA::Boolean TAO_PortableServer_Export operator>> (
-    TAO_InputCDR &,
-    PortableServer::ObjectId &
-  );
-
-#endif /* _TAO_CDR_OP_PortableServer_ObjectId_I_ */
-
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1843,7 +560,7 @@ CORBA::Boolean operator>> (
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -1904,12 +621,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ThreadPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1930,12 +647,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyVal
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::LifespanPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1954,12 +671,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolic
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::IdUniquenessPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1978,12 +695,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolic
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::IdAssignmentPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -2004,12 +721,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivatio
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -2028,12 +745,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionP
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ServantRetentionPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -2052,12 +769,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::RequestProcessingPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
index ce31a26935c..b6abcf7ee94 100644
--- a/TAO/tao/Principal.cpp
+++ b/TAO/tao/Principal.cpp
@@ -27,7 +27,7 @@ CORBA::Principal::~Principal (void)
 }
 
 CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, CORBA::Principal* x)
+operator<< (TAO_OutputCDR & cdr, CORBA::Principal * x)
 {
   if (x != 0)
     {
@@ -39,14 +39,16 @@ operator<< (TAO_OutputCDR& cdr, CORBA::Principal* x)
     {
       cdr.write_ulong (0);
     }
+
   return (CORBA::Boolean) cdr.good_bit ();
 }
 
 CORBA::Boolean
-operator>> (TAO_InputCDR& cdr, CORBA::Principal*& x)
+operator>> (TAO_InputCDR & cdr, CORBA::Principal *& x)
 {
   CORBA::ULong length;
   cdr.read_ulong (length);
+
   if (length == 0 || !cdr.good_bit ())
     {
       x = 0;
@@ -57,5 +59,19 @@ operator>> (TAO_InputCDR& cdr, CORBA::Principal*& x)
       x->id.length (length);
       cdr.read_octet_array (x->id.get_buffer (), length);
     }
+
   return (CORBA::Boolean) cdr.good_bit ();
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Var_T<CORBA::Principal>;
+  template class TAO_Pseudo_Out_T<CORBA::Principal, CORBA::Principal_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::Principal>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::Principal, CORBA::Principal_var>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index 234be48bcef..45e7802fce6 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -29,6 +29,10 @@
 
 namespace CORBA
 {
+  class Principal;
+  typedef TAO_Pseudo_Var_T<Principal> Principal_var;
+  typedef TAO_Pseudo_Out_T<Principal, Principal_var> Principal_out;
+
   /**
    * @class Principal
    *
@@ -52,8 +56,8 @@ namespace CORBA
     // @@ add "==", "<", ">" operators
 
     // The pseudo object operations.
-    static Principal* _duplicate (Principal*);
-    static Principal* _nil (void);
+    static Principal * _duplicate (Principal *);
+    static Principal * _nil (void);
 
     // = Stuff required for memory management.
     CORBA::ULong _incr_refcnt (void);
@@ -61,11 +65,9 @@ namespace CORBA
 
     Principal (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
+    // Useful for template programming.
     typedef Principal_ptr _ptr_type;
     typedef Principal_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
   protected:
 
@@ -89,73 +91,14 @@ namespace CORBA
     /// Protect the reference count, this is OK because we do no
     /// duplicates or releases on the critical path.
     TAO_SYNCH_MUTEX refcount_mutex_;
-
-  };
-
-  /**
-   * @class Principal_var
-   *
-   * @brief The T_var class for CORBA::Principal
-   *
-   * As any other pseudo object Principal must have a T_var class,
-   * the interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_Export Principal_var
-  {
-  public:
-    Principal_var (void);
-    Principal_var (Principal_ptr);
-    Principal_var (const Principal_var &);
-    ~Principal_var (void);
-
-    Principal_var &operator= (Principal_ptr);
-    Principal_var &operator= (const Principal_var &);
-    Principal_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const Principal_ptr &() const;
-    operator Principal_ptr &();
-    Principal_ptr in (void) const;
-    Principal_ptr &inout (void);
-    Principal_ptr &out (void);
-    Principal_ptr _retn (void);
-    Principal_ptr ptr (void) const;
-
-  private:
-    Principal_ptr ptr_;
-  };
-
-  /**
-   * @class Principal_out
-   *
-   * @brief The T_out class for CORBA::Principal
-   *
-   * As any other pseudo object Principal must have a T_out class,
-   * the interface an semantics are specified in the CORBA spec.
-   */
-  class TAO_Export Principal_out
-  {
-  public:
-    Principal_out (Principal_ptr &);
-    Principal_out (Principal_var &);
-    Principal_out (Principal_out &);
-    Principal_out &operator= (Principal_out &);
-    Principal_out &operator= (const Principal_var &);
-    Principal_out &operator= (Principal_ptr);
-    operator Principal_ptr &();
-    Principal_ptr &ptr (void);
-    Principal_ptr operator-> (void);
-
-  private:
-    Principal_ptr &ptr_;
   };
 }  // End CORBA namespace
 
 TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, CORBA::Principal*);
+operator<< (TAO_OutputCDR &, CORBA::Principal *);
 
 TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, CORBA::Principal*&);
+operator>> (TAO_InputCDR &, CORBA::Principal *&);
 
 #if defined (__ACE_INLINE__)
 # include "tao/Principal.i"
diff --git a/TAO/tao/Principal.i b/TAO/tao/Principal.i
index 4ec85bcedd9..5b9f0a8865d 100644
--- a/TAO/tao/Principal.i
+++ b/TAO/tao/Principal.i
@@ -2,211 +2,65 @@
 //
 // $Id$
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 CORBA::is_nil (CORBA::Principal_ptr principal)
 {
   return (CORBA::Boolean) (principal == 0);
 }
 
-ACE_INLINE CORBA::ULong
+ACE_INLINE 
+CORBA::ULong
 CORBA::Principal::_decr_refcnt (void)
 {
   {
     this->refcount_--;
+
     if (this->refcount_ != 0)
-      return this->refcount_;
+      {
+        return this->refcount_;
+      }
   }
 
   delete this;
   return 0;
 }
 
-ACE_INLINE void
+ACE_INLINE 
+void
 CORBA::release (CORBA::Principal_ptr principal)
 {
   if (principal)
-    principal->_decr_refcnt ();
+    {
+      principal->_decr_refcnt ();
+    }
 }
 
-ACE_INLINE CORBA::ULong
+ACE_INLINE 
+CORBA::ULong
 CORBA::Principal::_incr_refcnt (void)
 {
   return this->refcount_++;
 }
 
 
-ACE_INLINE CORBA::Principal*
-CORBA::Principal::_duplicate (CORBA::Principal* x)
+ACE_INLINE 
+CORBA::Principal *
+CORBA::Principal::_duplicate (CORBA::Principal * x)
 {
   if (x != 0)
-    x->_incr_refcnt ();
+    {
+      x->_incr_refcnt ();
+    }
+
   return x;
 }
 
 
-ACE_INLINE CORBA::Principal*
+ACE_INLINE 
+CORBA::Principal *
 CORBA::Principal::_nil (void)
 {
   return 0;
 }
 
-// *************************************************************
-// Inline operations for class CORBA::Principal_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Principal_var::Principal_var (void)
-  : ptr_ (CORBA::Principal::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA::Principal_var::Principal_var (CORBA::Principal_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::Principal_var::~Principal_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::Principal_ptr
-CORBA::Principal_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Principal_var::Principal_var (const CORBA::Principal_var &p)
-  : ptr_ (CORBA::Principal::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA::Principal_var &
-CORBA::Principal_var::operator= (CORBA::Principal_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::Principal_var &
-CORBA::Principal_var::operator= (const CORBA::Principal_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::Principal::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Principal_var::operator const CORBA::Principal_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Principal_var::operator CORBA::Principal_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Principal_ptr
-CORBA::Principal_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Principal_ptr
-CORBA::Principal_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Principal_ptr &
-CORBA::Principal_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Principal_ptr &
-CORBA::Principal_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Principal::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Principal_ptr
-CORBA::Principal_var::_retn (void)
-{
-  // yield ownership
-  CORBA::Principal_ptr val = this->ptr_;
-  this->ptr_ = CORBA::Principal::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Principal_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Principal_out::Principal_out (CORBA::Principal_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA::Principal::_nil ();
-}
-
-ACE_INLINE
-CORBA::Principal_out::Principal_out (CORBA::Principal_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::Principal::_nil ();
-}
-
-ACE_INLINE
-CORBA::Principal_out::Principal_out (CORBA::Principal_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::Principal_out &
-CORBA::Principal_out::operator= (CORBA::Principal_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Principal_out &
-CORBA::Principal_out::operator= (const CORBA::Principal_var &p)
-{
-  this->ptr_ = CORBA::Principal::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA::Principal_out &
-CORBA::Principal_out::operator= (CORBA::Principal_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Principal_out::operator CORBA::Principal_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Principal_ptr &
-CORBA::Principal_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Principal_ptr
-CORBA::Principal_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Pseudo_Value_VarOut_T.cpp b/TAO/tao/Pseudo_Value_VarOut_T.cpp
new file mode 100644
index 00000000000..2be58fb50f1
--- /dev/null
+++ b/TAO/tao/Pseudo_Value_VarOut_T.cpp
@@ -0,0 +1,16 @@
+// $Id$
+
+#ifndef TAO_PSEUDO_VALUE_VAROUT_T_C
+#define TAO_PSEUDO_VALUE_VAROUT_T_C
+
+#include "tao/Pseudo_Value_VarOut_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Pseudo_Value_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (tao, 
+           Pseudo_Value_VarOut_T, 
+           "$Id$")
+
+#endif /* TAO_PSEUDO_VALUE_VAROUT_T_C */
diff --git a/TAO/tao/Pseudo_Value_VarOut_T.h b/TAO/tao/Pseudo_Value_VarOut_T.h
new file mode 100644
index 00000000000..cb78c98f5c3
--- /dev/null
+++ b/TAO/tao/Pseudo_Value_VarOut_T.h
@@ -0,0 +1,107 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Pseudo_Value_VarOut_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_PSEUDO_VALUE_VAROUT_T_H
+#define TAO_PSEUDO_VALUE_VAROUT_T_H
+
+#include "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Pseudo_Value_Var_T
+ *
+ * @brief Parametrized implementation of _var class for
+ * CORBA::ValueBase and CORBA::ValueFactoryBase.
+ *
+ */
+template <typename T>
+class TAO_Pseudo_Value_Var_T
+{
+public:
+  TAO_Pseudo_Value_Var_T (void);
+  TAO_Pseudo_Value_Var_T (T *);
+  TAO_Pseudo_Value_Var_T (const TAO_Pseudo_Value_Var_T<T> &);
+
+  ~TAO_Pseudo_Value_Var_T (void);
+
+  TAO_Pseudo_Value_Var_T<T> & operator= (T *);
+  TAO_Pseudo_Value_Var_T<T> & operator= (const TAO_Pseudo_Value_Var_T<T> &);
+
+  T * operator-> (void) const;
+
+  operator const T *& () const;
+  operator T *& ();
+
+  T * in (void) const;
+  T *& inout (void);
+  T *& out (void);
+  T * _retn (void);
+
+  // TAO extension.
+  T * ptr (void) const;
+
+private:
+  T * ptr_;
+};
+
+/**
+ * @class TAO_Pseudo_Value_Out_T
+ *
+ * @brief Parametrized implementation of _out class for
+ * CORBA::ValueBase and CORBA::ValueFactoryBase.
+ *
+ */
+template <typename T, typename T_var>
+class TAO_Pseudo_Value_Out_T
+{
+public:
+  TAO_Pseudo_Value_Out_T (T *&);
+  TAO_Pseudo_Value_Out_T (T_var &);
+  TAO_Pseudo_Value_Out_T (const TAO_Pseudo_Value_Out_T<T,T_var> &);
+
+  TAO_Pseudo_Value_Out_T<T,T_var> & operator= (
+      const TAO_Pseudo_Value_Out_T<T,T_var> &
+    );
+  TAO_Pseudo_Value_Out_T<T,T_var> & operator= (T *);
+
+  operator T *& ();
+
+  T *& ptr (void);
+
+  T * operator-> (void);
+
+private:
+  T *& ptr_;
+
+  /// Assignment from _var not allowed.
+  TAO_Pseudo_Value_Out_T<T,T_var> & operator= (const T_var &);
+};
+
+#if defined (__ACE_INLINE__)
+#include "tao/Pseudo_Value_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Pseudo_Value_VarOut_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Pseudo_Value_VarOut_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_PSEUDO_VALUE_VAROUT_T_H */
diff --git a/TAO/tao/Pseudo_Value_VarOut_T.inl b/TAO/tao/Pseudo_Value_VarOut_T.inl
new file mode 100644
index 00000000000..cd9849797a0
--- /dev/null
+++ b/TAO/tao/Pseudo_Value_VarOut_T.inl
@@ -0,0 +1,189 @@
+// $Id$
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Value_Var_T<T>::TAO_Pseudo_Value_Var_T (void)
+  : ptr_ (0)
+{}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Value_Var_T<T>::TAO_Pseudo_Value_Var_T (T * p)
+  : ptr_ (p)
+{}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Value_Var_T<T>::TAO_Pseudo_Value_Var_T (const TAO_Pseudo_Value_Var_T<T> & p)
+  : ptr_ (p.ptr_)
+{
+  CORBA::add_ref (this->ptr_);
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Value_Var_T<T>::~TAO_Pseudo_Value_Var_T (void)
+{
+  CORBA::remove_ref (this->ptr_);
+}
+
+template <typename T>
+ACE_INLINE 
+TAO_Pseudo_Value_Var_T<T> &
+TAO_Pseudo_Value_Var_T<T>::operator= (T * p)
+{
+  CORBA::remove_ref (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+template <typename T>
+ACE_INLINE 
+TAO_Pseudo_Value_Var_T<T> &
+TAO_Pseudo_Value_Var_T<T>::operator= (const TAO_Pseudo_Value_Var_T<T> & p)
+{
+  if (this != &p)
+    {
+      CORBA::remove_ref (this->ptr_);
+      this->ptr_ = p.ptr ();
+      CORBA::add_ref (this->ptr_);
+    }
+
+  return *this;
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Value_Var_T<T>::operator const T *& () const
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Value_Var_T<T>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *
+TAO_Pseudo_Value_Var_T<T>::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *
+TAO_Pseudo_Value_Var_T<T>::in (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *&
+TAO_Pseudo_Value_Var_T<T>::inout (void)
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *&
+TAO_Pseudo_Value_Var_T<T>::out (void)
+{
+  CORBA::remove_ref (this->ptr_);
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *
+TAO_Pseudo_Value_Var_T<T>::_retn (void)
+{
+  T * val = this->ptr_;
+  this->ptr_ = 0;
+  return val;
+}
+
+template <typename T>
+ACE_INLINE 
+T *
+TAO_Pseudo_Value_Var_T<T>::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// *************************************************************
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Value_Out_T<T,T_var>::TAO_Pseudo_Value_Out_T (T *& p)
+  : ptr_ (p)
+{
+  this->ptr_ = T::_nil ();
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Value_Out_T<T,T_var>::TAO_Pseudo_Value_Out_T (T_var & p)
+  : ptr_ (p.out ())
+{
+  CORBA::remove_ref (this->ptr_);
+  this->ptr_ = T::_nil ();
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Value_Out_T<T,T_var>::TAO_Pseudo_Value_Out_T (
+    const TAO_Pseudo_Value_Out_T<T,T_var> & p
+  )
+  : ptr_ (p.ptr_)
+{}
+
+template <typename T, typename T_var>
+ACE_INLINE 
+TAO_Pseudo_Value_Out_T<T,T_var> &
+TAO_Pseudo_Value_Out_T<T,T_var>::operator= (
+    const TAO_Pseudo_Value_Out_T<T,T_var> & p
+  )
+{
+  this->ptr_ = p.ptr_;
+  return *this;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE 
+TAO_Pseudo_Value_Out_T<T,T_var> &
+TAO_Pseudo_Value_Out_T<T,T_var>::operator= (T * p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Value_Out_T<T,T_var>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE 
+T *&
+TAO_Pseudo_Value_Out_T<T,T_var>::ptr (void)
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE 
+T *
+TAO_Pseudo_Value_Out_T<T,T_var>::operator-> (void)
+{
+  return this->ptr_;
+}
diff --git a/TAO/tao/Pseudo_Value_Varout_T.cpp b/TAO/tao/Pseudo_Value_Varout_T.cpp
new file mode 100644
index 00000000000..2be58fb50f1
--- /dev/null
+++ b/TAO/tao/Pseudo_Value_Varout_T.cpp
@@ -0,0 +1,16 @@
+// $Id$
+
+#ifndef TAO_PSEUDO_VALUE_VAROUT_T_C
+#define TAO_PSEUDO_VALUE_VAROUT_T_C
+
+#include "tao/Pseudo_Value_VarOut_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Pseudo_Value_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (tao, 
+           Pseudo_Value_VarOut_T, 
+           "$Id$")
+
+#endif /* TAO_PSEUDO_VALUE_VAROUT_T_C */
diff --git a/TAO/tao/Pseudo_Value_Varout_T.h b/TAO/tao/Pseudo_Value_Varout_T.h
new file mode 100644
index 00000000000..b9d3fd52b03
--- /dev/null
+++ b/TAO/tao/Pseudo_Value_Varout_T.h
@@ -0,0 +1,12 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Pseudo_Value_VarOut_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
diff --git a/TAO/tao/Pseudo_Value_Varout_T.inl b/TAO/tao/Pseudo_Value_Varout_T.inl
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/Pseudo_Value_Varout_T.inl
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/Pseudo_VarOut_T.cpp b/TAO/tao/Pseudo_VarOut_T.cpp
new file mode 100644
index 00000000000..ee893f6b7be
--- /dev/null
+++ b/TAO/tao/Pseudo_VarOut_T.cpp
@@ -0,0 +1,16 @@
+// $Id$
+
+#ifndef TAO_PSEUDO_VAROUT_T_C
+#define TAO_PSEUDO_VAROUT_T_C
+
+#include "tao/Pseudo_VarOut_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Pseudo_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (tao, 
+           Pseudo_VarOut_T, 
+           "$Id$")
+
+#endif /* TAO_PSEUDO_VAROUT_T_C */
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
new file mode 100644
index 00000000000..6027f7117d5
--- /dev/null
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -0,0 +1,110 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Pseudo_VarOut_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_PSEUDO_VAROUT_T_H
+#define TAO_PSEUDO_VAROUT_T_H
+
+#include "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Pseudo_Var_T
+ *
+ * @brief Parametrized implementation of _var class for
+ * TypeCode, Object, AbstractBase, NamedValue, NVList,
+ * Principal, Request, Context, ORB, LocalObject,
+ * and Environment.
+ *
+ */
+template <typename T>
+class TAO_Pseudo_Var_T
+{
+public:
+  TAO_Pseudo_Var_T (void);
+  TAO_Pseudo_Var_T (T *);
+  TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> &);
+
+  ~TAO_Pseudo_Var_T (void);
+
+  TAO_Pseudo_Var_T<T> & operator= (T *);
+  TAO_Pseudo_Var_T<T> & operator= (const TAO_Pseudo_Var_T<T> &);
+
+  T * operator-> (void) const;
+
+  operator const T *& () const;
+  operator T *& ();
+
+  T * in (void) const;
+  T *& inout (void);
+  T *& out (void);
+  T * _retn (void);
+
+  // TAO extension.
+  T * ptr (void) const;
+
+private:
+  T * ptr_;
+};
+
+/**
+ * @class TAO_Pseudo_Out_T
+ *
+ * @brief Parametrized implementation of _out class for
+ * TypeCode, Object, AbstractBase, NamedValue, NVList,
+ * Principal, Request, Context, ORB, LocalObject,
+ * and Environment.
+ *
+ */
+template <typename T, typename T_var>
+class TAO_Pseudo_Out_T
+{
+public:
+  TAO_Pseudo_Out_T (T *&);
+  TAO_Pseudo_Out_T (T_var &);
+  TAO_Pseudo_Out_T (const TAO_Pseudo_Out_T<T,T_var> &);
+
+  TAO_Pseudo_Out_T<T,T_var> & operator= (const TAO_Pseudo_Out_T<T,T_var> &);
+  TAO_Pseudo_Out_T<T,T_var> & operator= (T *);
+
+  operator T *& ();
+
+  T *& ptr (void);
+
+  T * operator-> (void);
+
+private:
+  T *& ptr_;
+
+  /// Assignment from _var not allowed.
+  TAO_Pseudo_Out_T<T,T_var> & operator= (const T_var &);
+};
+
+#if defined (__ACE_INLINE__)
+#include "tao/Pseudo_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Pseudo_VarOut_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Pseudo_VarOut_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_PSEUDO_VAROUT_T_H */
+
diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl
new file mode 100644
index 00000000000..bcbd4e8b4dd
--- /dev/null
+++ b/TAO/tao/Pseudo_VarOut_T.inl
@@ -0,0 +1,184 @@
+// $Id$
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void)
+  : ptr_ (T::_nil ())
+{}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (T * p)
+  : ptr_ (p)
+{}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> & p)
+  : ptr_ (T::_duplicate (p.ptr ()))
+{}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T (void)
+{
+  CORBA::release (this->ptr_);
+}
+
+template <typename T>
+ACE_INLINE 
+TAO_Pseudo_Var_T<T> &
+TAO_Pseudo_Var_T<T>::operator= (T * p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+template <typename T>
+ACE_INLINE 
+TAO_Pseudo_Var_T<T> &
+TAO_Pseudo_Var_T<T>::operator= (const TAO_Pseudo_Var_T<T> & p)
+{
+  if (this != &p)
+    {
+      CORBA::release (this->ptr_);
+      this->ptr_ = T::_duplicate (p.ptr ());
+    }
+
+  return *this;
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Var_T<T>::operator const T *& () const
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Var_T<T>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *
+TAO_Pseudo_Var_T<T>::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *
+TAO_Pseudo_Var_T<T>::in (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *&
+TAO_Pseudo_Var_T<T>::inout (void)
+{
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *&
+TAO_Pseudo_Var_T<T>::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = T::_nil ();
+  return this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE 
+T *
+TAO_Pseudo_Var_T<T>::_retn (void)
+{
+  T * val = this->ptr_;
+  this->ptr_ = T::_nil ();
+  return val;
+}
+
+template <typename T>
+ACE_INLINE 
+T *
+TAO_Pseudo_Var_T<T>::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// *************************************************************
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Out_T<T,T_var>::TAO_Pseudo_Out_T (T *& p)
+  : ptr_ (p)
+{
+  this->ptr_ = T::_nil ();
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Out_T<T,T_var>::TAO_Pseudo_Out_T (T_var & p)
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = T::_nil ();
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Out_T<T,T_var>::TAO_Pseudo_Out_T (
+    const TAO_Pseudo_Out_T<T,T_var> & p
+  )
+  : ptr_ (p.ptr_)
+{}
+
+template <typename T, typename T_var>
+ACE_INLINE 
+TAO_Pseudo_Out_T<T,T_var> &
+TAO_Pseudo_Out_T<T,T_var>::operator= (const TAO_Pseudo_Out_T<T,T_var> & p)
+{
+  this->ptr_ = p.ptr_;
+  return *this;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE 
+TAO_Pseudo_Out_T<T,T_var> &
+TAO_Pseudo_Out_T<T,T_var>::operator= (T * p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Out_T<T,T_var>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE 
+T *&
+TAO_Pseudo_Out_T<T,T_var>::ptr (void)
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE 
+T *
+TAO_Pseudo_Out_T<T,T_var>::operator-> (void)
+{
+  return this->ptr_;
+}
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index a9bf07157ef..1ac374edbc8 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -66,20 +65,20 @@ static const CORBA::Long _oc_RTCORBA_NativePriority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76655072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x4e617469),
+  ACE_NTOHL (0x76655072),
+  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x74793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0
     15,
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76655072), 
-  ACE_NTOHL (0x696f7269), 
+  ACE_NTOHL (0x4e617469),
+  ACE_NTOHL (0x76655072),
+  ACE_NTOHL (0x696f7269),
   ACE_NTOHL (0x74790000),  // name = NativePriority
     CORBA::tk_short,
 
@@ -109,18 +108,18 @@ static const CORBA::Long _oc_RTCORBA_Priority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
     9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
   ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -150,20 +149,20 @@ static const CORBA::Long _oc_RTCORBA_NetworkPriority[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4e657477), 
-  ACE_NTOHL (0x6f726b50), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x6974793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x4e657477),
+  ACE_NTOHL (0x6f726b50),
+  ACE_NTOHL (0x72696f72),
+  ACE_NTOHL (0x6974793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0
     16,
-  ACE_NTOHL (0x4e657477), 
-  ACE_NTOHL (0x6f726b50), 
-  ACE_NTOHL (0x72696f72), 
+  ACE_NTOHL (0x4e657477),
+  ACE_NTOHL (0x6f726b50),
+  ACE_NTOHL (0x72696f72),
   ACE_NTOHL (0x69747900),  // name = NetworkPriority
     CORBA::tk_long,
 
@@ -193,20 +192,20 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4964), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4964),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0
     13,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4964), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4964),
   ACE_NTOHL (0x0),  // name = ThreadpoolId
     CORBA::tk_ulong,
 
@@ -236,58 +235,58 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e653a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
+  ACE_NTOHL (0x6e653a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
     15,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
   ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
   3, // member count
     14,
-  ACE_NTOHL (0x6c616e65), 
-  ACE_NTOHL (0x5f707269), 
-  ACE_NTOHL (0x6f726974), 
+  ACE_NTOHL (0x6c616e65),
+  ACE_NTOHL (0x5f707269),
+  ACE_NTOHL (0x6f726974),
   ACE_NTOHL (0x79000000),  // name = lane_priority
     CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x5254434f),
+    ACE_NTOHL (0x5242412f),
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
 
   15,
-  ACE_NTOHL (0x73746174), 
-  ACE_NTOHL (0x69635f74), 
-  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x73746174),
+  ACE_NTOHL (0x69635f74),
+  ACE_NTOHL (0x68726561),
   ACE_NTOHL (0x64730000),  // name = static_threads
     CORBA::tk_ulong,
 
   16,
-  ACE_NTOHL (0x64796e61), 
-  ACE_NTOHL (0x6d69635f), 
-  ACE_NTOHL (0x74687265), 
+  ACE_NTOHL (0x64796e61),
+  ACE_NTOHL (0x6d69635f),
+  ACE_NTOHL (0x74687265),
   ACE_NTOHL (0x61647300),  // name = dynamic_threads
     CORBA::tk_ulong,
 
@@ -310,8 +309,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -319,117 +318,58 @@ void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CS_
+template class
+  TAO_Fixed_Var_T<
+      ThreadpoolLane
+    >;
 
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_allocate_buffer (CORBA::ULong length)
-{
-  RTCORBA::ThreadpoolLane* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      RTCORBA::ThreadpoolLane *old =
-        ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  RTCORBA::ThreadpoolLane *tmp =
-    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
-  _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      ThreadpoolLane \
+    >
 
-#if !defined (_RTCORBA_THREADPOOLLANES_CS_)
-#define _RTCORBA_THREADPOOLLANES_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// RTCORBA::ThreadpoolLanes
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 RTCORBA::ThreadpoolLanes::ThreadpoolLanes (void)
 {}
 
 RTCORBA::ThreadpoolLanes::ThreadpoolLanes (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::ThreadpoolLane
+      >
+    (max)
 {}
 
 RTCORBA::ThreadpoolLanes::ThreadpoolLanes (
     CORBA::ULong max,
     CORBA::ULong length,
-    RTCORBA::ThreadpoolLane *buffer,
+    RTCORBA::ThreadpoolLane* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::ThreadpoolLane
+      >
+    (max, length, buffer, release)
 {}
 
 RTCORBA::ThreadpoolLanes::ThreadpoolLanes (const ThreadpoolLanes &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::ThreadpoolLane>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::ThreadpoolLane
+      >
+    (seq)
 {}
 
-RTCORBA::ThreadpoolLanes::~ThreadpoolLanes (void) // dtor
+RTCORBA::ThreadpoolLanes::~ThreadpoolLanes (void)
 {}
 
 void RTCORBA::ThreadpoolLanes::_tao_any_destructor (void *_tao_void_pointer)
@@ -438,7 +378,37 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_FixedSeq_Var_T<
+      ThreadpoolLanes,
+      RTCORBA::ThreadpoolLane
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ThreadpoolLanes,
+      ThreadpoolLanes_var,
+      RTCORBA::ThreadpoolLane
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_FixedSeq_Var_T< \
+      ThreadpoolLanes, \
+      RTCORBA::ThreadpoolLane \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ThreadpoolLanes, \
+      ThreadpoolLanes_var, \
+      RTCORBA::ThreadpoolLane \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -447,20 +417,20 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e65733a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
+  ACE_NTOHL (0x6e65733a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0
     16,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4c61),
   ACE_NTOHL (0x6e657300),  // name = ThreadpoolLanes
     CORBA::tk_sequence, // typecode kind
   228, // encapsulation length
@@ -469,58 +439,58 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
     212, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       39,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x54687265), 
-      ACE_NTOHL (0x6164706f), 
-      ACE_NTOHL (0x6f6c4c61), 
-      ACE_NTOHL (0x6e653a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x5254434f),
+      ACE_NTOHL (0x5242412f),
+      ACE_NTOHL (0x54687265),
+      ACE_NTOHL (0x6164706f),
+      ACE_NTOHL (0x6f6c4c61),
+      ACE_NTOHL (0x6e653a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
             15,
-      ACE_NTOHL (0x54687265), 
-      ACE_NTOHL (0x6164706f), 
-      ACE_NTOHL (0x6f6c4c61), 
+      ACE_NTOHL (0x54687265),
+      ACE_NTOHL (0x6164706f),
+      ACE_NTOHL (0x6f6c4c61),
       ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
       3, // member count
             14,
-      ACE_NTOHL (0x6c616e65), 
-      ACE_NTOHL (0x5f707269), 
-      ACE_NTOHL (0x6f726974), 
+      ACE_NTOHL (0x6c616e65),
+      ACE_NTOHL (0x5f707269),
+      ACE_NTOHL (0x6f726974),
       ACE_NTOHL (0x79000000),  // name = lane_priority
             CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x5254434f),
+        ACE_NTOHL (0x5242412f),
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
                 9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
 
       15,
-      ACE_NTOHL (0x73746174), 
-      ACE_NTOHL (0x69635f74), 
-      ACE_NTOHL (0x68726561), 
+      ACE_NTOHL (0x73746174),
+      ACE_NTOHL (0x69635f74),
+      ACE_NTOHL (0x68726561),
       ACE_NTOHL (0x64730000),  // name = static_threads
             CORBA::tk_ulong,
 
       16,
-      ACE_NTOHL (0x64796e61), 
-      ACE_NTOHL (0x6d69635f), 
-      ACE_NTOHL (0x74687265), 
+      ACE_NTOHL (0x64796e61),
+      ACE_NTOHL (0x6d69635f),
+      ACE_NTOHL (0x74687265),
       ACE_NTOHL (0x61647300),  // name = dynamic_threads
             CORBA::tk_ulong,
 
@@ -553,32 +523,32 @@ static const CORBA::Long _oc_RTCORBA_PriorityModel[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c3a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x6c3a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModel:1.0
   14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
   ACE_NTOHL (0x6c000000),  // name = PriorityModel
   2, // member count
   18,
-  ACE_NTOHL (0x434c4945), 
-  ACE_NTOHL (0x4e545f50), 
-  ACE_NTOHL (0x524f5041), 
-  ACE_NTOHL (0x47415445), 
+  ACE_NTOHL (0x434c4945),
+  ACE_NTOHL (0x4e545f50),
+  ACE_NTOHL (0x524f5041),
+  ACE_NTOHL (0x47415445),
   ACE_NTOHL (0x44000000),  // name = CLIENT_PROPAGATED
   16,
-  ACE_NTOHL (0x53455256), 
-  ACE_NTOHL (0x45525f44), 
-  ACE_NTOHL (0x45434c41), 
+  ACE_NTOHL (0x53455256),
+  ACE_NTOHL (0x45525f44),
+  ACE_NTOHL (0x45434c41),
   ACE_NTOHL (0x52454400),  // name = SERVER_DECLARED
   };
 
@@ -605,7 +575,7 @@ TAO_NAMESPACE_END
 int RTCORBA::PriorityModelPolicy::_tao_class_id = 0;
 
 RTCORBA::PriorityModelPolicy_ptr
-tao_RTCORBA_PriorityModelPolicy_duplicate (
+RTCORBA::tao_PriorityModelPolicy_life::tao_duplicate (
     RTCORBA::PriorityModelPolicy_ptr p
   )
 {
@@ -613,7 +583,7 @@ tao_RTCORBA_PriorityModelPolicy_duplicate (
 }
 
 void
-tao_RTCORBA_PriorityModelPolicy_release (
+RTCORBA::tao_PriorityModelPolicy_life::tao_release (
     RTCORBA::PriorityModelPolicy_ptr p
   )
 {
@@ -621,15 +591,24 @@ tao_RTCORBA_PriorityModelPolicy_release (
 }
 
 RTCORBA::PriorityModelPolicy_ptr
-tao_RTCORBA_PriorityModelPolicy_nil (
+RTCORBA::tao_PriorityModelPolicy_life::tao_nil (
     void
   )
 {
   return RTCORBA::PriorityModelPolicy::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_PriorityModelPolicy_life::tao_marshal (
+    RTCORBA::PriorityModelPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::PriorityModelPolicy_ptr
-tao_RTCORBA_PriorityModelPolicy_narrow (
+RTCORBA::tao_PriorityModelPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -638,7 +617,7 @@ tao_RTCORBA_PriorityModelPolicy_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_PriorityModelPolicy_upcast (
+RTCORBA::tao_PriorityModelPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -647,205 +626,32 @@ tao_RTCORBA_PriorityModelPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_PriorityModelPolicy_marshal (
-    RTCORBA::PriorityModelPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::PriorityModelPolicy_var
-// *************************************************************
-
-RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (void)
-  : ptr_ (PriorityModelPolicy::_nil ())
-{}
-
-::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (const ::RTCORBA::PriorityModelPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (PriorityModelPolicy::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::PriorityModelPolicy_var::~PriorityModelPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::PriorityModelPolicy_var &
-RTCORBA::PriorityModelPolicy_var::operator= (PriorityModelPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::PriorityModelPolicy_var &
-RTCORBA::PriorityModelPolicy_var::operator= (const ::RTCORBA::PriorityModelPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::PriorityModelPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::PriorityModelPolicy_var::operator const ::RTCORBA::PriorityModelPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityModelPolicy_ptr &
-RTCORBA::PriorityModelPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityModelPolicy_ptr &
-RTCORBA::PriorityModelPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::PriorityModelPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
-  return val;
-}
-
-::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::tao_duplicate (PriorityModelPolicy_ptr p)
-{
-  return ::RTCORBA::PriorityModelPolicy::_duplicate (p);
-}
-
-void
-RTCORBA::PriorityModelPolicy_var::tao_release (PriorityModelPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::tao_nil (void)
-{
-  return ::RTCORBA::PriorityModelPolicy::_nil ();
-}
-
-::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::PriorityModelPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::PriorityModelPolicy_var::tao_upcast (void *src)
-{
-  PriorityModelPolicy **tmp =
-    ACE_static_cast (PriorityModelPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::PriorityModelPolicy,
+        RTCORBA::tao_PriorityModelPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::PriorityModelPolicy,
+        RTCORBA::tao_PriorityModelPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::PriorityModelPolicy, \
+        RTCORBA::tao_PriorityModelPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::PriorityModelPolicy, \
+        RTCORBA::tao_PriorityModelPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::PriorityModelPolicy_out
-// *************************************************************
-
-RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
-}
-
-RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
-}
-
-RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (const ::RTCORBA::PriorityModelPolicy_out &p)
-  : ptr_ (ACE_const_cast (PriorityModelPolicy_out &, p).ptr_)
-{}
-
-::RTCORBA::PriorityModelPolicy_out &
-RTCORBA::PriorityModelPolicy_out::operator= (const ::RTCORBA::PriorityModelPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (PriorityModelPolicy_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::PriorityModelPolicy_out &
-RTCORBA::PriorityModelPolicy_out::operator= (const ::RTCORBA::PriorityModelPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::PriorityModelPolicy_out &
-RTCORBA::PriorityModelPolicy_out::operator= (PriorityModelPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::PriorityModelPolicy_out::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityModelPolicy_ptr &
-RTCORBA::PriorityModelPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 {}
@@ -853,7 +659,7 @@ RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityModelPolicy *tmp = ACE_static_cast (PriorityModelPolicy *, _tao_void_pointer);
@@ -869,7 +675,7 @@ RTCORBA::PriorityModelPolicy::_narrow (
   return PriorityModelPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::PriorityModelPolicy_ptr 
+RTCORBA::PriorityModelPolicy_ptr
 RTCORBA::PriorityModelPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -879,7 +685,7 @@ RTCORBA::PriorityModelPolicy::_unchecked_narrow (
     {
       return PriorityModelPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           PriorityModelPolicy_ptr,
@@ -899,14 +705,14 @@ RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::PriorityModelPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, PriorityModelPolicy)::_tao_class_id)
@@ -939,12 +745,12 @@ void *RTCORBA::PriorityModelPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -953,6 +759,12 @@ const char* RTCORBA::PriorityModelPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -960,22 +772,22 @@ static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x6c506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0
     20,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x4d6f6465),
+  ACE_NTOHL (0x6c506f6c),
   ACE_NTOHL (0x69637900),  // name = PriorityModelPolicy
   };
 
@@ -1002,7 +814,7 @@ TAO_NAMESPACE_END
 int RTCORBA::ThreadpoolPolicy::_tao_class_id = 0;
 
 RTCORBA::ThreadpoolPolicy_ptr
-tao_RTCORBA_ThreadpoolPolicy_duplicate (
+RTCORBA::tao_ThreadpoolPolicy_life::tao_duplicate (
     RTCORBA::ThreadpoolPolicy_ptr p
   )
 {
@@ -1010,7 +822,7 @@ tao_RTCORBA_ThreadpoolPolicy_duplicate (
 }
 
 void
-tao_RTCORBA_ThreadpoolPolicy_release (
+RTCORBA::tao_ThreadpoolPolicy_life::tao_release (
     RTCORBA::ThreadpoolPolicy_ptr p
   )
 {
@@ -1018,15 +830,24 @@ tao_RTCORBA_ThreadpoolPolicy_release (
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
-tao_RTCORBA_ThreadpoolPolicy_nil (
+RTCORBA::tao_ThreadpoolPolicy_life::tao_nil (
     void
   )
 {
   return RTCORBA::ThreadpoolPolicy::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_ThreadpoolPolicy_life::tao_marshal (
+    RTCORBA::ThreadpoolPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::ThreadpoolPolicy_ptr
-tao_RTCORBA_ThreadpoolPolicy_narrow (
+RTCORBA::tao_ThreadpoolPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1035,7 +856,7 @@ tao_RTCORBA_ThreadpoolPolicy_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_ThreadpoolPolicy_upcast (
+RTCORBA::tao_ThreadpoolPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -1044,205 +865,32 @@ tao_RTCORBA_ThreadpoolPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_ThreadpoolPolicy_marshal (
-    RTCORBA::ThreadpoolPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::ThreadpoolPolicy_var
-// *************************************************************
-
-RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (void)
-  : ptr_ (ThreadpoolPolicy::_nil ())
-{}
-
-::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (const ::RTCORBA::ThreadpoolPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ThreadpoolPolicy::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::ThreadpoolPolicy_var::~ThreadpoolPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::ThreadpoolPolicy_var &
-RTCORBA::ThreadpoolPolicy_var::operator= (ThreadpoolPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::ThreadpoolPolicy_var &
-RTCORBA::ThreadpoolPolicy_var::operator= (const ::RTCORBA::ThreadpoolPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::ThreadpoolPolicy_var::operator const ::RTCORBA::ThreadpoolPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr &
-RTCORBA::ThreadpoolPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr &
-RTCORBA::ThreadpoolPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::ThreadpoolPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
-  return val;
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::tao_duplicate (ThreadpoolPolicy_ptr p)
-{
-  return ::RTCORBA::ThreadpoolPolicy::_duplicate (p);
-}
-
-void
-RTCORBA::ThreadpoolPolicy_var::tao_release (ThreadpoolPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::tao_nil (void)
-{
-  return ::RTCORBA::ThreadpoolPolicy::_nil ();
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::ThreadpoolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::ThreadpoolPolicy_var::tao_upcast (void *src)
-{
-  ThreadpoolPolicy **tmp =
-    ACE_static_cast (ThreadpoolPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::ThreadpoolPolicy,
+        RTCORBA::tao_ThreadpoolPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::ThreadpoolPolicy,
+        RTCORBA::tao_ThreadpoolPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::ThreadpoolPolicy, \
+        RTCORBA::tao_ThreadpoolPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::ThreadpoolPolicy, \
+        RTCORBA::tao_ThreadpoolPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::ThreadpoolPolicy_out
-// *************************************************************
-
-RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
-}
-
-RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
-}
-
-RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (const ::RTCORBA::ThreadpoolPolicy_out &p)
-  : ptr_ (ACE_const_cast (ThreadpoolPolicy_out &, p).ptr_)
-{}
-
-::RTCORBA::ThreadpoolPolicy_out &
-RTCORBA::ThreadpoolPolicy_out::operator= (const ::RTCORBA::ThreadpoolPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ThreadpoolPolicy_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::ThreadpoolPolicy_out &
-RTCORBA::ThreadpoolPolicy_out::operator= (const ::RTCORBA::ThreadpoolPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::ThreadpoolPolicy_out &
-RTCORBA::ThreadpoolPolicy_out::operator= (ThreadpoolPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::ThreadpoolPolicy_out::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr &
-RTCORBA::ThreadpoolPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 {}
@@ -1250,7 +898,7 @@ RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ThreadpoolPolicy *tmp = ACE_static_cast (ThreadpoolPolicy *, _tao_void_pointer);
@@ -1266,7 +914,7 @@ RTCORBA::ThreadpoolPolicy::_narrow (
   return ThreadpoolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::ThreadpoolPolicy_ptr 
+RTCORBA::ThreadpoolPolicy_ptr
 RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1276,7 +924,7 @@ RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
     {
       return ThreadpoolPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ThreadpoolPolicy_ptr,
@@ -1296,14 +944,14 @@ RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::ThreadpoolPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, ThreadpoolPolicy)::_tao_class_id)
@@ -1336,12 +984,12 @@ void *RTCORBA::ThreadpoolPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1350,6 +998,12 @@ const char* RTCORBA::ThreadpoolPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1357,22 +1011,22 @@ static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0
     17,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ThreadpoolPolicy
   };
 
@@ -1399,7 +1053,7 @@ TAO_NAMESPACE_END
 int RTCORBA::ProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::ProtocolProperties_ptr
-tao_RTCORBA_ProtocolProperties_duplicate (
+RTCORBA::tao_ProtocolProperties_life::tao_duplicate (
     RTCORBA::ProtocolProperties_ptr p
   )
 {
@@ -1407,7 +1061,7 @@ tao_RTCORBA_ProtocolProperties_duplicate (
 }
 
 void
-tao_RTCORBA_ProtocolProperties_release (
+RTCORBA::tao_ProtocolProperties_life::tao_release (
     RTCORBA::ProtocolProperties_ptr p
   )
 {
@@ -1415,15 +1069,24 @@ tao_RTCORBA_ProtocolProperties_release (
 }
 
 RTCORBA::ProtocolProperties_ptr
-tao_RTCORBA_ProtocolProperties_nil (
+RTCORBA::tao_ProtocolProperties_life::tao_nil (
     void
   )
 {
   return RTCORBA::ProtocolProperties::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_ProtocolProperties_life::tao_marshal (
+    RTCORBA::ProtocolProperties_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::ProtocolProperties_ptr
-tao_RTCORBA_ProtocolProperties_narrow (
+RTCORBA::tao_ProtocolProperties_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -1432,7 +1095,7 @@ tao_RTCORBA_ProtocolProperties_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_ProtocolProperties_upcast (
+RTCORBA::tao_ProtocolProperties_cast::tao_upcast (
     void *src
   )
 {
@@ -1441,205 +1104,32 @@ tao_RTCORBA_ProtocolProperties_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_ProtocolProperties_marshal (
-    RTCORBA::ProtocolProperties_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::ProtocolProperties_var
-// *************************************************************
-
-RTCORBA::ProtocolProperties_var::ProtocolProperties_var (void)
-  : ptr_ (ProtocolProperties::_nil ())
-{}
-
-::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::ProtocolProperties_var::ProtocolProperties_var (const ::RTCORBA::ProtocolProperties_var &p)
-  : TAO_Base_var (),
-    ptr_ (ProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::ProtocolProperties_var::~ProtocolProperties_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::ProtocolProperties_var &
-RTCORBA::ProtocolProperties_var::operator= (ProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::ProtocolProperties_var &
-RTCORBA::ProtocolProperties_var::operator= (const ::RTCORBA::ProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::ProtocolProperties_var::operator const ::RTCORBA::ProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::ProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
-  return val;
-}
-
-::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::tao_duplicate (ProtocolProperties_ptr p)
-{
-  return ::RTCORBA::ProtocolProperties::_duplicate (p);
-}
-
-void
-RTCORBA::ProtocolProperties_var::tao_release (ProtocolProperties_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::tao_nil (void)
-{
-  return ::RTCORBA::ProtocolProperties::_nil ();
-}
-
-::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::ProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::ProtocolProperties_var::tao_upcast (void *src)
-{
-  ProtocolProperties **tmp =
-    ACE_static_cast (ProtocolProperties **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::ProtocolProperties,
+        RTCORBA::tao_ProtocolProperties_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::ProtocolProperties,
+        RTCORBA::tao_ProtocolProperties_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::ProtocolProperties, \
+        RTCORBA::tao_ProtocolProperties_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::ProtocolProperties, \
+        RTCORBA::tao_ProtocolProperties_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::ProtocolProperties_out
-// *************************************************************
-
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
-}
-
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
-}
-
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (const ::RTCORBA::ProtocolProperties_out &p)
-  : ptr_ (ACE_const_cast (ProtocolProperties_out &, p).ptr_)
-{}
-
-::RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (ProtocolProperties_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_var &p)
-{
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (ProtocolProperties_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::ProtocolProperties_out::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::ProtocolProperties::ProtocolProperties (void)
 {}
@@ -1647,7 +1137,7 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void)
 RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProtocolProperties *tmp = ACE_static_cast (ProtocolProperties *, _tao_void_pointer);
@@ -1663,7 +1153,7 @@ RTCORBA::ProtocolProperties::_narrow (
   return ProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::ProtocolProperties_ptr 
+RTCORBA::ProtocolProperties_ptr
 RTCORBA::ProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1673,7 +1163,7 @@ RTCORBA::ProtocolProperties::_unchecked_narrow (
     {
       return ProtocolProperties::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ProtocolProperties_ptr,
@@ -1693,14 +1183,14 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id)
@@ -1719,12 +1209,12 @@ void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -1733,6 +1223,12 @@ const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ProtocolProperties:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -1740,22 +1236,22 @@ static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x65733a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
     19,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = ProtocolProperties
   };
 
@@ -1783,81 +1279,81 @@ static const CORBA::Long _oc_RTCORBA_Protocol[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
     9,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
   ACE_NTOHL (0x0),  // name = Protocol
   3, // member count
     14,
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f747970), 
+  ACE_NTOHL (0x70726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x5f747970),
   ACE_NTOHL (0x65000000),  // name = protocol_type
     CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x643a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x50726f66),
+    ACE_NTOHL (0x696c6549),
+    ACE_NTOHL (0x643a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
         10,
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x50726f66),
+    ACE_NTOHL (0x696c6549),
     ACE_NTOHL (0x64000000),  // name = ProfileId
         CORBA::tk_ulong,
 
 
   24,
-  ACE_NTOHL (0x6f72625f), 
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f70726f), 
-  ACE_NTOHL (0x70657274), 
+  ACE_NTOHL (0x6f72625f),
+  ACE_NTOHL (0x70726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x5f70726f),
+  ACE_NTOHL (0x70657274),
   ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
     CORBA::tk_objref, // typecode kind
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     43,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65733a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x5254434f),
+    ACE_NTOHL (0x5242412f),
+    ACE_NTOHL (0x50726f74),
+    ACE_NTOHL (0x6f636f6c),
+    ACE_NTOHL (0x50726f70),
+    ACE_NTOHL (0x65727469),
+    ACE_NTOHL (0x65733a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
         19,
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x50726f74),
+    ACE_NTOHL (0x6f636f6c),
+    ACE_NTOHL (0x50726f70),
+    ACE_NTOHL (0x65727469),
     ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-    
+
   30,
-  ACE_NTOHL (0x7472616e), 
-  ACE_NTOHL (0x73706f72), 
-  ACE_NTOHL (0x745f7072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5f70), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x7472616e),
+  ACE_NTOHL (0x73706f72),
+  ACE_NTOHL (0x745f7072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c5f70),
+  ACE_NTOHL (0x726f7065),
+  ACE_NTOHL (0x72746965),
   ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
     0xffffffff, // indirection
   0xffffff84, // negative offset (-124)
@@ -1880,8 +1376,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void RTCORBA::Protocol::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -1889,117 +1385,70 @@ void RTCORBA::Protocol::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_allocate_buffer (CORBA::ULong length)
-{
-  RTCORBA::Protocol* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      RTCORBA::Protocol *old =
-        ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+template class
+  TAO_Var_Var_T<
+      Protocol
+    >;
 
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  RTCORBA::Protocol *tmp =
-    ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
-  _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
-  this->buffer_ = 0;
-} 
+template class
+  TAO_Out_T<
+      Protocol,
+      Protocol_var
+    >;
 
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void)
-{
-  this->_deallocate_buffer ();
-}
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* end #if !defined */
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      Protocol \
+    >
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Out_T< \
+      Protocol, \
+      Protocol_var \
+    >
 
-#if !defined (_RTCORBA_PROTOCOLLIST_CS_)
-#define _RTCORBA_PROTOCOLLIST_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// RTCORBA::ProtocolList
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 RTCORBA::ProtocolList::ProtocolList (void)
 {}
 
 RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_ProtocolList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::Protocol>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::Protocol
+      >
+    (max)
 {}
 
 RTCORBA::ProtocolList::ProtocolList (
     CORBA::ULong max,
     CORBA::ULong length,
-    RTCORBA::Protocol *buffer,
+    RTCORBA::Protocol* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_ProtocolList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::Protocol>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::Protocol
+      >
+    (max, length, buffer, release)
 {}
 
 RTCORBA::ProtocolList::ProtocolList (const ProtocolList &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_ProtocolList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::Protocol>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::Protocol
+      >
+    (seq)
 {}
 
-RTCORBA::ProtocolList::~ProtocolList (void) // dtor
+RTCORBA::ProtocolList::~ProtocolList (void)
 {}
 
 void RTCORBA::ProtocolList::_tao_any_destructor (void *_tao_void_pointer)
@@ -2008,7 +1457,37 @@ void RTCORBA::ProtocolList::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_VarSeq_Var_T<
+      ProtocolList,
+      RTCORBA::Protocol
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      ProtocolList,
+      ProtocolList_var,
+      RTCORBA::Protocol
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_VarSeq_Var_T< \
+      ProtocolList, \
+      RTCORBA::Protocol \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      ProtocolList, \
+      ProtocolList_var, \
+      RTCORBA::Protocol \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -2017,20 +1496,20 @@ static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ProtocolList:1.0
     13,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = ProtocolList
     CORBA::tk_sequence, // typecode kind
   324, // encapsulation length
@@ -2039,81 +1518,81 @@ static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
     308, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x50726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x5254434f),
+      ACE_NTOHL (0x5242412f),
+      ACE_NTOHL (0x50726f74),
+      ACE_NTOHL (0x6f636f6c),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
             9,
-      ACE_NTOHL (0x50726f74), 
-      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x50726f74),
+      ACE_NTOHL (0x6f636f6c),
       ACE_NTOHL (0x0),  // name = Protocol
       3, // member count
             14,
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f747970), 
+      ACE_NTOHL (0x70726f74),
+      ACE_NTOHL (0x6f636f6c),
+      ACE_NTOHL (0x5f747970),
       ACE_NTOHL (0x65000000),  // name = protocol_type
             CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x643a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x494f502f),
+        ACE_NTOHL (0x50726f66),
+        ACE_NTOHL (0x696c6549),
+        ACE_NTOHL (0x643a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
                 10,
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x50726f66),
+        ACE_NTOHL (0x696c6549),
         ACE_NTOHL (0x64000000),  // name = ProfileId
                 CORBA::tk_ulong,
 
 
       24,
-      ACE_NTOHL (0x6f72625f), 
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f70726f), 
-      ACE_NTOHL (0x70657274), 
+      ACE_NTOHL (0x6f72625f),
+      ACE_NTOHL (0x70726f74),
+      ACE_NTOHL (0x6f636f6c),
+      ACE_NTOHL (0x5f70726f),
+      ACE_NTOHL (0x70657274),
       ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
             CORBA::tk_objref, // typecode kind
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65733a31), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x5254434f),
+        ACE_NTOHL (0x5242412f),
+        ACE_NTOHL (0x50726f74),
+        ACE_NTOHL (0x6f636f6c),
+        ACE_NTOHL (0x50726f70),
+        ACE_NTOHL (0x65727469),
+        ACE_NTOHL (0x65733a31),
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
                 19,
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x50726f74),
+        ACE_NTOHL (0x6f636f6c),
+        ACE_NTOHL (0x50726f70),
+        ACE_NTOHL (0x65727469),
         ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-        
+
       30,
-      ACE_NTOHL (0x7472616e), 
-      ACE_NTOHL (0x73706f72), 
-      ACE_NTOHL (0x745f7072), 
-      ACE_NTOHL (0x6f746f63), 
-      ACE_NTOHL (0x6f6c5f70), 
-      ACE_NTOHL (0x726f7065), 
-      ACE_NTOHL (0x72746965), 
+      ACE_NTOHL (0x7472616e),
+      ACE_NTOHL (0x73706f72),
+      ACE_NTOHL (0x745f7072),
+      ACE_NTOHL (0x6f746f63),
+      ACE_NTOHL (0x6f6c5f70),
+      ACE_NTOHL (0x726f7065),
+      ACE_NTOHL (0x72746965),
       ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
             0xffffffff, // indirection
       0xffffff84, // negative offset (-124)
@@ -2145,7 +1624,7 @@ TAO_NAMESPACE_END
 int RTCORBA::ServerProtocolPolicy::_tao_class_id = 0;
 
 RTCORBA::ServerProtocolPolicy_ptr
-tao_RTCORBA_ServerProtocolPolicy_duplicate (
+RTCORBA::tao_ServerProtocolPolicy_life::tao_duplicate (
     RTCORBA::ServerProtocolPolicy_ptr p
   )
 {
@@ -2153,7 +1632,7 @@ tao_RTCORBA_ServerProtocolPolicy_duplicate (
 }
 
 void
-tao_RTCORBA_ServerProtocolPolicy_release (
+RTCORBA::tao_ServerProtocolPolicy_life::tao_release (
     RTCORBA::ServerProtocolPolicy_ptr p
   )
 {
@@ -2161,15 +1640,24 @@ tao_RTCORBA_ServerProtocolPolicy_release (
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
-tao_RTCORBA_ServerProtocolPolicy_nil (
+RTCORBA::tao_ServerProtocolPolicy_life::tao_nil (
     void
   )
 {
   return RTCORBA::ServerProtocolPolicy::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_ServerProtocolPolicy_life::tao_marshal (
+    RTCORBA::ServerProtocolPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::ServerProtocolPolicy_ptr
-tao_RTCORBA_ServerProtocolPolicy_narrow (
+RTCORBA::tao_ServerProtocolPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2178,7 +1666,7 @@ tao_RTCORBA_ServerProtocolPolicy_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_ServerProtocolPolicy_upcast (
+RTCORBA::tao_ServerProtocolPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -2187,205 +1675,32 @@ tao_RTCORBA_ServerProtocolPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_ServerProtocolPolicy_marshal (
-    RTCORBA::ServerProtocolPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::ServerProtocolPolicy_var
-// *************************************************************
-
-RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (void)
-  : ptr_ (ServerProtocolPolicy::_nil ())
-{}
-
-::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (const ::RTCORBA::ServerProtocolPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ServerProtocolPolicy::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::ServerProtocolPolicy_var::~ServerProtocolPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::ServerProtocolPolicy_var &
-RTCORBA::ServerProtocolPolicy_var::operator= (ServerProtocolPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::ServerProtocolPolicy_var &
-RTCORBA::ServerProtocolPolicy_var::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::ServerProtocolPolicy_var::operator const ::RTCORBA::ServerProtocolPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::ServerProtocolPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-  return val;
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::tao_duplicate (ServerProtocolPolicy_ptr p)
-{
-  return ::RTCORBA::ServerProtocolPolicy::_duplicate (p);
-}
-
-void
-RTCORBA::ServerProtocolPolicy_var::tao_release (ServerProtocolPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::tao_nil (void)
-{
-  return ::RTCORBA::ServerProtocolPolicy::_nil ();
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::ServerProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::ServerProtocolPolicy_var::tao_upcast (void *src)
-{
-  ServerProtocolPolicy **tmp =
-    ACE_static_cast (ServerProtocolPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::ServerProtocolPolicy,
+        RTCORBA::tao_ServerProtocolPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::ServerProtocolPolicy,
+        RTCORBA::tao_ServerProtocolPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::ServerProtocolPolicy, \
+        RTCORBA::tao_ServerProtocolPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::ServerProtocolPolicy, \
+        RTCORBA::tao_ServerProtocolPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::ServerProtocolPolicy_out
-// *************************************************************
-
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-}
-
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-}
-
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (const ::RTCORBA::ServerProtocolPolicy_out &p)
-  : ptr_ (ACE_const_cast (ServerProtocolPolicy_out &, p).ptr_)
-{}
-
-::RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerProtocolPolicy_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (ServerProtocolPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::ServerProtocolPolicy_out::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 {}
@@ -2393,7 +1708,7 @@ RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerProtocolPolicy *tmp = ACE_static_cast (ServerProtocolPolicy *, _tao_void_pointer);
@@ -2409,7 +1724,7 @@ RTCORBA::ServerProtocolPolicy::_narrow (
   return ServerProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::ServerProtocolPolicy_ptr 
+RTCORBA::ServerProtocolPolicy_ptr
 RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2419,7 +1734,7 @@ RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
     {
       return ServerProtocolPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ServerProtocolPolicy_ptr,
@@ -2439,14 +1754,14 @@ RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, ServerProtocolPolicy)::_tao_class_id)
@@ -2479,12 +1794,12 @@ void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2493,6 +1808,12 @@ const char* RTCORBA::ServerProtocolPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2500,24 +1821,24 @@ static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0
     21,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ServerProtocolPolicy
   };
 
@@ -2544,7 +1865,7 @@ TAO_NAMESPACE_END
 int RTCORBA::ClientProtocolPolicy::_tao_class_id = 0;
 
 RTCORBA::ClientProtocolPolicy_ptr
-tao_RTCORBA_ClientProtocolPolicy_duplicate (
+RTCORBA::tao_ClientProtocolPolicy_life::tao_duplicate (
     RTCORBA::ClientProtocolPolicy_ptr p
   )
 {
@@ -2552,7 +1873,7 @@ tao_RTCORBA_ClientProtocolPolicy_duplicate (
 }
 
 void
-tao_RTCORBA_ClientProtocolPolicy_release (
+RTCORBA::tao_ClientProtocolPolicy_life::tao_release (
     RTCORBA::ClientProtocolPolicy_ptr p
   )
 {
@@ -2560,15 +1881,24 @@ tao_RTCORBA_ClientProtocolPolicy_release (
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
-tao_RTCORBA_ClientProtocolPolicy_nil (
+RTCORBA::tao_ClientProtocolPolicy_life::tao_nil (
     void
   )
 {
   return RTCORBA::ClientProtocolPolicy::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_ClientProtocolPolicy_life::tao_marshal (
+    RTCORBA::ClientProtocolPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::ClientProtocolPolicy_ptr
-tao_RTCORBA_ClientProtocolPolicy_narrow (
+RTCORBA::tao_ClientProtocolPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2577,7 +1907,7 @@ tao_RTCORBA_ClientProtocolPolicy_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_ClientProtocolPolicy_upcast (
+RTCORBA::tao_ClientProtocolPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -2586,205 +1916,32 @@ tao_RTCORBA_ClientProtocolPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_ClientProtocolPolicy_marshal (
-    RTCORBA::ClientProtocolPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::ClientProtocolPolicy_var
-// *************************************************************
-
-RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (void)
-  : ptr_ (ClientProtocolPolicy::_nil ())
-{}
-
-::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (const ::RTCORBA::ClientProtocolPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (ClientProtocolPolicy::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::ClientProtocolPolicy_var::~ClientProtocolPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::ClientProtocolPolicy_var &
-RTCORBA::ClientProtocolPolicy_var::operator= (ClientProtocolPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::ClientProtocolPolicy_var &
-RTCORBA::ClientProtocolPolicy_var::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::ClientProtocolPolicy_var::operator const ::RTCORBA::ClientProtocolPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::ClientProtocolPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
-  return val;
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::tao_duplicate (ClientProtocolPolicy_ptr p)
-{
-  return ::RTCORBA::ClientProtocolPolicy::_duplicate (p);
-}
-
-void
-RTCORBA::ClientProtocolPolicy_var::tao_release (ClientProtocolPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::tao_nil (void)
-{
-  return ::RTCORBA::ClientProtocolPolicy::_nil ();
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::ClientProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::ClientProtocolPolicy_var::tao_upcast (void *src)
-{
-  ClientProtocolPolicy **tmp =
-    ACE_static_cast (ClientProtocolPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::ClientProtocolPolicy,
+        RTCORBA::tao_ClientProtocolPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::ClientProtocolPolicy,
+        RTCORBA::tao_ClientProtocolPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::ClientProtocolPolicy, \
+        RTCORBA::tao_ClientProtocolPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::ClientProtocolPolicy, \
+        RTCORBA::tao_ClientProtocolPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::ClientProtocolPolicy_out
-// *************************************************************
-
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
-}
-
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
-}
-
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (const ::RTCORBA::ClientProtocolPolicy_out &p)
-  : ptr_ (ACE_const_cast (ClientProtocolPolicy_out &, p).ptr_)
-{}
-
-::RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ClientProtocolPolicy_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (ClientProtocolPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::ClientProtocolPolicy_out::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 {}
@@ -2792,7 +1949,7 @@ RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 {}
 
-void 
+void
 RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientProtocolPolicy *tmp = ACE_static_cast (ClientProtocolPolicy *, _tao_void_pointer);
@@ -2808,7 +1965,7 @@ RTCORBA::ClientProtocolPolicy::_narrow (
   return ClientProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::ClientProtocolPolicy_ptr 
+RTCORBA::ClientProtocolPolicy_ptr
 RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2818,7 +1975,7 @@ RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
     {
       return ClientProtocolPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           ClientProtocolPolicy_ptr,
@@ -2838,14 +1995,14 @@ RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, ClientProtocolPolicy)::_tao_class_id)
@@ -2878,12 +2035,12 @@ void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -2892,6 +2049,12 @@ const char* RTCORBA::ClientProtocolPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2899,24 +2062,24 @@ static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0
     21,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c506f),
+  ACE_NTOHL (0x6c696379),
   ACE_NTOHL (0x0),  // name = ClientProtocolPolicy
   };
 
@@ -2943,7 +2106,7 @@ TAO_NAMESPACE_END
 int RTCORBA::PrivateConnectionPolicy::_tao_class_id = 0;
 
 RTCORBA::PrivateConnectionPolicy_ptr
-tao_RTCORBA_PrivateConnectionPolicy_duplicate (
+RTCORBA::tao_PrivateConnectionPolicy_life::tao_duplicate (
     RTCORBA::PrivateConnectionPolicy_ptr p
   )
 {
@@ -2951,7 +2114,7 @@ tao_RTCORBA_PrivateConnectionPolicy_duplicate (
 }
 
 void
-tao_RTCORBA_PrivateConnectionPolicy_release (
+RTCORBA::tao_PrivateConnectionPolicy_life::tao_release (
     RTCORBA::PrivateConnectionPolicy_ptr p
   )
 {
@@ -2959,15 +2122,24 @@ tao_RTCORBA_PrivateConnectionPolicy_release (
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
-tao_RTCORBA_PrivateConnectionPolicy_nil (
+RTCORBA::tao_PrivateConnectionPolicy_life::tao_nil (
     void
   )
 {
   return RTCORBA::PrivateConnectionPolicy::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_PrivateConnectionPolicy_life::tao_marshal (
+    RTCORBA::PrivateConnectionPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::PrivateConnectionPolicy_ptr
-tao_RTCORBA_PrivateConnectionPolicy_narrow (
+RTCORBA::tao_PrivateConnectionPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -2976,7 +2148,7 @@ tao_RTCORBA_PrivateConnectionPolicy_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_PrivateConnectionPolicy_upcast (
+RTCORBA::tao_PrivateConnectionPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -2985,205 +2157,32 @@ tao_RTCORBA_PrivateConnectionPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_PrivateConnectionPolicy_marshal (
-    RTCORBA::PrivateConnectionPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::PrivateConnectionPolicy_var
-// *************************************************************
-
-RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (void)
-  : ptr_ (PrivateConnectionPolicy::_nil ())
-{}
-
-::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (const ::RTCORBA::PrivateConnectionPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (PrivateConnectionPolicy::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::PrivateConnectionPolicy_var::~PrivateConnectionPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::PrivateConnectionPolicy_var &
-RTCORBA::PrivateConnectionPolicy_var::operator= (PrivateConnectionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::PrivateConnectionPolicy_var &
-RTCORBA::PrivateConnectionPolicy_var::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::PrivateConnectionPolicy_var::operator const ::RTCORBA::PrivateConnectionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::PrivateConnectionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
-  return val;
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::tao_duplicate (PrivateConnectionPolicy_ptr p)
-{
-  return ::RTCORBA::PrivateConnectionPolicy::_duplicate (p);
-}
-
-void
-RTCORBA::PrivateConnectionPolicy_var::tao_release (PrivateConnectionPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::tao_nil (void)
-{
-  return ::RTCORBA::PrivateConnectionPolicy::_nil ();
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::PrivateConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::PrivateConnectionPolicy_var::tao_upcast (void *src)
-{
-  PrivateConnectionPolicy **tmp =
-    ACE_static_cast (PrivateConnectionPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::PrivateConnectionPolicy,
+        RTCORBA::tao_PrivateConnectionPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::PrivateConnectionPolicy,
+        RTCORBA::tao_PrivateConnectionPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::PrivateConnectionPolicy, \
+        RTCORBA::tao_PrivateConnectionPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::PrivateConnectionPolicy, \
+        RTCORBA::tao_PrivateConnectionPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::PrivateConnectionPolicy_out
-// *************************************************************
-
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
-}
-
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
-}
-
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (const ::RTCORBA::PrivateConnectionPolicy_out &p)
-  : ptr_ (ACE_const_cast (PrivateConnectionPolicy_out &, p).ptr_)
-{}
-
-::RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (PrivateConnectionPolicy_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (PrivateConnectionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::PrivateConnectionPolicy_out::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 {}
@@ -3191,7 +2190,7 @@ RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrivateConnectionPolicy *tmp = ACE_static_cast (PrivateConnectionPolicy *, _tao_void_pointer);
@@ -3207,7 +2206,7 @@ RTCORBA::PrivateConnectionPolicy::_narrow (
   return PrivateConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::PrivateConnectionPolicy_ptr 
+RTCORBA::PrivateConnectionPolicy_ptr
 RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3217,7 +2216,7 @@ RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
     {
       return PrivateConnectionPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           PrivateConnectionPolicy_ptr,
@@ -3237,14 +2236,14 @@ RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, PrivateConnectionPolicy)::_tao_class_id)
@@ -3277,12 +2276,12 @@ void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3291,6 +2290,12 @@ const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) co
   return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3298,24 +2303,24 @@ static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726976), 
-  ACE_NTOHL (0x61746543), 
-  ACE_NTOHL (0x6f6e6e65), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e506f6c), 
-  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x50726976),
+  ACE_NTOHL (0x61746543),
+  ACE_NTOHL (0x6f6e6e65),
+  ACE_NTOHL (0x6374696f),
+  ACE_NTOHL (0x6e506f6c),
+  ACE_NTOHL (0x6963793a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0
     24,
-  ACE_NTOHL (0x50726976), 
-  ACE_NTOHL (0x61746543), 
-  ACE_NTOHL (0x6f6e6e65), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x50726976),
+  ACE_NTOHL (0x61746543),
+  ACE_NTOHL (0x6f6e6e65),
+  ACE_NTOHL (0x6374696f),
+  ACE_NTOHL (0x6e506f6c),
   ACE_NTOHL (0x69637900),  // name = PrivateConnectionPolicy
   };
 
@@ -3342,7 +2347,7 @@ TAO_NAMESPACE_END
 int RTCORBA::TCPProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::TCPProtocolProperties_ptr
-tao_RTCORBA_TCPProtocolProperties_duplicate (
+RTCORBA::tao_TCPProtocolProperties_life::tao_duplicate (
     RTCORBA::TCPProtocolProperties_ptr p
   )
 {
@@ -3350,7 +2355,7 @@ tao_RTCORBA_TCPProtocolProperties_duplicate (
 }
 
 void
-tao_RTCORBA_TCPProtocolProperties_release (
+RTCORBA::tao_TCPProtocolProperties_life::tao_release (
     RTCORBA::TCPProtocolProperties_ptr p
   )
 {
@@ -3358,15 +2363,24 @@ tao_RTCORBA_TCPProtocolProperties_release (
 }
 
 RTCORBA::TCPProtocolProperties_ptr
-tao_RTCORBA_TCPProtocolProperties_nil (
+RTCORBA::tao_TCPProtocolProperties_life::tao_nil (
     void
   )
 {
   return RTCORBA::TCPProtocolProperties::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_TCPProtocolProperties_life::tao_marshal (
+    RTCORBA::TCPProtocolProperties_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::TCPProtocolProperties_ptr
-tao_RTCORBA_TCPProtocolProperties_narrow (
+RTCORBA::tao_TCPProtocolProperties_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3375,7 +2389,7 @@ tao_RTCORBA_TCPProtocolProperties_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_TCPProtocolProperties_upcast (
+RTCORBA::tao_TCPProtocolProperties_cast::tao_upcast (
     void *src
   )
 {
@@ -3384,205 +2398,32 @@ tao_RTCORBA_TCPProtocolProperties_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_TCPProtocolProperties_marshal (
-    RTCORBA::TCPProtocolProperties_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::TCPProtocolProperties_var
-// *************************************************************
-
-RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (void)
-  : ptr_ (TCPProtocolProperties::_nil ())
-{}
-
-::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (const ::RTCORBA::TCPProtocolProperties_var &p)
-  : TAO_Base_var (),
-    ptr_ (TCPProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::TCPProtocolProperties_var::~TCPProtocolProperties_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::TCPProtocolProperties_var &
-RTCORBA::TCPProtocolProperties_var::operator= (TCPProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::TCPProtocolProperties_var &
-RTCORBA::TCPProtocolProperties_var::operator= (const ::RTCORBA::TCPProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::TCPProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::TCPProtocolProperties_var::operator const ::RTCORBA::TCPProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::TCPProtocolProperties_ptr &
-RTCORBA::TCPProtocolProperties_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::TCPProtocolProperties_ptr &
-RTCORBA::TCPProtocolProperties_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::TCPProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
-  return val;
-}
-
-::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::tao_duplicate (TCPProtocolProperties_ptr p)
-{
-  return ::RTCORBA::TCPProtocolProperties::_duplicate (p);
-}
-
-void
-RTCORBA::TCPProtocolProperties_var::tao_release (TCPProtocolProperties_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::tao_nil (void)
-{
-  return ::RTCORBA::TCPProtocolProperties::_nil ();
-}
-
-::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::TCPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::TCPProtocolProperties_var::tao_upcast (void *src)
-{
-  TCPProtocolProperties **tmp =
-    ACE_static_cast (TCPProtocolProperties **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::TCPProtocolProperties,
+        RTCORBA::tao_TCPProtocolProperties_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::TCPProtocolProperties,
+        RTCORBA::tao_TCPProtocolProperties_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::TCPProtocolProperties, \
+        RTCORBA::tao_TCPProtocolProperties_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::TCPProtocolProperties, \
+        RTCORBA::tao_TCPProtocolProperties_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::TCPProtocolProperties_out
-// *************************************************************
-
-RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
-}
-
-RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
-}
-
-RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (const ::RTCORBA::TCPProtocolProperties_out &p)
-  : ptr_ (ACE_const_cast (TCPProtocolProperties_out &, p).ptr_)
-{}
-
-::RTCORBA::TCPProtocolProperties_out &
-RTCORBA::TCPProtocolProperties_out::operator= (const ::RTCORBA::TCPProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (TCPProtocolProperties_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::TCPProtocolProperties_out &
-RTCORBA::TCPProtocolProperties_out::operator= (const ::RTCORBA::TCPProtocolProperties_var &p)
-{
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::TCPProtocolProperties_out &
-RTCORBA::TCPProtocolProperties_out::operator= (TCPProtocolProperties_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::TCPProtocolProperties_out::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::TCPProtocolProperties_ptr &
-RTCORBA::TCPProtocolProperties_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 {}
@@ -3590,7 +2431,7 @@ RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   TCPProtocolProperties *tmp = ACE_static_cast (TCPProtocolProperties *, _tao_void_pointer);
@@ -3606,7 +2447,7 @@ RTCORBA::TCPProtocolProperties::_narrow (
   return TCPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::TCPProtocolProperties_ptr 
+RTCORBA::TCPProtocolProperties_ptr
 RTCORBA::TCPProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3616,7 +2457,7 @@ RTCORBA::TCPProtocolProperties::_unchecked_narrow (
     {
       return TCPProtocolProperties::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           TCPProtocolProperties_ptr,
@@ -3636,14 +2477,14 @@ RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::TCPProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, TCPProtocolProperties)::_tao_class_id)
@@ -3676,12 +2517,12 @@ void *RTCORBA::TCPProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -3690,6 +2531,12 @@ const char* RTCORBA::TCPProtocolProperties::_interface_repository_id (void) cons
   return "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -3697,24 +2544,24 @@ static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54435050), 
-  ACE_NTOHL (0x726f746f), 
-  ACE_NTOHL (0x636f6c50), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
-  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54435050),
+  ACE_NTOHL (0x726f746f),
+  ACE_NTOHL (0x636f6c50),
+  ACE_NTOHL (0x726f7065),
+  ACE_NTOHL (0x72746965),
+  ACE_NTOHL (0x733a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0
     22,
-  ACE_NTOHL (0x54435050), 
-  ACE_NTOHL (0x726f746f), 
-  ACE_NTOHL (0x636f6c50), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x54435050),
+  ACE_NTOHL (0x726f746f),
+  ACE_NTOHL (0x636f6c50),
+  ACE_NTOHL (0x726f7065),
+  ACE_NTOHL (0x72746965),
   ACE_NTOHL (0x73000000),  // name = TCPProtocolProperties
   };
 
@@ -3741,7 +2588,7 @@ TAO_NAMESPACE_END
 int RTCORBA::GIOPProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::GIOPProtocolProperties_ptr
-tao_RTCORBA_GIOPProtocolProperties_duplicate (
+RTCORBA::tao_GIOPProtocolProperties_life::tao_duplicate (
     RTCORBA::GIOPProtocolProperties_ptr p
   )
 {
@@ -3749,7 +2596,7 @@ tao_RTCORBA_GIOPProtocolProperties_duplicate (
 }
 
 void
-tao_RTCORBA_GIOPProtocolProperties_release (
+RTCORBA::tao_GIOPProtocolProperties_life::tao_release (
     RTCORBA::GIOPProtocolProperties_ptr p
   )
 {
@@ -3757,15 +2604,24 @@ tao_RTCORBA_GIOPProtocolProperties_release (
 }
 
 RTCORBA::GIOPProtocolProperties_ptr
-tao_RTCORBA_GIOPProtocolProperties_nil (
+RTCORBA::tao_GIOPProtocolProperties_life::tao_nil (
     void
   )
 {
   return RTCORBA::GIOPProtocolProperties::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_GIOPProtocolProperties_life::tao_marshal (
+    RTCORBA::GIOPProtocolProperties_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::GIOPProtocolProperties_ptr
-tao_RTCORBA_GIOPProtocolProperties_narrow (
+RTCORBA::tao_GIOPProtocolProperties_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -3774,7 +2630,7 @@ tao_RTCORBA_GIOPProtocolProperties_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_GIOPProtocolProperties_upcast (
+RTCORBA::tao_GIOPProtocolProperties_cast::tao_upcast (
     void *src
   )
 {
@@ -3783,205 +2639,32 @@ tao_RTCORBA_GIOPProtocolProperties_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_GIOPProtocolProperties_marshal (
-    RTCORBA::GIOPProtocolProperties_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::GIOPProtocolProperties_var
-// *************************************************************
-
-RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (void)
-  : ptr_ (GIOPProtocolProperties::_nil ())
-{}
-
-::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (const ::RTCORBA::GIOPProtocolProperties_var &p)
-  : TAO_Base_var (),
-    ptr_ (GIOPProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::GIOPProtocolProperties_var::~GIOPProtocolProperties_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::GIOPProtocolProperties_var &
-RTCORBA::GIOPProtocolProperties_var::operator= (GIOPProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::GIOPProtocolProperties_var &
-RTCORBA::GIOPProtocolProperties_var::operator= (const ::RTCORBA::GIOPProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::GIOPProtocolProperties_var::operator const ::RTCORBA::GIOPProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr &
-RTCORBA::GIOPProtocolProperties_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr &
-RTCORBA::GIOPProtocolProperties_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::GIOPProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
-  return val;
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::tao_duplicate (GIOPProtocolProperties_ptr p)
-{
-  return ::RTCORBA::GIOPProtocolProperties::_duplicate (p);
-}
-
-void
-RTCORBA::GIOPProtocolProperties_var::tao_release (GIOPProtocolProperties_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::tao_nil (void)
-{
-  return ::RTCORBA::GIOPProtocolProperties::_nil ();
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::GIOPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::GIOPProtocolProperties_var::tao_upcast (void *src)
-{
-  GIOPProtocolProperties **tmp =
-    ACE_static_cast (GIOPProtocolProperties **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::GIOPProtocolProperties,
+        RTCORBA::tao_GIOPProtocolProperties_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::GIOPProtocolProperties,
+        RTCORBA::tao_GIOPProtocolProperties_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::GIOPProtocolProperties, \
+        RTCORBA::tao_GIOPProtocolProperties_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::GIOPProtocolProperties, \
+        RTCORBA::tao_GIOPProtocolProperties_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::GIOPProtocolProperties_out
-// *************************************************************
-
-RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
-}
-
-RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
-}
-
-RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (const ::RTCORBA::GIOPProtocolProperties_out &p)
-  : ptr_ (ACE_const_cast (GIOPProtocolProperties_out &, p).ptr_)
-{}
-
-::RTCORBA::GIOPProtocolProperties_out &
-RTCORBA::GIOPProtocolProperties_out::operator= (const ::RTCORBA::GIOPProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (GIOPProtocolProperties_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::GIOPProtocolProperties_out &
-RTCORBA::GIOPProtocolProperties_out::operator= (const ::RTCORBA::GIOPProtocolProperties_var &p)
-{
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::GIOPProtocolProperties_out &
-RTCORBA::GIOPProtocolProperties_out::operator= (GIOPProtocolProperties_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::GIOPProtocolProperties_out::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr &
-RTCORBA::GIOPProtocolProperties_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 {}
@@ -3989,7 +2672,7 @@ RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   GIOPProtocolProperties *tmp = ACE_static_cast (GIOPProtocolProperties *, _tao_void_pointer);
@@ -4005,7 +2688,7 @@ RTCORBA::GIOPProtocolProperties::_narrow (
   return GIOPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::GIOPProtocolProperties_ptr 
+RTCORBA::GIOPProtocolProperties_ptr
 RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4015,7 +2698,7 @@ RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
     {
       return GIOPProtocolProperties::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           GIOPProtocolProperties_ptr,
@@ -4035,14 +2718,14 @@ RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::GIOPProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, GIOPProtocolProperties)::_tao_class_id)
@@ -4075,12 +2758,12 @@ void *RTCORBA::GIOPProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4089,6 +2772,12 @@ const char* RTCORBA::GIOPProtocolProperties::_interface_repository_id (void) con
   return "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4096,24 +2785,24 @@ static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x47494f50),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x65733a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0
     23,
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x47494f50),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = GIOPProtocolProperties
   };
 
@@ -4140,7 +2829,7 @@ TAO_NAMESPACE_END
 int RTCORBA::UnixDomainProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::UnixDomainProtocolProperties_ptr
-tao_RTCORBA_UnixDomainProtocolProperties_duplicate (
+RTCORBA::tao_UnixDomainProtocolProperties_life::tao_duplicate (
     RTCORBA::UnixDomainProtocolProperties_ptr p
   )
 {
@@ -4148,7 +2837,7 @@ tao_RTCORBA_UnixDomainProtocolProperties_duplicate (
 }
 
 void
-tao_RTCORBA_UnixDomainProtocolProperties_release (
+RTCORBA::tao_UnixDomainProtocolProperties_life::tao_release (
     RTCORBA::UnixDomainProtocolProperties_ptr p
   )
 {
@@ -4156,15 +2845,24 @@ tao_RTCORBA_UnixDomainProtocolProperties_release (
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr
-tao_RTCORBA_UnixDomainProtocolProperties_nil (
+RTCORBA::tao_UnixDomainProtocolProperties_life::tao_nil (
     void
   )
 {
   return RTCORBA::UnixDomainProtocolProperties::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_UnixDomainProtocolProperties_life::tao_marshal (
+    RTCORBA::UnixDomainProtocolProperties_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::UnixDomainProtocolProperties_ptr
-tao_RTCORBA_UnixDomainProtocolProperties_narrow (
+RTCORBA::tao_UnixDomainProtocolProperties_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -4173,7 +2871,7 @@ tao_RTCORBA_UnixDomainProtocolProperties_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_UnixDomainProtocolProperties_upcast (
+RTCORBA::tao_UnixDomainProtocolProperties_cast::tao_upcast (
     void *src
   )
 {
@@ -4182,205 +2880,32 @@ tao_RTCORBA_UnixDomainProtocolProperties_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_UnixDomainProtocolProperties_marshal (
-    RTCORBA::UnixDomainProtocolProperties_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::UnixDomainProtocolProperties_var
-// *************************************************************
-
-RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (void)
-  : ptr_ (UnixDomainProtocolProperties::_nil ())
-{}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (const ::RTCORBA::UnixDomainProtocolProperties_var &p)
-  : TAO_Base_var (),
-    ptr_ (UnixDomainProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::UnixDomainProtocolProperties_var::~UnixDomainProtocolProperties_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::UnixDomainProtocolProperties_var &
-RTCORBA::UnixDomainProtocolProperties_var::operator= (UnixDomainProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::UnixDomainProtocolProperties_var &
-RTCORBA::UnixDomainProtocolProperties_var::operator= (const ::RTCORBA::UnixDomainProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::UnixDomainProtocolProperties_var::operator const ::RTCORBA::UnixDomainProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr &
-RTCORBA::UnixDomainProtocolProperties_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr &
-RTCORBA::UnixDomainProtocolProperties_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::UnixDomainProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-  return val;
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::tao_duplicate (UnixDomainProtocolProperties_ptr p)
-{
-  return ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p);
-}
-
-void
-RTCORBA::UnixDomainProtocolProperties_var::tao_release (UnixDomainProtocolProperties_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::tao_nil (void)
-{
-  return ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::UnixDomainProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::UnixDomainProtocolProperties_var::tao_upcast (void *src)
-{
-  UnixDomainProtocolProperties **tmp =
-    ACE_static_cast (UnixDomainProtocolProperties **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::UnixDomainProtocolProperties,
+        RTCORBA::tao_UnixDomainProtocolProperties_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::UnixDomainProtocolProperties,
+        RTCORBA::tao_UnixDomainProtocolProperties_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::UnixDomainProtocolProperties, \
+        RTCORBA::tao_UnixDomainProtocolProperties_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::UnixDomainProtocolProperties, \
+        RTCORBA::tao_UnixDomainProtocolProperties_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::UnixDomainProtocolProperties_out
-// *************************************************************
-
-RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-}
-
-RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-}
-
-RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (const ::RTCORBA::UnixDomainProtocolProperties_out &p)
-  : ptr_ (ACE_const_cast (UnixDomainProtocolProperties_out &, p).ptr_)
-{}
-
-::RTCORBA::UnixDomainProtocolProperties_out &
-RTCORBA::UnixDomainProtocolProperties_out::operator= (const ::RTCORBA::UnixDomainProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (UnixDomainProtocolProperties_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::UnixDomainProtocolProperties_out &
-RTCORBA::UnixDomainProtocolProperties_out::operator= (const ::RTCORBA::UnixDomainProtocolProperties_var &p)
-{
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::UnixDomainProtocolProperties_out &
-RTCORBA::UnixDomainProtocolProperties_out::operator= (UnixDomainProtocolProperties_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::UnixDomainProtocolProperties_out::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr &
-RTCORBA::UnixDomainProtocolProperties_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 {}
@@ -4388,7 +2913,7 @@ RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnixDomainProtocolProperties *tmp = ACE_static_cast (UnixDomainProtocolProperties *, _tao_void_pointer);
@@ -4404,7 +2929,7 @@ RTCORBA::UnixDomainProtocolProperties::_narrow (
   return UnixDomainProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::UnixDomainProtocolProperties_ptr 
+RTCORBA::UnixDomainProtocolProperties_ptr
 RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4414,7 +2939,7 @@ RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
     {
       return UnixDomainProtocolProperties::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           UnixDomainProtocolProperties_ptr,
@@ -4434,14 +2959,14 @@ RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, UnixDomainProtocolProperties)::_tao_class_id)
@@ -4474,12 +2999,12 @@ void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptr_arith_t ty
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4488,6 +3013,12 @@ const char* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (voi
   return "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4495,28 +3026,28 @@ static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x556e6978), 
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e5072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5072), 
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x74696573), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x556e6978),
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e5072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c5072),
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x74696573),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0
     29,
-  ACE_NTOHL (0x556e6978), 
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e5072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5072), 
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x74696573), 
+  ACE_NTOHL (0x556e6978),
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e5072),
+  ACE_NTOHL (0x6f746f63),
+  ACE_NTOHL (0x6f6c5072),
+  ACE_NTOHL (0x6f706572),
+  ACE_NTOHL (0x74696573),
   ACE_NTOHL (0x0),  // name = UnixDomainProtocolProperties
   };
 
@@ -4543,7 +3074,7 @@ TAO_NAMESPACE_END
 int RTCORBA::SharedMemoryProtocolProperties::_tao_class_id = 0;
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
-tao_RTCORBA_SharedMemoryProtocolProperties_duplicate (
+RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_duplicate (
     RTCORBA::SharedMemoryProtocolProperties_ptr p
   )
 {
@@ -4551,7 +3082,7 @@ tao_RTCORBA_SharedMemoryProtocolProperties_duplicate (
 }
 
 void
-tao_RTCORBA_SharedMemoryProtocolProperties_release (
+RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_release (
     RTCORBA::SharedMemoryProtocolProperties_ptr p
   )
 {
@@ -4559,15 +3090,24 @@ tao_RTCORBA_SharedMemoryProtocolProperties_release (
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
-tao_RTCORBA_SharedMemoryProtocolProperties_nil (
+RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_nil (
     void
   )
 {
   return RTCORBA::SharedMemoryProtocolProperties::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_marshal (
+    RTCORBA::SharedMemoryProtocolProperties_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::SharedMemoryProtocolProperties_ptr
-tao_RTCORBA_SharedMemoryProtocolProperties_narrow (
+RTCORBA::tao_SharedMemoryProtocolProperties_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -4576,7 +3116,7 @@ tao_RTCORBA_SharedMemoryProtocolProperties_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_SharedMemoryProtocolProperties_upcast (
+RTCORBA::tao_SharedMemoryProtocolProperties_cast::tao_upcast (
     void *src
   )
 {
@@ -4585,205 +3125,32 @@ tao_RTCORBA_SharedMemoryProtocolProperties_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_SharedMemoryProtocolProperties_marshal (
-    RTCORBA::SharedMemoryProtocolProperties_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::SharedMemoryProtocolProperties_var
-// *************************************************************
-
-RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (void)
-  : ptr_ (SharedMemoryProtocolProperties::_nil ())
-{}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (const ::RTCORBA::SharedMemoryProtocolProperties_var &p)
-  : TAO_Base_var (),
-    ptr_ (SharedMemoryProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::SharedMemoryProtocolProperties_var::~SharedMemoryProtocolProperties_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::SharedMemoryProtocolProperties_var &
-RTCORBA::SharedMemoryProtocolProperties_var::operator= (SharedMemoryProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::SharedMemoryProtocolProperties_var &
-RTCORBA::SharedMemoryProtocolProperties_var::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::SharedMemoryProtocolProperties_var::operator const ::RTCORBA::SharedMemoryProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr &
-RTCORBA::SharedMemoryProtocolProperties_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr &
-RTCORBA::SharedMemoryProtocolProperties_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::SharedMemoryProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-  return val;
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::tao_duplicate (SharedMemoryProtocolProperties_ptr p)
-{
-  return ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p);
-}
-
-void
-RTCORBA::SharedMemoryProtocolProperties_var::tao_release (SharedMemoryProtocolProperties_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::tao_nil (void)
-{
-  return ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::SharedMemoryProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::SharedMemoryProtocolProperties_var::tao_upcast (void *src)
-{
-  SharedMemoryProtocolProperties **tmp =
-    ACE_static_cast (SharedMemoryProtocolProperties **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::SharedMemoryProtocolProperties,
+        RTCORBA::tao_SharedMemoryProtocolProperties_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::SharedMemoryProtocolProperties,
+        RTCORBA::tao_SharedMemoryProtocolProperties_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::SharedMemoryProtocolProperties, \
+        RTCORBA::tao_SharedMemoryProtocolProperties_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::SharedMemoryProtocolProperties, \
+        RTCORBA::tao_SharedMemoryProtocolProperties_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::SharedMemoryProtocolProperties_out
-// *************************************************************
-
-RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-}
-
-RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-}
-
-RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (const ::RTCORBA::SharedMemoryProtocolProperties_out &p)
-  : ptr_ (ACE_const_cast (SharedMemoryProtocolProperties_out &, p).ptr_)
-{}
-
-::RTCORBA::SharedMemoryProtocolProperties_out &
-RTCORBA::SharedMemoryProtocolProperties_out::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (SharedMemoryProtocolProperties_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::SharedMemoryProtocolProperties_out &
-RTCORBA::SharedMemoryProtocolProperties_out::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_var &p)
-{
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::SharedMemoryProtocolProperties_out &
-RTCORBA::SharedMemoryProtocolProperties_out::operator= (SharedMemoryProtocolProperties_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::SharedMemoryProtocolProperties_out::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr &
-RTCORBA::SharedMemoryProtocolProperties_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 {}
@@ -4791,7 +3158,7 @@ RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
 {}
 
-void 
+void
 RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   SharedMemoryProtocolProperties *tmp = ACE_static_cast (SharedMemoryProtocolProperties *, _tao_void_pointer);
@@ -4807,7 +3174,7 @@ RTCORBA::SharedMemoryProtocolProperties::_narrow (
   return SharedMemoryProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::SharedMemoryProtocolProperties_ptr 
+RTCORBA::SharedMemoryProtocolProperties_ptr
 RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4817,7 +3184,7 @@ RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
     {
       return SharedMemoryProtocolProperties::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           SharedMemoryProtocolProperties_ptr,
@@ -4837,14 +3204,14 @@ RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolPropert
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, SharedMemoryProtocolProperties)::_tao_class_id)
@@ -4877,12 +3244,12 @@ void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptr_arith_t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -4891,6 +3258,12 @@ const char* RTCORBA::SharedMemoryProtocolProperties::_interface_repository_id (v
   return "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -4898,28 +3271,28 @@ static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53686172), 
-  ACE_NTOHL (0x65644d65), 
-  ACE_NTOHL (0x6d6f7279), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x53686172),
+  ACE_NTOHL (0x65644d65),
+  ACE_NTOHL (0x6d6f7279),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
+  ACE_NTOHL (0x65733a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0
     31,
-  ACE_NTOHL (0x53686172), 
-  ACE_NTOHL (0x65644d65), 
-  ACE_NTOHL (0x6d6f7279), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x53686172),
+  ACE_NTOHL (0x65644d65),
+  ACE_NTOHL (0x6d6f7279),
+  ACE_NTOHL (0x50726f74),
+  ACE_NTOHL (0x6f636f6c),
+  ACE_NTOHL (0x50726f70),
+  ACE_NTOHL (0x65727469),
   ACE_NTOHL (0x65730000),  // name = SharedMemoryProtocolProperties
   };
 
@@ -4947,20 +3320,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
     13,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
   ACE_NTOHL (0x0),  // name = PriorityBand
   2, // member count
     4,
@@ -4969,24 +3342,24 @@ static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x5254434f),
+    ACE_NTOHL (0x5242412f),
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
         9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x5072696f),
+    ACE_NTOHL (0x72697479),
     ACE_NTOHL (0x0),  // name = Priority
         CORBA::tk_short,
 
 
   5,
-  ACE_NTOHL (0x68696768), 
+  ACE_NTOHL (0x68696768),
   ACE_NTOHL (0x0),  // name = high
     0xffffffff, // indirection
   0xffffffa8, // negative offset (-88)
@@ -5009,8 +3382,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -5018,117 +3391,58 @@ void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CS_
-
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_allocate_buffer (CORBA::ULong length)
-{
-  RTCORBA::PriorityBand* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      RTCORBA::PriorityBand *old =
-        ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
 
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  RTCORBA::PriorityBand *tmp =
-    ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
-  _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
-  this->buffer_ = 0;
-} 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void)
-{
-  this->_deallocate_buffer ();
-}
+template class
+  TAO_Fixed_Var_T<
+      PriorityBand
+    >;
 
-#endif /* end #if !defined */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      PriorityBand \
+    >
 
-#if !defined (_RTCORBA_PRIORITYBANDS_CS_)
-#define _RTCORBA_PRIORITYBANDS_CS_
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// RTCORBA::PriorityBands
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
 
 RTCORBA::PriorityBands::PriorityBands (void)
 {}
 
 RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_PriorityBands
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::PriorityBand
+      >
+    (max)
 {}
 
 RTCORBA::PriorityBands::PriorityBands (
     CORBA::ULong max,
     CORBA::ULong length,
-    RTCORBA::PriorityBand *buffer,
+    RTCORBA::PriorityBand* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_PriorityBands
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::PriorityBand
+      >
+    (max, length, buffer, release)
 {}
 
 RTCORBA::PriorityBands::PriorityBands (const PriorityBands &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_RTCORBA_PriorityBands
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        RTCORBA::PriorityBand
+      >
+    (seq)
 {}
 
-RTCORBA::PriorityBands::~PriorityBands (void) // dtor
+RTCORBA::PriorityBands::~PriorityBands (void)
 {}
 
 void RTCORBA::PriorityBands::_tao_any_destructor (void *_tao_void_pointer)
@@ -5137,7 +3451,37 @@ void RTCORBA::PriorityBands::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_FixedSeq_Var_T<
+      PriorityBands,
+      RTCORBA::PriorityBand
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      PriorityBands,
+      PriorityBands_var,
+      RTCORBA::PriorityBand
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_FixedSeq_Var_T< \
+      PriorityBands, \
+      RTCORBA::PriorityBand \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      PriorityBands, \
+      PriorityBands_var, \
+      RTCORBA::PriorityBand \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -5146,20 +3490,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x733a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
     14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
   ACE_NTOHL (0x73000000),  // name = PriorityBands
     CORBA::tk_sequence, // typecode kind
   188, // encapsulation length
@@ -5168,20 +3512,20 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
     172, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x5072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x42616e64), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x5254434f),
+      ACE_NTOHL (0x5242412f),
+      ACE_NTOHL (0x5072696f),
+      ACE_NTOHL (0x72697479),
+      ACE_NTOHL (0x42616e64),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
             13,
-      ACE_NTOHL (0x5072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x42616e64), 
+      ACE_NTOHL (0x5072696f),
+      ACE_NTOHL (0x72697479),
+      ACE_NTOHL (0x42616e64),
       ACE_NTOHL (0x0),  // name = PriorityBand
       2, // member count
             4,
@@ -5190,24 +3534,24 @@ static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x5254434f),
+        ACE_NTOHL (0x5242412f),
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
                 9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x5072696f),
+        ACE_NTOHL (0x72697479),
         ACE_NTOHL (0x0),  // name = Priority
                 CORBA::tk_short,
 
 
       5,
-      ACE_NTOHL (0x68696768), 
+      ACE_NTOHL (0x68696768),
       ACE_NTOHL (0x0),  // name = high
             0xffffffff, // indirection
       0xffffffa8, // negative offset (-88)
@@ -5239,7 +3583,7 @@ TAO_NAMESPACE_END
 int RTCORBA::PriorityBandedConnectionPolicy::_tao_class_id = 0;
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
-tao_RTCORBA_PriorityBandedConnectionPolicy_duplicate (
+RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_duplicate (
     RTCORBA::PriorityBandedConnectionPolicy_ptr p
   )
 {
@@ -5247,7 +3591,7 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_duplicate (
 }
 
 void
-tao_RTCORBA_PriorityBandedConnectionPolicy_release (
+RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_release (
     RTCORBA::PriorityBandedConnectionPolicy_ptr p
   )
 {
@@ -5255,15 +3599,24 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_release (
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
-tao_RTCORBA_PriorityBandedConnectionPolicy_nil (
+RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_nil (
     void
   )
 {
   return RTCORBA::PriorityBandedConnectionPolicy::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_marshal (
+    RTCORBA::PriorityBandedConnectionPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::PriorityBandedConnectionPolicy_ptr
-tao_RTCORBA_PriorityBandedConnectionPolicy_narrow (
+RTCORBA::tao_PriorityBandedConnectionPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -5272,7 +3625,7 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_PriorityBandedConnectionPolicy_upcast (
+RTCORBA::tao_PriorityBandedConnectionPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -5281,205 +3634,32 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_PriorityBandedConnectionPolicy_marshal (
-    RTCORBA::PriorityBandedConnectionPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::PriorityBandedConnectionPolicy_var
-// *************************************************************
-
-RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (void)
-  : ptr_ (PriorityBandedConnectionPolicy::_nil ())
-{}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (PriorityBandedConnectionPolicy::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::PriorityBandedConnectionPolicy_var::~PriorityBandedConnectionPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_var &
-RTCORBA::PriorityBandedConnectionPolicy_var::operator= (PriorityBandedConnectionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_var &
-RTCORBA::PriorityBandedConnectionPolicy_var::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_var::operator const ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::PriorityBandedConnectionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-  return val;
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::tao_duplicate (PriorityBandedConnectionPolicy_ptr p)
-{
-  return ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p);
-}
-
-void
-RTCORBA::PriorityBandedConnectionPolicy_var::tao_release (PriorityBandedConnectionPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::tao_nil (void)
-{
-  return ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::PriorityBandedConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::PriorityBandedConnectionPolicy_var::tao_upcast (void *src)
-{
-  PriorityBandedConnectionPolicy **tmp =
-    ACE_static_cast (PriorityBandedConnectionPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::PriorityBandedConnectionPolicy,
+        RTCORBA::tao_PriorityBandedConnectionPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::PriorityBandedConnectionPolicy,
+        RTCORBA::tao_PriorityBandedConnectionPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::PriorityBandedConnectionPolicy, \
+        RTCORBA::tao_PriorityBandedConnectionPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::PriorityBandedConnectionPolicy, \
+        RTCORBA::tao_PriorityBandedConnectionPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::PriorityBandedConnectionPolicy_out
-// *************************************************************
-
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p)
-  : ptr_ (ACE_const_cast (PriorityBandedConnectionPolicy_out &, p).ptr_)
-{}
-
-::RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (PriorityBandedConnectionPolicy_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (PriorityBandedConnectionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::PriorityBandedConnectionPolicy_out::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 {}
@@ -5487,7 +3667,7 @@ RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 {}
 
-void 
+void
 RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   PriorityBandedConnectionPolicy *tmp = ACE_static_cast (PriorityBandedConnectionPolicy *, _tao_void_pointer);
@@ -5503,7 +3683,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_narrow (
   return PriorityBandedConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_ptr 
+RTCORBA::PriorityBandedConnectionPolicy_ptr
 RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5513,7 +3693,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
     {
       return PriorityBandedConnectionPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           PriorityBandedConnectionPolicy_ptr,
@@ -5533,14 +3713,14 @@ RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPol
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, PriorityBandedConnectionPolicy)::_tao_class_id)
@@ -5573,12 +3753,12 @@ void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptr_arith_t
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -5587,6 +3767,12 @@ const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (v
   return "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -5594,28 +3780,28 @@ static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6e6e6563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6e6e6563),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0
     31,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6e6e6563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x42616e64),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6e6e6563),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
   ACE_NTOHL (0x63790000),  // name = PriorityBandedConnectionPolicy
   };
 
@@ -5642,7 +3828,7 @@ TAO_NAMESPACE_END
 int RTCORBA::Current::_tao_class_id = 0;
 
 RTCORBA::Current_ptr
-tao_RTCORBA_Current_duplicate (
+RTCORBA::tao_Current_life::tao_duplicate (
     RTCORBA::Current_ptr p
   )
 {
@@ -5650,7 +3836,7 @@ tao_RTCORBA_Current_duplicate (
 }
 
 void
-tao_RTCORBA_Current_release (
+RTCORBA::tao_Current_life::tao_release (
     RTCORBA::Current_ptr p
   )
 {
@@ -5658,15 +3844,24 @@ tao_RTCORBA_Current_release (
 }
 
 RTCORBA::Current_ptr
-tao_RTCORBA_Current_nil (
+RTCORBA::tao_Current_life::tao_nil (
     void
   )
 {
   return RTCORBA::Current::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_Current_life::tao_marshal (
+    RTCORBA::Current_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::Current_ptr
-tao_RTCORBA_Current_narrow (
+RTCORBA::tao_Current_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -5675,7 +3870,7 @@ tao_RTCORBA_Current_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_Current_upcast (
+RTCORBA::tao_Current_cast::tao_upcast (
     void *src
   )
 {
@@ -5684,205 +3879,32 @@ tao_RTCORBA_Current_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_Current_marshal (
-    RTCORBA::Current_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::Current_var
-// *************************************************************
-
-RTCORBA::Current_var::Current_var (void)
-  : ptr_ (Current::_nil ())
-{}
-
-::RTCORBA::Current_ptr
-RTCORBA::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::Current_var::Current_var (const ::RTCORBA::Current_var &p)
-  : TAO_Base_var (),
-    ptr_ (Current::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::Current_var::~Current_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::Current_var &
-RTCORBA::Current_var::operator= (Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::Current_var &
-RTCORBA::Current_var::operator= (const ::RTCORBA::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::Current_var::operator const ::RTCORBA::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Current_ptr
-RTCORBA::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Current_ptr
-RTCORBA::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Current_ptr &
-RTCORBA::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Current_ptr &
-RTCORBA::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::Current::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::Current_ptr
-RTCORBA::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::Current_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::Current::_nil ();
-  return val;
-}
-
-::RTCORBA::Current_ptr
-RTCORBA::Current_var::tao_duplicate (Current_ptr p)
-{
-  return ::RTCORBA::Current::_duplicate (p);
-}
-
-void
-RTCORBA::Current_var::tao_release (Current_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::Current_ptr
-RTCORBA::Current_var::tao_nil (void)
-{
-  return ::RTCORBA::Current::_nil ();
-}
-
-::RTCORBA::Current_ptr
-RTCORBA::Current_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::Current_var::tao_upcast (void *src)
-{
-  Current **tmp =
-    ACE_static_cast (Current **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::Current,
+        RTCORBA::tao_Current_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::Current,
+        RTCORBA::tao_Current_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::Current, \
+        RTCORBA::tao_Current_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::Current, \
+        RTCORBA::tao_Current_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::Current_out
-// *************************************************************
-
-RTCORBA::Current_out::Current_out (Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::Current::_nil ();
-}
-
-RTCORBA::Current_out::Current_out (Current_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::Current::_nil ();
-}
-
-RTCORBA::Current_out::Current_out (const ::RTCORBA::Current_out &p)
-  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
-{}
-
-::RTCORBA::Current_out &
-RTCORBA::Current_out::operator= (const ::RTCORBA::Current_out &p)
-{
-  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::Current_out &
-RTCORBA::Current_out::operator= (const ::RTCORBA::Current_var &p)
-{
-  this->ptr_ = ::RTCORBA::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::Current_out &
-RTCORBA::Current_out::operator= (Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::Current_out::operator ::RTCORBA::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Current_ptr &
-RTCORBA::Current_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Current_ptr
-RTCORBA::Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::Current::Current (void)
 {}
@@ -5890,7 +3912,7 @@ RTCORBA::Current::Current (void)
 RTCORBA::Current::~Current (void)
 {}
 
-void 
+void
 RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
@@ -5906,7 +3928,7 @@ RTCORBA::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::Current_ptr 
+RTCORBA::Current_ptr
 RTCORBA::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5916,7 +3938,7 @@ RTCORBA::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           Current_ptr,
@@ -5936,14 +3958,14 @@ RTCORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::Current::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, Current)::_tao_class_id)
@@ -5976,12 +3998,12 @@ void *RTCORBA::Current::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -5990,6 +4012,12 @@ const char* RTCORBA::Current::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/Current:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -5997,16 +4025,16 @@ static const CORBA::Long _oc_RTCORBA_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x656e743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/Current:1.0
     8,
-  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x43757272),
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -6033,7 +4061,7 @@ TAO_NAMESPACE_END
 int RTCORBA::Mutex::_tao_class_id = 0;
 
 RTCORBA::Mutex_ptr
-tao_RTCORBA_Mutex_duplicate (
+RTCORBA::tao_Mutex_life::tao_duplicate (
     RTCORBA::Mutex_ptr p
   )
 {
@@ -6041,7 +4069,7 @@ tao_RTCORBA_Mutex_duplicate (
 }
 
 void
-tao_RTCORBA_Mutex_release (
+RTCORBA::tao_Mutex_life::tao_release (
     RTCORBA::Mutex_ptr p
   )
 {
@@ -6049,15 +4077,24 @@ tao_RTCORBA_Mutex_release (
 }
 
 RTCORBA::Mutex_ptr
-tao_RTCORBA_Mutex_nil (
+RTCORBA::tao_Mutex_life::tao_nil (
     void
   )
 {
   return RTCORBA::Mutex::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_Mutex_life::tao_marshal (
+    RTCORBA::Mutex_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::Mutex_ptr
-tao_RTCORBA_Mutex_narrow (
+RTCORBA::tao_Mutex_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -6066,7 +4103,7 @@ tao_RTCORBA_Mutex_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_Mutex_upcast (
+RTCORBA::tao_Mutex_cast::tao_upcast (
     void *src
   )
 {
@@ -6075,205 +4112,32 @@ tao_RTCORBA_Mutex_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_Mutex_marshal (
-    RTCORBA::Mutex_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::Mutex_var
-// *************************************************************
-
-RTCORBA::Mutex_var::Mutex_var (void)
-  : ptr_ (Mutex::_nil ())
-{}
-
-::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::Mutex_var::Mutex_var (const ::RTCORBA::Mutex_var &p)
-  : TAO_Base_var (),
-    ptr_ (Mutex::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::Mutex_var::~Mutex_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::Mutex_var &
-RTCORBA::Mutex_var::operator= (Mutex_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::Mutex_var &
-RTCORBA::Mutex_var::operator= (const ::RTCORBA::Mutex_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::Mutex::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::Mutex_var::operator const ::RTCORBA::Mutex_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Mutex_ptr &
-RTCORBA::Mutex_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Mutex_ptr &
-RTCORBA::Mutex_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::Mutex::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::Mutex_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::Mutex::_nil ();
-  return val;
-}
-
-::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::tao_duplicate (Mutex_ptr p)
-{
-  return ::RTCORBA::Mutex::_duplicate (p);
-}
-
-void
-RTCORBA::Mutex_var::tao_release (Mutex_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::tao_nil (void)
-{
-  return ::RTCORBA::Mutex::_nil ();
-}
-
-::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::Mutex::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::Mutex_var::tao_upcast (void *src)
-{
-  Mutex **tmp =
-    ACE_static_cast (Mutex **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::Mutex,
+        RTCORBA::tao_Mutex_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::Mutex,
+        RTCORBA::tao_Mutex_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::Mutex, \
+        RTCORBA::tao_Mutex_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::Mutex, \
+        RTCORBA::tao_Mutex_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::Mutex_out
-// *************************************************************
-
-RTCORBA::Mutex_out::Mutex_out (Mutex_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::Mutex::_nil ();
-}
-
-RTCORBA::Mutex_out::Mutex_out (Mutex_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::Mutex::_nil ();
-}
-
-RTCORBA::Mutex_out::Mutex_out (const ::RTCORBA::Mutex_out &p)
-  : ptr_ (ACE_const_cast (Mutex_out &, p).ptr_)
-{}
-
-::RTCORBA::Mutex_out &
-RTCORBA::Mutex_out::operator= (const ::RTCORBA::Mutex_out &p)
-{
-  this->ptr_ = ACE_const_cast (Mutex_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::Mutex_out &
-RTCORBA::Mutex_out::operator= (const ::RTCORBA::Mutex_var &p)
-{
-  this->ptr_ = ::RTCORBA::Mutex::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::Mutex_out &
-RTCORBA::Mutex_out::operator= (Mutex_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::Mutex_out::operator ::RTCORBA::Mutex_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Mutex_ptr &
-RTCORBA::Mutex_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::Mutex::Mutex (void)
 {}
@@ -6281,7 +4145,7 @@ RTCORBA::Mutex::Mutex (void)
 RTCORBA::Mutex::~Mutex (void)
 {}
 
-void 
+void
 RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer)
 {
   Mutex *tmp = ACE_static_cast (Mutex *, _tao_void_pointer);
@@ -6297,7 +4161,7 @@ RTCORBA::Mutex::_narrow (
   return Mutex::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::Mutex_ptr 
+RTCORBA::Mutex_ptr
 RTCORBA::Mutex::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6307,7 +4171,7 @@ RTCORBA::Mutex::_unchecked_narrow (
     {
       return Mutex::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           Mutex_ptr,
@@ -6327,14 +4191,14 @@ RTCORBA::Mutex::_duplicate (Mutex_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::Mutex::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, Mutex)::_tao_class_id)
@@ -6353,12 +4217,12 @@ void *RTCORBA::Mutex::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -6367,6 +4231,12 @@ const char* RTCORBA::Mutex::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/Mutex:1.0";
 }
 
+CORBA::Boolean
+RTCORBA::Mutex::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -6374,16 +4244,16 @@ static const CORBA::Long _oc_RTCORBA_Mutex[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x783a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x4d757465),
+  ACE_NTOHL (0x783a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/Mutex:1.0
     6,
-  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x4d757465),
   ACE_NTOHL (0x78000000),  // name = Mutex
   };
 
@@ -6410,7 +4280,7 @@ TAO_NAMESPACE_END
 int RTCORBA::RTORB::_tao_class_id = 0;
 
 RTCORBA::RTORB_ptr
-tao_RTCORBA_RTORB_duplicate (
+RTCORBA::tao_RTORB_life::tao_duplicate (
     RTCORBA::RTORB_ptr p
   )
 {
@@ -6418,7 +4288,7 @@ tao_RTCORBA_RTORB_duplicate (
 }
 
 void
-tao_RTCORBA_RTORB_release (
+RTCORBA::tao_RTORB_life::tao_release (
     RTCORBA::RTORB_ptr p
   )
 {
@@ -6426,15 +4296,24 @@ tao_RTCORBA_RTORB_release (
 }
 
 RTCORBA::RTORB_ptr
-tao_RTCORBA_RTORB_nil (
+RTCORBA::tao_RTORB_life::tao_nil (
     void
   )
 {
   return RTCORBA::RTORB::_nil ();
 }
 
+CORBA::Boolean
+RTCORBA::tao_RTORB_life::tao_marshal (
+    RTCORBA::RTORB_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTCORBA::RTORB_ptr
-tao_RTCORBA_RTORB_narrow (
+RTCORBA::tao_RTORB_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -6443,7 +4322,7 @@ tao_RTCORBA_RTORB_narrow (
 }
 
 CORBA::Object *
-tao_RTCORBA_RTORB_upcast (
+RTCORBA::tao_RTORB_cast::tao_upcast (
     void *src
   )
 {
@@ -6452,205 +4331,32 @@ tao_RTCORBA_RTORB_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTCORBA_RTORB_marshal (
-    RTCORBA::RTORB_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTCORBA::RTORB_var
-// *************************************************************
-
-RTCORBA::RTORB_var::RTORB_var (void)
-  : ptr_ (RTORB::_nil ())
-{}
-
-::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTCORBA::RTORB_var::RTORB_var (const ::RTCORBA::RTORB_var &p)
-  : TAO_Base_var (),
-    ptr_ (RTORB::_duplicate (p.ptr ()))
-{}
-
-RTCORBA::RTORB_var::~RTORB_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTCORBA::RTORB_var &
-RTCORBA::RTORB_var::operator= (RTORB_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::RTORB_var &
-RTCORBA::RTORB_var::operator= (const ::RTCORBA::RTORB_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::RTORB::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTCORBA::RTORB_var::operator const ::RTCORBA::RTORB_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTCORBA::RTORB_ptr &
-RTCORBA::RTORB_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::RTORB_ptr &
-RTCORBA::RTORB_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::RTORB::_nil ();
-  return this->ptr_;
-}
-
-::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::RTORB_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::RTORB::_nil ();
-  return val;
-}
-
-::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::tao_duplicate (RTORB_ptr p)
-{
-  return ::RTCORBA::RTORB::_duplicate (p);
-}
-
-void
-RTCORBA::RTORB_var::tao_release (RTORB_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::tao_nil (void)
-{
-  return ::RTCORBA::RTORB::_nil ();
-}
-
-::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTCORBA::RTORB::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTCORBA::RTORB_var::tao_upcast (void *src)
-{
-  RTORB **tmp =
-    ACE_static_cast (RTORB **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTCORBA::RTORB,
+        RTCORBA::tao_RTORB_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTCORBA::RTORB,
+        RTCORBA::tao_RTORB_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTCORBA::RTORB, \
+        RTCORBA::tao_RTORB_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTCORBA::RTORB, \
+        RTCORBA::tao_RTORB_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTCORBA::RTORB_out
-// *************************************************************
-
-RTCORBA::RTORB_out::RTORB_out (RTORB_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::RTORB::_nil ();
-}
-
-RTCORBA::RTORB_out::RTORB_out (RTORB_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::RTORB::_nil ();
-}
-
-RTCORBA::RTORB_out::RTORB_out (const ::RTCORBA::RTORB_out &p)
-  : ptr_ (ACE_const_cast (RTORB_out &, p).ptr_)
-{}
-
-::RTCORBA::RTORB_out &
-RTCORBA::RTORB_out::operator= (const ::RTCORBA::RTORB_out &p)
-{
-  this->ptr_ = ACE_const_cast (RTORB_out&, p).ptr_;
-  return *this;
-}
-
-RTCORBA::RTORB_out &
-RTCORBA::RTORB_out::operator= (const ::RTCORBA::RTORB_var &p)
-{
-  this->ptr_ = ::RTCORBA::RTORB::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTCORBA::RTORB_out &
-RTCORBA::RTORB_out::operator= (RTORB_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTCORBA::RTORB_out::operator ::RTCORBA::RTORB_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTCORBA::RTORB_ptr &
-RTCORBA::RTORB_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTCORBA::RTORB::RTORB (void)
 {}
@@ -6658,7 +4364,7 @@ RTCORBA::RTORB::RTORB (void)
 RTCORBA::RTORB::~RTORB (void)
 {}
 
-void 
+void
 RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
 {
   RTORB *tmp = ACE_static_cast (RTORB *, _tao_void_pointer);
@@ -6674,7 +4380,7 @@ RTCORBA::RTORB::_narrow (
   return RTORB::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTCORBA::RTORB_ptr 
+RTCORBA::RTORB_ptr
 RTCORBA::RTORB::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6684,7 +4390,7 @@ RTCORBA::RTORB::_unchecked_narrow (
     {
       return RTORB::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           RTORB_ptr,
@@ -6704,14 +4410,14 @@ RTCORBA::RTORB::_duplicate (RTORB_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTCORBA::RTORB::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTCORBA, RTORB)::_tao_class_id)
@@ -6730,12 +4436,12 @@ void *RTCORBA::RTORB::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -6744,7 +4450,13 @@ const char* RTCORBA::RTORB::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/RTORB:1.0";
 }
 
-// TAO_IDL - Generated from 
+CORBA::Boolean
+RTCORBA::RTORB::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
@@ -6770,7 +4482,7 @@ RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFo
 RTCORBA::RTORB::MutexNotFound&
 RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
 {
- this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -6846,21 +4558,21 @@ static const CORBA::Long _oc_RTCORBA_RTORB_MutexNotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x422f4d75), 
-  ACE_NTOHL (0x7465784e), 
-  ACE_NTOHL (0x6f74466f), 
-  ACE_NTOHL (0x756e643a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x52544f52),
+  ACE_NTOHL (0x422f4d75),
+  ACE_NTOHL (0x7465784e),
+  ACE_NTOHL (0x6f74466f),
+  ACE_NTOHL (0x756e643a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0
     14,
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x784e6f74), 
-  ACE_NTOHL (0x466f756e), 
+  ACE_NTOHL (0x4d757465),
+  ACE_NTOHL (0x784e6f74),
+  ACE_NTOHL (0x466f756e),
   ACE_NTOHL (0x64000000),  // name = MutexNotFound
   0, // member count
   };
@@ -6876,7 +4588,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound (
 ::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_MutexNotFound =
   &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
@@ -6978,23 +4690,23 @@ static const CORBA::Long _oc_RTCORBA_RTORB_InvalidThreadpool[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x422f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64546872), 
-  ACE_NTOHL (0x65616470), 
-  ACE_NTOHL (0x6f6f6c3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x52544f52),
+  ACE_NTOHL (0x422f496e),
+  ACE_NTOHL (0x76616c69),
+  ACE_NTOHL (0x64546872),
+  ACE_NTOHL (0x65616470),
+  ACE_NTOHL (0x6f6f6c3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0
     18,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696454), 
-  ACE_NTOHL (0x68726561), 
-  ACE_NTOHL (0x64706f6f), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696454),
+  ACE_NTOHL (0x68726561),
+  ACE_NTOHL (0x64706f6f),
   ACE_NTOHL (0x6c000000),  // name = InvalidThreadpool
   0, // member count
   };
@@ -7017,16 +4729,16 @@ static const CORBA::Long _oc_RTCORBA_RTORB[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x423a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x52544f52),
+  ACE_NTOHL (0x423a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/RTORB:1.0
     6,
-  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x52544f52),
   ACE_NTOHL (0x42000000),  // name = RTORB
   };
 
@@ -7047,7 +4759,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7112,7 +4824,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7201,7 +4913,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
         _tao_any,
         RTCORBA::_tc_PriorityModel,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -7209,7 +4921,7 @@ CORBA::Boolean operator>>= (
     defined (ACE_HAS_GNU_REPO)
   template class TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>
+# pragma instantiate TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
@@ -7375,7 +5087,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<RTCORBA::ProtocolProperties>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7440,7 +5152,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::Protocol>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7883,7 +5595,7 @@ operator>>= (
 # pragma instantiate TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -7948,7 +5660,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -8230,7 +5942,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8238,20 +5950,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -8261,7 +5973,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -8271,32 +5983,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8304,20 +6016,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -8327,7 +6039,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -8337,27 +6049,26 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
-
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 9d3e69e550e..3b0cb027373 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -98,7 +98,7 @@ TAO_NAMESPACE  RTCORBA
   // End TAO-specific
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Short NativePriority;
   typedef CORBA::Short_out NativePriority_out;
@@ -109,7 +109,7 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
@@ -122,15 +122,15 @@ TAO_NAMESPACE  RTCORBA
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short minPriority = 0;
+  const RTCORBA::Priority minPriority = 0;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short maxPriority = 32767;
+  const RTCORBA::Priority maxPriority = 32767;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Long NetworkPriority;
   typedef CORBA::Long_out NetworkPriority_out;
@@ -141,7 +141,7 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NetworkPriority;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::ULong ThreadpoolId;
   typedef CORBA::ULong_out ThreadpoolId_out;
@@ -152,9 +152,22 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class ThreadpoolLane_var;
+  struct ThreadpoolLane;
+  
+  typedef
+    TAO_Fixed_Var_T<
+        ThreadpoolLane
+      >
+    ThreadpoolLane_var;
+  
+  typedef
+    ThreadpoolLane &
+    ThreadpoolLane_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_RTCORBA_Export ThreadpoolLane
   {
@@ -167,225 +180,52 @@ TAO_NAMESPACE  RTCORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_RTCORBA_Export ThreadpoolLane_var
-  {
-  public:
-    ThreadpoolLane_var (void);
-    ThreadpoolLane_var (ThreadpoolLane *);
-    ThreadpoolLane_var (const ThreadpoolLane_var &);
-    // Fixed-size types only.
-    ThreadpoolLane_var (const ThreadpoolLane &);
-    ~ThreadpoolLane_var (void);
-    
-    ThreadpoolLane_var &operator= (ThreadpoolLane *);
-    ThreadpoolLane_var &operator= (const ThreadpoolLane_var &);
-    
-    // Fixed-size types only.
-    ThreadpoolLane_var &operator= (const ThreadpoolLane &);
-    
-    ThreadpoolLane *operator-> (void);
-    const ThreadpoolLane *operator-> (void) const;
-    
-    operator const ThreadpoolLane &() const;
-    operator ThreadpoolLane &();
-    operator ThreadpoolLane &() const;
-    
-    // in, inout, out, _retn 
-    const ThreadpoolLane &in (void) const;
-    ThreadpoolLane &inout (void);
-    ThreadpoolLane &out (void);
-    ThreadpoolLane _retn (void);
-    ThreadpoolLane *ptr (void) const;
-  
-  private:
-    ThreadpoolLane *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
-  
-  typedef ThreadpoolLane &ThreadpoolLane_out;
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane;
   
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CH_
-  
-  class TAO_RTCORBA_Export _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void);
-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        ThreadpoolLane *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
-        const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
-      );
-    _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &operator= (
-        const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void);
-    
-    // = Accessors.
-    ThreadpoolLane &operator[] (CORBA::ULong i);
-    const ThreadpoolLane &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static ThreadpoolLane *allocbuf (CORBA::ULong size);
-    static void freebuf (ThreadpoolLane *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    ThreadpoolLane *get_buffer (CORBA::Boolean orphan = 0);
-    const ThreadpoolLane *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ThreadpoolLane *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_RTCORBA_THREADPOOLLANES_CH_)
-#define _RTCORBA_THREADPOOLLANES_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
   
   class ThreadpoolLanes;
-  class ThreadpoolLanes_var;
-  
-  // *************************************************************
-  // RTCORBA::ThreadpoolLanes
-  // *************************************************************
   
-  class TAO_RTCORBA_Export ThreadpoolLanes : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<ThreadpoolLane>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_FixedSeq_Var_T<
+        ThreadpoolLanes,
+        ThreadpoolLane
+      >
+    ThreadpoolLanes_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ThreadpoolLanes,
+        ThreadpoolLanes_var,
+        ThreadpoolLane
+      >
+    ThreadpoolLanes_out;
+  
+  class TAO_RTCORBA_Export ThreadpoolLanes
+    : public
+        TAO_Unbounded_Sequence<
+            ThreadpoolLane
+          >
   {
   public:
     ThreadpoolLanes (void);
     ThreadpoolLanes (CORBA::ULong max);
     ThreadpoolLanes (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ThreadpoolLane *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ThreadpoolLane* buffer, 
         CORBA::Boolean release = 0
       );
     ThreadpoolLanes (const ThreadpoolLanes &);
     ~ThreadpoolLanes (void);
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
     
     typedef ThreadpoolLanes_var _var_type;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_THREADPOOLLANES___VAR_CH_)
-#define _RTCORBA_THREADPOOLLANES___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class RTCORBA::ThreadpoolLanes_var
-  // *************************************************************
-  
-  class TAO_RTCORBA_Export ThreadpoolLanes_var
-  {
-  public:
-    ThreadpoolLanes_var (void);
-    ThreadpoolLanes_var (ThreadpoolLanes *);
-    ThreadpoolLanes_var (const ThreadpoolLanes_var &);
-    
-    // Fixed-size base types only.
-    ThreadpoolLanes_var (const ThreadpoolLanes &);
-    
-    ~ThreadpoolLanes_var (void);
-    
-    ThreadpoolLanes_var &operator= (ThreadpoolLanes *);
-    ThreadpoolLanes_var &operator= (const ThreadpoolLanes_var &);
-    
-    // Fixed-size base types only.
-    ThreadpoolLanes_var &operator= (const ThreadpoolLanes &);
-    
-    ThreadpoolLanes *operator-> (void);
-    const ThreadpoolLanes *operator-> (void) const;
-    
-    operator const ThreadpoolLanes &() const;
-    operator ThreadpoolLanes &();
-    operator ThreadpoolLanes &() const;
-    ThreadpoolLane & operator[] (CORBA::ULong index);
-    const ThreadpoolLane & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ThreadpoolLanes &in (void) const;
-    ThreadpoolLanes &inout (void);
-    ThreadpoolLanes *&out (void);
-    ThreadpoolLanes *_retn (void);
-    ThreadpoolLanes *ptr (void) const;
-  
-  private:
-    ThreadpoolLanes *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_THREADPOOLLANES___OUT_CH_)
-#define _RTCORBA_THREADPOOLLANES___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_RTCORBA_Export ThreadpoolLanes_out
-  {
-  public:
-    ThreadpoolLanes_out (ThreadpoolLanes *&);
-    ThreadpoolLanes_out (ThreadpoolLanes_var &);
-    ThreadpoolLanes_out (const ThreadpoolLanes_out &);
-    ThreadpoolLanes_out &operator= (const ThreadpoolLanes_out &);
-    ThreadpoolLanes_out &operator= (ThreadpoolLanes *);
-    operator ThreadpoolLanes *&();
-    ThreadpoolLanes *&ptr (void);
-    ThreadpoolLanes *operator-> (void);
-    ThreadpoolLane & operator[] (CORBA::ULong index);
-  
-  private:
-    ThreadpoolLanes *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ThreadpoolLanes_var &);
-  };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -395,7 +235,7 @@ TAO_NAMESPACE  RTCORBA
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong PRIORITY_MODEL_POLICY_TYPE = 40U;
+  const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
@@ -414,90 +254,53 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY___PTR_CH_)
-#define _RTCORBA_PRIORITYMODELPOLICY___PTR_CH_
+#if !defined (_RTCORBA_PRIORITYMODELPOLICY__ODDS_N_ENDS_CH_)
+#define _RTCORBA_PRIORITYMODELPOLICY__ODDS_N_ENDS_CH_
   
   class PriorityModelPolicy;
   typedef PriorityModelPolicy *PriorityModelPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY___VAR_CH_)
-#define _RTCORBA_PRIORITYMODELPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export PriorityModelPolicy_var : public TAO_Base_var
+  struct tao_PriorityModelPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        PriorityModelPolicy,
+        tao_PriorityModelPolicy_life
+      >
+    PriorityModelPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        PriorityModelPolicy,
+        tao_PriorityModelPolicy_life
+      >
+    PriorityModelPolicy_out;
+  
+  struct TAO_RTCORBA_Export tao_PriorityModelPolicy_life
   {
-  public:
-    PriorityModelPolicy_var (void); // default constructor
-    PriorityModelPolicy_var (PriorityModelPolicy_ptr p) : ptr_ (p) {} 
-    PriorityModelPolicy_var (const PriorityModelPolicy_var &); // copy constructor
-    ~PriorityModelPolicy_var (void); // destructor
-    
-    PriorityModelPolicy_var &operator= (PriorityModelPolicy_ptr);
-    PriorityModelPolicy_var &operator= (const PriorityModelPolicy_var &);
-    PriorityModelPolicy_ptr operator-> (void) const;
-    
-    operator const PriorityModelPolicy_ptr &() const;
-    operator PriorityModelPolicy_ptr &();
-    // in, inout, out, _retn 
-    PriorityModelPolicy_ptr in (void) const;
-    PriorityModelPolicy_ptr &inout (void);
-    PriorityModelPolicy_ptr &out (void);
-    PriorityModelPolicy_ptr _retn (void);
-    PriorityModelPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static PriorityModelPolicy_ptr tao_duplicate (PriorityModelPolicy_ptr);
     static void tao_release (PriorityModelPolicy_ptr);
     static PriorityModelPolicy_ptr tao_nil (void);
-    static PriorityModelPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        PriorityModelPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PriorityModelPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PriorityModelPolicy_var (const TAO_Base_var &rhs);
-    PriorityModelPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY___OUT_CH_)
-#define _RTCORBA_PRIORITYMODELPOLICY___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_RTCORBA_Export PriorityModelPolicy_out
+  struct TAO_RTCORBA_Export tao_PriorityModelPolicy_cast
   {
-  public:
-    PriorityModelPolicy_out (PriorityModelPolicy_ptr &);
-    PriorityModelPolicy_out (PriorityModelPolicy_var &);
-    PriorityModelPolicy_out (const PriorityModelPolicy_out &);
-    PriorityModelPolicy_out &operator= (const PriorityModelPolicy_out &);
-    PriorityModelPolicy_out &operator= (const PriorityModelPolicy_var &);
-    PriorityModelPolicy_out &operator= (PriorityModelPolicy_ptr);
-    operator PriorityModelPolicy_ptr &();
-    PriorityModelPolicy_ptr &ptr (void);
-    PriorityModelPolicy_ptr operator-> (void);
-  
-  private:
-    PriorityModelPolicy_ptr &ptr_;
+    static PriorityModelPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY_CH_
@@ -551,7 +354,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -561,10 +364,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     PriorityModelPolicy (void);
     virtual ~PriorityModelPolicy (void);
-    
-    friend class _TAO_PriorityModelPolicy_Remote_Proxy_Impl;
-    friend class _TAO_PriorityModelPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_PriorityModelPolicy_Direct_Proxy_Impl;
   
   private:
     PriorityModelPolicy (const PriorityModelPolicy &);
@@ -581,93 +380,56 @@ TAO_NAMESPACE  RTCORBA
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong THREADPOOL_POLICY_TYPE = 41U;
+  const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_THREADPOOLPOLICY___PTR_CH_)
-#define _RTCORBA_THREADPOOLPOLICY___PTR_CH_
+#if !defined (_RTCORBA_THREADPOOLPOLICY__ODDS_N_ENDS_CH_)
+#define _RTCORBA_THREADPOOLPOLICY__ODDS_N_ENDS_CH_
   
   class ThreadpoolPolicy;
   typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_THREADPOOLPOLICY___VAR_CH_)
-#define _RTCORBA_THREADPOOLPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export ThreadpoolPolicy_var : public TAO_Base_var
+  struct tao_ThreadpoolPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ThreadpoolPolicy,
+        tao_ThreadpoolPolicy_life
+      >
+    ThreadpoolPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ThreadpoolPolicy,
+        tao_ThreadpoolPolicy_life
+      >
+    ThreadpoolPolicy_out;
+  
+  struct TAO_RTCORBA_Export tao_ThreadpoolPolicy_life
   {
-  public:
-    ThreadpoolPolicy_var (void); // default constructor
-    ThreadpoolPolicy_var (ThreadpoolPolicy_ptr p) : ptr_ (p) {} 
-    ThreadpoolPolicy_var (const ThreadpoolPolicy_var &); // copy constructor
-    ~ThreadpoolPolicy_var (void); // destructor
-    
-    ThreadpoolPolicy_var &operator= (ThreadpoolPolicy_ptr);
-    ThreadpoolPolicy_var &operator= (const ThreadpoolPolicy_var &);
-    ThreadpoolPolicy_ptr operator-> (void) const;
-    
-    operator const ThreadpoolPolicy_ptr &() const;
-    operator ThreadpoolPolicy_ptr &();
-    // in, inout, out, _retn 
-    ThreadpoolPolicy_ptr in (void) const;
-    ThreadpoolPolicy_ptr &inout (void);
-    ThreadpoolPolicy_ptr &out (void);
-    ThreadpoolPolicy_ptr _retn (void);
-    ThreadpoolPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ThreadpoolPolicy_ptr tao_duplicate (ThreadpoolPolicy_ptr);
     static void tao_release (ThreadpoolPolicy_ptr);
     static ThreadpoolPolicy_ptr tao_nil (void);
-    static ThreadpoolPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ThreadpoolPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ThreadpoolPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ThreadpoolPolicy_var (const TAO_Base_var &rhs);
-    ThreadpoolPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_THREADPOOLPOLICY___OUT_CH_)
-#define _RTCORBA_THREADPOOLPOLICY___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_RTCORBA_Export ThreadpoolPolicy_out
+  struct TAO_RTCORBA_Export tao_ThreadpoolPolicy_cast
   {
-  public:
-    ThreadpoolPolicy_out (ThreadpoolPolicy_ptr &);
-    ThreadpoolPolicy_out (ThreadpoolPolicy_var &);
-    ThreadpoolPolicy_out (const ThreadpoolPolicy_out &);
-    ThreadpoolPolicy_out &operator= (const ThreadpoolPolicy_out &);
-    ThreadpoolPolicy_out &operator= (const ThreadpoolPolicy_var &);
-    ThreadpoolPolicy_out &operator= (ThreadpoolPolicy_ptr);
-    operator ThreadpoolPolicy_ptr &();
-    ThreadpoolPolicy_ptr &ptr (void);
-    ThreadpoolPolicy_ptr operator-> (void);
-  
-  private:
-    ThreadpoolPolicy_ptr &ptr_;
+    static ThreadpoolPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
 #define _RTCORBA_THREADPOOLPOLICY_CH_
@@ -711,7 +473,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -721,10 +483,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     ThreadpoolPolicy (void);
     virtual ~ThreadpoolPolicy (void);
-    
-    friend class _TAO_ThreadpoolPolicy_Remote_Proxy_Impl;
-    friend class _TAO_ThreadpoolPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_ThreadpoolPolicy_Direct_Proxy_Impl;
   
   private:
     ThreadpoolPolicy (const ThreadpoolPolicy &);
@@ -739,97 +497,59 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___PTR_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES___PTR_CH_
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
+#define _RTCORBA_PROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
   
   class ProtocolProperties;
   typedef ProtocolProperties *ProtocolProperties_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___VAR_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export ProtocolProperties_var : public TAO_Base_var
+  struct tao_ProtocolProperties_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ProtocolProperties,
+        tao_ProtocolProperties_life
+      >
+    ProtocolProperties_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ProtocolProperties,
+        tao_ProtocolProperties_life
+      >
+    ProtocolProperties_out;
+  
+  struct TAO_RTCORBA_Export tao_ProtocolProperties_life
   {
-  public:
-    ProtocolProperties_var (void); // default constructor
-    ProtocolProperties_var (ProtocolProperties_ptr p) : ptr_ (p) {} 
-    ProtocolProperties_var (const ProtocolProperties_var &); // copy constructor
-    ~ProtocolProperties_var (void); // destructor
-    
-    ProtocolProperties_var &operator= (ProtocolProperties_ptr);
-    ProtocolProperties_var &operator= (const ProtocolProperties_var &);
-    ProtocolProperties_ptr operator-> (void) const;
-    
-    operator const ProtocolProperties_ptr &() const;
-    operator ProtocolProperties_ptr &();
-    // in, inout, out, _retn 
-    ProtocolProperties_ptr in (void) const;
-    ProtocolProperties_ptr &inout (void);
-    ProtocolProperties_ptr &out (void);
-    ProtocolProperties_ptr _retn (void);
-    ProtocolProperties_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ProtocolProperties_ptr tao_duplicate (ProtocolProperties_ptr);
     static void tao_release (ProtocolProperties_ptr);
     static ProtocolProperties_ptr tao_nil (void);
-    static ProtocolProperties_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ProtocolProperties_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ProtocolProperties_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ProtocolProperties_var (const TAO_Base_var &rhs);
-    ProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___OUT_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_RTCORBA_Export ProtocolProperties_out
+  struct TAO_RTCORBA_Export tao_ProtocolProperties_cast
   {
-  public:
-    ProtocolProperties_out (ProtocolProperties_ptr &);
-    ProtocolProperties_out (ProtocolProperties_var &);
-    ProtocolProperties_out (const ProtocolProperties_out &);
-    ProtocolProperties_out &operator= (const ProtocolProperties_out &);
-    ProtocolProperties_out &operator= (const ProtocolProperties_var &);
-    ProtocolProperties_out &operator= (ProtocolProperties_ptr);
-    operator ProtocolProperties_ptr &();
-    ProtocolProperties_ptr &ptr (void);
-    ProtocolProperties_ptr operator-> (void);
-  
-  private:
-    ProtocolProperties_ptr &ptr_;
+    static ProtocolProperties_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
   
   class TAO_RTCORBA_Export ProtocolProperties
     : public virtual CORBA::Object
-    , public TAO_Encodable
   {
   public:
     typedef ProtocolProperties_ptr _ptr_type;
@@ -857,7 +577,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -872,10 +592,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     ProtocolProperties (void);
     virtual ~ProtocolProperties (void);
-    
-    friend class _TAO_ProtocolProperties_Remote_Proxy_Impl;
-    friend class _TAO_ProtocolProperties_ThruPOA_Proxy_Impl;
-    friend class _TAO_ProtocolProperties_Direct_Proxy_Impl;
   
   private:
     ProtocolProperties (const ProtocolProperties &);
@@ -890,9 +606,25 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolProperties;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class Protocol_var;
+  struct Protocol;
+  
+  typedef
+    TAO_Var_Var_T<
+        Protocol
+      >
+    Protocol_var;
+  
+  typedef
+    TAO_Out_T<
+        Protocol,
+        Protocol_var
+      >
+    Protocol_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_RTCORBA_Export Protocol
   {
@@ -905,234 +637,52 @@ TAO_NAMESPACE  RTCORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_RTCORBA_Export Protocol_var
-  {
-  public:
-    Protocol_var (void);
-    Protocol_var (Protocol *);
-    Protocol_var (const Protocol_var &);
-    ~Protocol_var (void);
-    
-    Protocol_var &operator= (Protocol *);
-    Protocol_var &operator= (const Protocol_var &);
-    Protocol *operator-> (void);
-    const Protocol *operator-> (void) const;
-    
-    operator const Protocol &() const;
-    operator Protocol &();
-    operator Protocol &() const;
-    
-    // Variable-size types only.
-    operator Protocol *&();
-    
-    // in, inout, out, _retn 
-    const Protocol &in (void) const;
-    Protocol &inout (void);
-    Protocol *&out (void);
-    Protocol *_retn (void);
-    Protocol *ptr (void) const;
-  
-  private:
-    Protocol *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_RTCORBA_Export Protocol_out
-  {
-  public:
-    Protocol_out (Protocol *&);
-    Protocol_out (Protocol_var &);
-    Protocol_out (const Protocol_out &);
-    Protocol_out &operator= (const Protocol_out &);
-    Protocol_out &operator= (Protocol *);
-    operator Protocol *&();
-    Protocol *&ptr (void);
-    Protocol *operator-> (void);
-    
-  private:
-    Protocol *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const Protocol_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Protocol;
   
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_
-  
-  class TAO_RTCORBA_Export _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void);
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        Protocol *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
-        const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
-      );
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &operator= (
-        const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void);
-    
-    // = Accessors.
-    Protocol &operator[] (CORBA::ULong i);
-    const Protocol &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static Protocol *allocbuf (CORBA::ULong size);
-    static void freebuf (Protocol *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    Protocol *get_buffer (CORBA::Boolean orphan = 0);
-    const Protocol *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Protocol *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_RTCORBA_PROTOCOLLIST_CH_)
-#define _RTCORBA_PROTOCOLLIST_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
   
   class ProtocolList;
-  class ProtocolList_var;
-  
-  // *************************************************************
-  // RTCORBA::ProtocolList
-  // *************************************************************
-  
-  class TAO_RTCORBA_Export ProtocolList : public 
   
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<Protocol>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_VarSeq_Var_T<
+        ProtocolList,
+        Protocol
+      >
+    ProtocolList_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ProtocolList,
+        ProtocolList_var,
+        Protocol
+      >
+    ProtocolList_out;
+  
+  class TAO_RTCORBA_Export ProtocolList
+    : public
+        TAO_Unbounded_Sequence<
+            Protocol
+          >
   {
   public:
     ProtocolList (void);
     ProtocolList (CORBA::ULong max);
     ProtocolList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        Protocol *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        Protocol* buffer, 
         CORBA::Boolean release = 0
       );
     ProtocolList (const ProtocolList &);
     ~ProtocolList (void);
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
     
     typedef ProtocolList_var _var_type;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PROTOCOLLIST___VAR_CH_)
-#define _RTCORBA_PROTOCOLLIST___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class RTCORBA::ProtocolList_var
-  // *************************************************************
-  
-  class TAO_RTCORBA_Export ProtocolList_var
-  {
-  public:
-    ProtocolList_var (void);
-    ProtocolList_var (ProtocolList *);
-    ProtocolList_var (const ProtocolList_var &);
-    ~ProtocolList_var (void);
-    
-    ProtocolList_var &operator= (ProtocolList *);
-    ProtocolList_var &operator= (const ProtocolList_var &);
-    ProtocolList *operator-> (void);
-    const ProtocolList *operator-> (void) const;
-    
-    operator const ProtocolList &() const;
-    operator ProtocolList &();
-    operator ProtocolList &() const;
-    
-    // Variable-size base types only.
-    operator ProtocolList *&();
-    
-    Protocol & operator[] (CORBA::ULong index);
-    const Protocol & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const ProtocolList &in (void) const;
-    ProtocolList &inout (void);
-    ProtocolList *&out (void);
-    ProtocolList *_retn (void);
-    ProtocolList *ptr (void) const;
-  
-  private:
-    ProtocolList *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PROTOCOLLIST___OUT_CH_)
-#define _RTCORBA_PROTOCOLLIST___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_RTCORBA_Export ProtocolList_out
-  {
-  public:
-    ProtocolList_out (ProtocolList *&);
-    ProtocolList_out (ProtocolList_var &);
-    ProtocolList_out (const ProtocolList_out &);
-    ProtocolList_out &operator= (const ProtocolList_out &);
-    ProtocolList_out &operator= (ProtocolList *);
-    operator ProtocolList *&();
-    ProtocolList *&ptr (void);
-    ProtocolList *operator-> (void);
-    Protocol & operator[] (CORBA::ULong index);
-  
-  private:
-    ProtocolList *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ProtocolList_var &);
-  };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -1142,93 +692,56 @@ TAO_NAMESPACE  RTCORBA
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong SERVER_PROTOCOL_POLICY_TYPE = 42U;
+  const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___PTR_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___PTR_CH_
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__ODDS_N_ENDS_CH_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY__ODDS_N_ENDS_CH_
   
   class ServerProtocolPolicy;
   typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___VAR_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export ServerProtocolPolicy_var : public TAO_Base_var
+  struct tao_ServerProtocolPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServerProtocolPolicy,
+        tao_ServerProtocolPolicy_life
+      >
+    ServerProtocolPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServerProtocolPolicy,
+        tao_ServerProtocolPolicy_life
+      >
+    ServerProtocolPolicy_out;
+  
+  struct TAO_RTCORBA_Export tao_ServerProtocolPolicy_life
   {
-  public:
-    ServerProtocolPolicy_var (void); // default constructor
-    ServerProtocolPolicy_var (ServerProtocolPolicy_ptr p) : ptr_ (p) {} 
-    ServerProtocolPolicy_var (const ServerProtocolPolicy_var &); // copy constructor
-    ~ServerProtocolPolicy_var (void); // destructor
-    
-    ServerProtocolPolicy_var &operator= (ServerProtocolPolicy_ptr);
-    ServerProtocolPolicy_var &operator= (const ServerProtocolPolicy_var &);
-    ServerProtocolPolicy_ptr operator-> (void) const;
-    
-    operator const ServerProtocolPolicy_ptr &() const;
-    operator ServerProtocolPolicy_ptr &();
-    // in, inout, out, _retn 
-    ServerProtocolPolicy_ptr in (void) const;
-    ServerProtocolPolicy_ptr &inout (void);
-    ServerProtocolPolicy_ptr &out (void);
-    ServerProtocolPolicy_ptr _retn (void);
-    ServerProtocolPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ServerProtocolPolicy_ptr tao_duplicate (ServerProtocolPolicy_ptr);
     static void tao_release (ServerProtocolPolicy_ptr);
     static ServerProtocolPolicy_ptr tao_nil (void);
-    static ServerProtocolPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ServerProtocolPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ServerProtocolPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ServerProtocolPolicy_var (const TAO_Base_var &rhs);
-    ServerProtocolPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___OUT_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_RTCORBA_Export ServerProtocolPolicy_out
+  struct TAO_RTCORBA_Export tao_ServerProtocolPolicy_cast
   {
-  public:
-    ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &);
-    ServerProtocolPolicy_out (ServerProtocolPolicy_var &);
-    ServerProtocolPolicy_out (const ServerProtocolPolicy_out &);
-    ServerProtocolPolicy_out &operator= (const ServerProtocolPolicy_out &);
-    ServerProtocolPolicy_out &operator= (const ServerProtocolPolicy_var &);
-    ServerProtocolPolicy_out &operator= (ServerProtocolPolicy_ptr);
-    operator ServerProtocolPolicy_ptr &();
-    ServerProtocolPolicy_ptr &ptr (void);
-    ServerProtocolPolicy_ptr operator-> (void);
-  
-  private:
-    ServerProtocolPolicy_ptr &ptr_;
+    static ServerProtocolPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
@@ -1272,7 +785,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1282,10 +795,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     ServerProtocolPolicy (void);
     virtual ~ServerProtocolPolicy (void);
-    
-    friend class _TAO_ServerProtocolPolicy_Remote_Proxy_Impl;
-    friend class _TAO_ServerProtocolPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_ServerProtocolPolicy_Direct_Proxy_Impl;
   
   private:
     ServerProtocolPolicy (const ServerProtocolPolicy &);
@@ -1302,93 +811,56 @@ TAO_NAMESPACE  RTCORBA
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong CLIENT_PROTOCOL_POLICY_TYPE = 43U;
+  const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___PTR_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___PTR_CH_
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__ODDS_N_ENDS_CH_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY__ODDS_N_ENDS_CH_
   
   class ClientProtocolPolicy;
   typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export ClientProtocolPolicy_var : public TAO_Base_var
+  struct tao_ClientProtocolPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ClientProtocolPolicy,
+        tao_ClientProtocolPolicy_life
+      >
+    ClientProtocolPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ClientProtocolPolicy,
+        tao_ClientProtocolPolicy_life
+      >
+    ClientProtocolPolicy_out;
+  
+  struct TAO_RTCORBA_Export tao_ClientProtocolPolicy_life
   {
-  public:
-    ClientProtocolPolicy_var (void); // default constructor
-    ClientProtocolPolicy_var (ClientProtocolPolicy_ptr p) : ptr_ (p) {} 
-    ClientProtocolPolicy_var (const ClientProtocolPolicy_var &); // copy constructor
-    ~ClientProtocolPolicy_var (void); // destructor
-    
-    ClientProtocolPolicy_var &operator= (ClientProtocolPolicy_ptr);
-    ClientProtocolPolicy_var &operator= (const ClientProtocolPolicy_var &);
-    ClientProtocolPolicy_ptr operator-> (void) const;
-    
-    operator const ClientProtocolPolicy_ptr &() const;
-    operator ClientProtocolPolicy_ptr &();
-    // in, inout, out, _retn 
-    ClientProtocolPolicy_ptr in (void) const;
-    ClientProtocolPolicy_ptr &inout (void);
-    ClientProtocolPolicy_ptr &out (void);
-    ClientProtocolPolicy_ptr _retn (void);
-    ClientProtocolPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static ClientProtocolPolicy_ptr tao_duplicate (ClientProtocolPolicy_ptr);
     static void tao_release (ClientProtocolPolicy_ptr);
     static ClientProtocolPolicy_ptr tao_nil (void);
-    static ClientProtocolPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        ClientProtocolPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    ClientProtocolPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    ClientProtocolPolicy_var (const TAO_Base_var &rhs);
-    ClientProtocolPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_RTCORBA_Export ClientProtocolPolicy_out
+  struct TAO_RTCORBA_Export tao_ClientProtocolPolicy_cast
   {
-  public:
-    ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &);
-    ClientProtocolPolicy_out (ClientProtocolPolicy_var &);
-    ClientProtocolPolicy_out (const ClientProtocolPolicy_out &);
-    ClientProtocolPolicy_out &operator= (const ClientProtocolPolicy_out &);
-    ClientProtocolPolicy_out &operator= (const ClientProtocolPolicy_var &);
-    ClientProtocolPolicy_out &operator= (ClientProtocolPolicy_ptr);
-    operator ClientProtocolPolicy_ptr &();
-    ClientProtocolPolicy_ptr &ptr (void);
-    ClientProtocolPolicy_ptr operator-> (void);
-  
-  private:
-    ClientProtocolPolicy_ptr &ptr_;
+    static ClientProtocolPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
@@ -1432,7 +904,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1442,10 +914,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     ClientProtocolPolicy (void);
     virtual ~ClientProtocolPolicy (void);
-    
-    friend class _TAO_ClientProtocolPolicy_Remote_Proxy_Impl;
-    friend class _TAO_ClientProtocolPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_ClientProtocolPolicy_Direct_Proxy_Impl;
   
   private:
     ClientProtocolPolicy (const ClientProtocolPolicy &);
@@ -1462,93 +930,56 @@ TAO_NAMESPACE  RTCORBA
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong PRIVATE_CONNECTION_POLICY_TYPE = 44U;
+  const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___PTR_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___PTR_CH_
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__ODDS_N_ENDS_CH_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY__ODDS_N_ENDS_CH_
   
   class PrivateConnectionPolicy;
   typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export PrivateConnectionPolicy_var : public TAO_Base_var
+  struct tao_PrivateConnectionPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        PrivateConnectionPolicy,
+        tao_PrivateConnectionPolicy_life
+      >
+    PrivateConnectionPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        PrivateConnectionPolicy,
+        tao_PrivateConnectionPolicy_life
+      >
+    PrivateConnectionPolicy_out;
+  
+  struct TAO_RTCORBA_Export tao_PrivateConnectionPolicy_life
   {
-  public:
-    PrivateConnectionPolicy_var (void); // default constructor
-    PrivateConnectionPolicy_var (PrivateConnectionPolicy_ptr p) : ptr_ (p) {} 
-    PrivateConnectionPolicy_var (const PrivateConnectionPolicy_var &); // copy constructor
-    ~PrivateConnectionPolicy_var (void); // destructor
-    
-    PrivateConnectionPolicy_var &operator= (PrivateConnectionPolicy_ptr);
-    PrivateConnectionPolicy_var &operator= (const PrivateConnectionPolicy_var &);
-    PrivateConnectionPolicy_ptr operator-> (void) const;
-    
-    operator const PrivateConnectionPolicy_ptr &() const;
-    operator PrivateConnectionPolicy_ptr &();
-    // in, inout, out, _retn 
-    PrivateConnectionPolicy_ptr in (void) const;
-    PrivateConnectionPolicy_ptr &inout (void);
-    PrivateConnectionPolicy_ptr &out (void);
-    PrivateConnectionPolicy_ptr _retn (void);
-    PrivateConnectionPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static PrivateConnectionPolicy_ptr tao_duplicate (PrivateConnectionPolicy_ptr);
     static void tao_release (PrivateConnectionPolicy_ptr);
     static PrivateConnectionPolicy_ptr tao_nil (void);
-    static PrivateConnectionPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        PrivateConnectionPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PrivateConnectionPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PrivateConnectionPolicy_var (const TAO_Base_var &rhs);
-    PrivateConnectionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_RTCORBA_Export PrivateConnectionPolicy_out
+  struct TAO_RTCORBA_Export tao_PrivateConnectionPolicy_cast
   {
-  public:
-    PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &);
-    PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &);
-    PrivateConnectionPolicy_out (const PrivateConnectionPolicy_out &);
-    PrivateConnectionPolicy_out &operator= (const PrivateConnectionPolicy_out &);
-    PrivateConnectionPolicy_out &operator= (const PrivateConnectionPolicy_var &);
-    PrivateConnectionPolicy_out &operator= (PrivateConnectionPolicy_ptr);
-    operator PrivateConnectionPolicy_ptr &();
-    PrivateConnectionPolicy_ptr &ptr (void);
-    PrivateConnectionPolicy_ptr operator-> (void);
-  
-  private:
-    PrivateConnectionPolicy_ptr &ptr_;
+    static PrivateConnectionPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
@@ -1582,7 +1013,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1592,10 +1023,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     PrivateConnectionPolicy (void);
     virtual ~PrivateConnectionPolicy (void);
-    
-    friend class _TAO_PrivateConnectionPolicy_Remote_Proxy_Impl;
-    friend class _TAO_PrivateConnectionPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_PrivateConnectionPolicy_Direct_Proxy_Impl;
   
   private:
     PrivateConnectionPolicy (const PrivateConnectionPolicy &);
@@ -1610,90 +1037,53 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___PTR_CH_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES___PTR_CH_
+#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
+#define _RTCORBA_TCPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
   
   class TCPProtocolProperties;
   typedef TCPProtocolProperties *TCPProtocolProperties_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___VAR_CH_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export TCPProtocolProperties_var : public TAO_Base_var
+  struct tao_TCPProtocolProperties_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        TCPProtocolProperties,
+        tao_TCPProtocolProperties_life
+      >
+    TCPProtocolProperties_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        TCPProtocolProperties,
+        tao_TCPProtocolProperties_life
+      >
+    TCPProtocolProperties_out;
+  
+  struct TAO_RTCORBA_Export tao_TCPProtocolProperties_life
   {
-  public:
-    TCPProtocolProperties_var (void); // default constructor
-    TCPProtocolProperties_var (TCPProtocolProperties_ptr p) : ptr_ (p) {} 
-    TCPProtocolProperties_var (const TCPProtocolProperties_var &); // copy constructor
-    ~TCPProtocolProperties_var (void); // destructor
-    
-    TCPProtocolProperties_var &operator= (TCPProtocolProperties_ptr);
-    TCPProtocolProperties_var &operator= (const TCPProtocolProperties_var &);
-    TCPProtocolProperties_ptr operator-> (void) const;
-    
-    operator const TCPProtocolProperties_ptr &() const;
-    operator TCPProtocolProperties_ptr &();
-    // in, inout, out, _retn 
-    TCPProtocolProperties_ptr in (void) const;
-    TCPProtocolProperties_ptr &inout (void);
-    TCPProtocolProperties_ptr &out (void);
-    TCPProtocolProperties_ptr _retn (void);
-    TCPProtocolProperties_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static TCPProtocolProperties_ptr tao_duplicate (TCPProtocolProperties_ptr);
     static void tao_release (TCPProtocolProperties_ptr);
     static TCPProtocolProperties_ptr tao_nil (void);
-    static TCPProtocolProperties_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        TCPProtocolProperties_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    TCPProtocolProperties_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    TCPProtocolProperties_var (const TAO_Base_var &rhs);
-    TCPProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___OUT_CH_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_RTCORBA_Export TCPProtocolProperties_out
+  struct TAO_RTCORBA_Export tao_TCPProtocolProperties_cast
   {
-  public:
-    TCPProtocolProperties_out (TCPProtocolProperties_ptr &);
-    TCPProtocolProperties_out (TCPProtocolProperties_var &);
-    TCPProtocolProperties_out (const TCPProtocolProperties_out &);
-    TCPProtocolProperties_out &operator= (const TCPProtocolProperties_out &);
-    TCPProtocolProperties_out &operator= (const TCPProtocolProperties_var &);
-    TCPProtocolProperties_out &operator= (TCPProtocolProperties_ptr);
-    operator TCPProtocolProperties_ptr &();
-    TCPProtocolProperties_ptr &ptr (void);
-    TCPProtocolProperties_ptr operator-> (void);
-  
-  private:
-    TCPProtocolProperties_ptr &ptr_;
+    static TCPProtocolProperties_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
@@ -1853,7 +1243,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -1863,10 +1253,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     TCPProtocolProperties (void);
     virtual ~TCPProtocolProperties (void);
-    
-    friend class _TAO_TCPProtocolProperties_Remote_Proxy_Impl;
-    friend class _TAO_TCPProtocolProperties_ThruPOA_Proxy_Impl;
-    friend class _TAO_TCPProtocolProperties_Direct_Proxy_Impl;
   
   private:
     TCPProtocolProperties (const TCPProtocolProperties &);
@@ -1881,90 +1267,53 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___PTR_CH_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES___PTR_CH_
+#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
+#define _RTCORBA_GIOPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
   
   class GIOPProtocolProperties;
   typedef GIOPProtocolProperties *GIOPProtocolProperties_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___VAR_CH_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export GIOPProtocolProperties_var : public TAO_Base_var
+  struct tao_GIOPProtocolProperties_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        GIOPProtocolProperties,
+        tao_GIOPProtocolProperties_life
+      >
+    GIOPProtocolProperties_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        GIOPProtocolProperties,
+        tao_GIOPProtocolProperties_life
+      >
+    GIOPProtocolProperties_out;
+  
+  struct TAO_RTCORBA_Export tao_GIOPProtocolProperties_life
   {
-  public:
-    GIOPProtocolProperties_var (void); // default constructor
-    GIOPProtocolProperties_var (GIOPProtocolProperties_ptr p) : ptr_ (p) {} 
-    GIOPProtocolProperties_var (const GIOPProtocolProperties_var &); // copy constructor
-    ~GIOPProtocolProperties_var (void); // destructor
-    
-    GIOPProtocolProperties_var &operator= (GIOPProtocolProperties_ptr);
-    GIOPProtocolProperties_var &operator= (const GIOPProtocolProperties_var &);
-    GIOPProtocolProperties_ptr operator-> (void) const;
-    
-    operator const GIOPProtocolProperties_ptr &() const;
-    operator GIOPProtocolProperties_ptr &();
-    // in, inout, out, _retn 
-    GIOPProtocolProperties_ptr in (void) const;
-    GIOPProtocolProperties_ptr &inout (void);
-    GIOPProtocolProperties_ptr &out (void);
-    GIOPProtocolProperties_ptr _retn (void);
-    GIOPProtocolProperties_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static GIOPProtocolProperties_ptr tao_duplicate (GIOPProtocolProperties_ptr);
     static void tao_release (GIOPProtocolProperties_ptr);
     static GIOPProtocolProperties_ptr tao_nil (void);
-    static GIOPProtocolProperties_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        GIOPProtocolProperties_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    GIOPProtocolProperties_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    GIOPProtocolProperties_var (const TAO_Base_var &rhs);
-    GIOPProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___OUT_CH_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_RTCORBA_Export GIOPProtocolProperties_out
+  struct TAO_RTCORBA_Export tao_GIOPProtocolProperties_cast
   {
-  public:
-    GIOPProtocolProperties_out (GIOPProtocolProperties_ptr &);
-    GIOPProtocolProperties_out (GIOPProtocolProperties_var &);
-    GIOPProtocolProperties_out (const GIOPProtocolProperties_out &);
-    GIOPProtocolProperties_out &operator= (const GIOPProtocolProperties_out &);
-    GIOPProtocolProperties_out &operator= (const GIOPProtocolProperties_var &);
-    GIOPProtocolProperties_out &operator= (GIOPProtocolProperties_ptr);
-    operator GIOPProtocolProperties_ptr &();
-    GIOPProtocolProperties_ptr &ptr (void);
-    GIOPProtocolProperties_ptr operator-> (void);
-  
-  private:
-    GIOPProtocolProperties_ptr &ptr_;
+    static GIOPProtocolProperties_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
@@ -1998,7 +1347,7 @@ TAO_NAMESPACE  RTCORBA
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2008,10 +1357,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     GIOPProtocolProperties (void);
     virtual ~GIOPProtocolProperties (void);
-    
-    friend class _TAO_GIOPProtocolProperties_Remote_Proxy_Impl;
-    friend class _TAO_GIOPProtocolProperties_ThruPOA_Proxy_Impl;
-    friend class _TAO_GIOPProtocolProperties_Direct_Proxy_Impl;
   
   private:
     GIOPProtocolProperties (const GIOPProtocolProperties &);
@@ -2026,90 +1371,53 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___PTR_CH_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___PTR_CH_
+#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
+#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
   
   class UnixDomainProtocolProperties;
   typedef UnixDomainProtocolProperties *UnixDomainProtocolProperties_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CH_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export UnixDomainProtocolProperties_var : public TAO_Base_var
+  struct tao_UnixDomainProtocolProperties_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        UnixDomainProtocolProperties,
+        tao_UnixDomainProtocolProperties_life
+      >
+    UnixDomainProtocolProperties_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        UnixDomainProtocolProperties,
+        tao_UnixDomainProtocolProperties_life
+      >
+    UnixDomainProtocolProperties_out;
+  
+  struct TAO_RTCORBA_Export tao_UnixDomainProtocolProperties_life
   {
-  public:
-    UnixDomainProtocolProperties_var (void); // default constructor
-    UnixDomainProtocolProperties_var (UnixDomainProtocolProperties_ptr p) : ptr_ (p) {} 
-    UnixDomainProtocolProperties_var (const UnixDomainProtocolProperties_var &); // copy constructor
-    ~UnixDomainProtocolProperties_var (void); // destructor
-    
-    UnixDomainProtocolProperties_var &operator= (UnixDomainProtocolProperties_ptr);
-    UnixDomainProtocolProperties_var &operator= (const UnixDomainProtocolProperties_var &);
-    UnixDomainProtocolProperties_ptr operator-> (void) const;
-    
-    operator const UnixDomainProtocolProperties_ptr &() const;
-    operator UnixDomainProtocolProperties_ptr &();
-    // in, inout, out, _retn 
-    UnixDomainProtocolProperties_ptr in (void) const;
-    UnixDomainProtocolProperties_ptr &inout (void);
-    UnixDomainProtocolProperties_ptr &out (void);
-    UnixDomainProtocolProperties_ptr _retn (void);
-    UnixDomainProtocolProperties_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static UnixDomainProtocolProperties_ptr tao_duplicate (UnixDomainProtocolProperties_ptr);
     static void tao_release (UnixDomainProtocolProperties_ptr);
     static UnixDomainProtocolProperties_ptr tao_nil (void);
-    static UnixDomainProtocolProperties_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        UnixDomainProtocolProperties_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    UnixDomainProtocolProperties_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    UnixDomainProtocolProperties_var (const TAO_Base_var &rhs);
-    UnixDomainProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CH_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_RTCORBA_Export UnixDomainProtocolProperties_out
+  struct TAO_RTCORBA_Export tao_UnixDomainProtocolProperties_cast
   {
-  public:
-    UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &);
-    UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_var &);
-    UnixDomainProtocolProperties_out (const UnixDomainProtocolProperties_out &);
-    UnixDomainProtocolProperties_out &operator= (const UnixDomainProtocolProperties_out &);
-    UnixDomainProtocolProperties_out &operator= (const UnixDomainProtocolProperties_var &);
-    UnixDomainProtocolProperties_out &operator= (UnixDomainProtocolProperties_ptr);
-    operator UnixDomainProtocolProperties_ptr &();
-    UnixDomainProtocolProperties_ptr &ptr (void);
-    UnixDomainProtocolProperties_ptr operator-> (void);
-  
-  private:
-    UnixDomainProtocolProperties_ptr &ptr_;
+    static UnixDomainProtocolProperties_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
@@ -2185,7 +1493,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2195,10 +1503,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     UnixDomainProtocolProperties (void);
     virtual ~UnixDomainProtocolProperties (void);
-    
-    friend class _TAO_UnixDomainProtocolProperties_Remote_Proxy_Impl;
-    friend class _TAO_UnixDomainProtocolProperties_ThruPOA_Proxy_Impl;
-    friend class _TAO_UnixDomainProtocolProperties_Direct_Proxy_Impl;
   
   private:
     UnixDomainProtocolProperties (const UnixDomainProtocolProperties &);
@@ -2213,90 +1517,53 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___PTR_CH_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___PTR_CH_
+#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_)
+#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_
   
   class SharedMemoryProtocolProperties;
   typedef SharedMemoryProtocolProperties *SharedMemoryProtocolProperties_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CH_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export SharedMemoryProtocolProperties_var : public TAO_Base_var
+  struct tao_SharedMemoryProtocolProperties_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        SharedMemoryProtocolProperties,
+        tao_SharedMemoryProtocolProperties_life
+      >
+    SharedMemoryProtocolProperties_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        SharedMemoryProtocolProperties,
+        tao_SharedMemoryProtocolProperties_life
+      >
+    SharedMemoryProtocolProperties_out;
+  
+  struct TAO_RTCORBA_Export tao_SharedMemoryProtocolProperties_life
   {
-  public:
-    SharedMemoryProtocolProperties_var (void); // default constructor
-    SharedMemoryProtocolProperties_var (SharedMemoryProtocolProperties_ptr p) : ptr_ (p) {} 
-    SharedMemoryProtocolProperties_var (const SharedMemoryProtocolProperties_var &); // copy constructor
-    ~SharedMemoryProtocolProperties_var (void); // destructor
-    
-    SharedMemoryProtocolProperties_var &operator= (SharedMemoryProtocolProperties_ptr);
-    SharedMemoryProtocolProperties_var &operator= (const SharedMemoryProtocolProperties_var &);
-    SharedMemoryProtocolProperties_ptr operator-> (void) const;
-    
-    operator const SharedMemoryProtocolProperties_ptr &() const;
-    operator SharedMemoryProtocolProperties_ptr &();
-    // in, inout, out, _retn 
-    SharedMemoryProtocolProperties_ptr in (void) const;
-    SharedMemoryProtocolProperties_ptr &inout (void);
-    SharedMemoryProtocolProperties_ptr &out (void);
-    SharedMemoryProtocolProperties_ptr _retn (void);
-    SharedMemoryProtocolProperties_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static SharedMemoryProtocolProperties_ptr tao_duplicate (SharedMemoryProtocolProperties_ptr);
     static void tao_release (SharedMemoryProtocolProperties_ptr);
     static SharedMemoryProtocolProperties_ptr tao_nil (void);
-    static SharedMemoryProtocolProperties_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        SharedMemoryProtocolProperties_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    SharedMemoryProtocolProperties_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    SharedMemoryProtocolProperties_var (const TAO_Base_var &rhs);
-    SharedMemoryProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CH_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_RTCORBA_Export SharedMemoryProtocolProperties_out
+  struct TAO_RTCORBA_Export tao_SharedMemoryProtocolProperties_cast
   {
-  public:
-    SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &);
-    SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_var &);
-    SharedMemoryProtocolProperties_out (const SharedMemoryProtocolProperties_out &);
-    SharedMemoryProtocolProperties_out &operator= (const SharedMemoryProtocolProperties_out &);
-    SharedMemoryProtocolProperties_out &operator= (const SharedMemoryProtocolProperties_var &);
-    SharedMemoryProtocolProperties_out &operator= (SharedMemoryProtocolProperties_ptr);
-    operator SharedMemoryProtocolProperties_ptr &();
-    SharedMemoryProtocolProperties_ptr &ptr (void);
-    SharedMemoryProtocolProperties_ptr operator-> (void);
-  
-  private:
-    SharedMemoryProtocolProperties_ptr &ptr_;
+    static SharedMemoryProtocolProperties_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
@@ -2393,7 +1660,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2403,10 +1670,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     SharedMemoryProtocolProperties (void);
     virtual ~SharedMemoryProtocolProperties (void);
-    
-    friend class _TAO_SharedMemoryProtocolProperties_Remote_Proxy_Impl;
-    friend class _TAO_SharedMemoryProtocolProperties_ThruPOA_Proxy_Impl;
-    friend class _TAO_SharedMemoryProtocolProperties_Direct_Proxy_Impl;
   
   private:
     SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &);
@@ -2421,9 +1684,22 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  struct PriorityBand;
   
-  class PriorityBand_var;
+  typedef
+    TAO_Fixed_Var_T<
+        PriorityBand
+      >
+    PriorityBand_var;
+  
+  typedef
+    PriorityBand &
+    PriorityBand_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_RTCORBA_Export PriorityBand
   {
@@ -2435,225 +1711,52 @@ TAO_NAMESPACE  RTCORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_RTCORBA_Export PriorityBand_var
-  {
-  public:
-    PriorityBand_var (void);
-    PriorityBand_var (PriorityBand *);
-    PriorityBand_var (const PriorityBand_var &);
-    // Fixed-size types only.
-    PriorityBand_var (const PriorityBand &);
-    ~PriorityBand_var (void);
-    
-    PriorityBand_var &operator= (PriorityBand *);
-    PriorityBand_var &operator= (const PriorityBand_var &);
-    
-    // Fixed-size types only.
-    PriorityBand_var &operator= (const PriorityBand &);
-    
-    PriorityBand *operator-> (void);
-    const PriorityBand *operator-> (void) const;
-    
-    operator const PriorityBand &() const;
-    operator PriorityBand &();
-    operator PriorityBand &() const;
-    
-    // in, inout, out, _retn 
-    const PriorityBand &in (void) const;
-    PriorityBand &inout (void);
-    PriorityBand &out (void);
-    PriorityBand _retn (void);
-    PriorityBand *ptr (void) const;
-  
-  private:
-    PriorityBand *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
-  
-  typedef PriorityBand &PriorityBand_out;
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBand;
   
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_
-  
-  class TAO_RTCORBA_Export _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
-    : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void);
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum); 
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
-        CORBA::ULong maximum,
-        CORBA::ULong length,
-        PriorityBand *data,
-        CORBA::Boolean release = 0
-      );
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
-        const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
-      );
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &operator= (
-        const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
-      );
-    virtual ~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void);
-    
-    // = Accessors.
-    PriorityBand &operator[] (CORBA::ULong i);
-    const PriorityBand &operator[] (CORBA::ULong i) const;
-    
-    // = Static operations.
-    static PriorityBand *allocbuf (CORBA::ULong size);
-    static void freebuf (PriorityBand *buffer);
-    
-    // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    PriorityBand *get_buffer (CORBA::Boolean orphan = 0);
-    const PriorityBand *get_buffer (void) const;
-    void replace (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        PriorityBand *data,
-        CORBA::Boolean release
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_RTCORBA_PRIORITYBANDS_CH_)
-#define _RTCORBA_PRIORITYBANDS_CH_
-  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
   
   class PriorityBands;
-  class PriorityBands_var;
-  
-  // *************************************************************
-  // RTCORBA::PriorityBands
-  // *************************************************************
   
-  class TAO_RTCORBA_Export PriorityBands : public 
-  
-  // TAO_IDL - Generated from 
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<PriorityBand>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  typedef
+    TAO_FixedSeq_Var_T<
+        PriorityBands,
+        PriorityBand
+      >
+    PriorityBands_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        PriorityBands,
+        PriorityBands_var,
+        PriorityBand
+      >
+    PriorityBands_out;
+  
+  class TAO_RTCORBA_Export PriorityBands
+    : public
+        TAO_Unbounded_Sequence<
+            PriorityBand
+          >
   {
   public:
     PriorityBands (void);
     PriorityBands (CORBA::ULong max);
     PriorityBands (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        PriorityBand *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        PriorityBand* buffer, 
         CORBA::Boolean release = 0
       );
     PriorityBands (const PriorityBands &);
     ~PriorityBands (void);
     
-    static void _tao_any_destructor (void*);
+    static void _tao_any_destructor (void *);
     
     typedef PriorityBands_var _var_type;
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIORITYBANDS___VAR_CH_)
-#define _RTCORBA_PRIORITYBANDS___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class RTCORBA::PriorityBands_var
-  // *************************************************************
-  
-  class TAO_RTCORBA_Export PriorityBands_var
-  {
-  public:
-    PriorityBands_var (void);
-    PriorityBands_var (PriorityBands *);
-    PriorityBands_var (const PriorityBands_var &);
-    
-    // Fixed-size base types only.
-    PriorityBands_var (const PriorityBands &);
-    
-    ~PriorityBands_var (void);
-    
-    PriorityBands_var &operator= (PriorityBands *);
-    PriorityBands_var &operator= (const PriorityBands_var &);
-    
-    // Fixed-size base types only.
-    PriorityBands_var &operator= (const PriorityBands &);
-    
-    PriorityBands *operator-> (void);
-    const PriorityBands *operator-> (void) const;
-    
-    operator const PriorityBands &() const;
-    operator PriorityBands &();
-    operator PriorityBands &() const;
-    PriorityBand & operator[] (CORBA::ULong index);
-    const PriorityBand & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const PriorityBands &in (void) const;
-    PriorityBands &inout (void);
-    PriorityBands *&out (void);
-    PriorityBands *_retn (void);
-    PriorityBands *ptr (void) const;
-  
-  private:
-    PriorityBands *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIORITYBANDS___OUT_CH_)
-#define _RTCORBA_PRIORITYBANDS___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
-  
-  class TAO_RTCORBA_Export PriorityBands_out
-  {
-  public:
-    PriorityBands_out (PriorityBands *&);
-    PriorityBands_out (PriorityBands_var &);
-    PriorityBands_out (const PriorityBands_out &);
-    PriorityBands_out &operator= (const PriorityBands_out &);
-    PriorityBands_out &operator= (PriorityBands *);
-    operator PriorityBands *&();
-    PriorityBands *&ptr (void);
-    PriorityBands *operator-> (void);
-    PriorityBand & operator[] (CORBA::ULong index);
-  
-  private:
-    PriorityBands *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const PriorityBands_var &);
-  };
-
-#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
@@ -2663,93 +1766,56 @@ TAO_NAMESPACE  RTCORBA
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
+  const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___PTR_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___PTR_CH_
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ODDS_N_ENDS_CH_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ODDS_N_ENDS_CH_
   
   class PriorityBandedConnectionPolicy;
   typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export PriorityBandedConnectionPolicy_var : public TAO_Base_var
+  struct tao_PriorityBandedConnectionPolicy_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        PriorityBandedConnectionPolicy,
+        tao_PriorityBandedConnectionPolicy_life
+      >
+    PriorityBandedConnectionPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        PriorityBandedConnectionPolicy,
+        tao_PriorityBandedConnectionPolicy_life
+      >
+    PriorityBandedConnectionPolicy_out;
+  
+  struct TAO_RTCORBA_Export tao_PriorityBandedConnectionPolicy_life
   {
-  public:
-    PriorityBandedConnectionPolicy_var (void); // default constructor
-    PriorityBandedConnectionPolicy_var (PriorityBandedConnectionPolicy_ptr p) : ptr_ (p) {} 
-    PriorityBandedConnectionPolicy_var (const PriorityBandedConnectionPolicy_var &); // copy constructor
-    ~PriorityBandedConnectionPolicy_var (void); // destructor
-    
-    PriorityBandedConnectionPolicy_var &operator= (PriorityBandedConnectionPolicy_ptr);
-    PriorityBandedConnectionPolicy_var &operator= (const PriorityBandedConnectionPolicy_var &);
-    PriorityBandedConnectionPolicy_ptr operator-> (void) const;
-    
-    operator const PriorityBandedConnectionPolicy_ptr &() const;
-    operator PriorityBandedConnectionPolicy_ptr &();
-    // in, inout, out, _retn 
-    PriorityBandedConnectionPolicy_ptr in (void) const;
-    PriorityBandedConnectionPolicy_ptr &inout (void);
-    PriorityBandedConnectionPolicy_ptr &out (void);
-    PriorityBandedConnectionPolicy_ptr _retn (void);
-    PriorityBandedConnectionPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static PriorityBandedConnectionPolicy_ptr tao_duplicate (PriorityBandedConnectionPolicy_ptr);
     static void tao_release (PriorityBandedConnectionPolicy_ptr);
     static PriorityBandedConnectionPolicy_ptr tao_nil (void);
-    static PriorityBandedConnectionPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        PriorityBandedConnectionPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    PriorityBandedConnectionPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PriorityBandedConnectionPolicy_var (const TAO_Base_var &rhs);
-    PriorityBandedConnectionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_RTCORBA_Export PriorityBandedConnectionPolicy_out
+  struct TAO_RTCORBA_Export tao_PriorityBandedConnectionPolicy_cast
   {
-  public:
-    PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &);
-    PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &);
-    PriorityBandedConnectionPolicy_out (const PriorityBandedConnectionPolicy_out &);
-    PriorityBandedConnectionPolicy_out &operator= (const PriorityBandedConnectionPolicy_out &);
-    PriorityBandedConnectionPolicy_out &operator= (const PriorityBandedConnectionPolicy_var &);
-    PriorityBandedConnectionPolicy_out &operator= (PriorityBandedConnectionPolicy_ptr);
-    operator PriorityBandedConnectionPolicy_ptr &();
-    PriorityBandedConnectionPolicy_ptr &ptr (void);
-    PriorityBandedConnectionPolicy_ptr operator-> (void);
-  
-  private:
-    PriorityBandedConnectionPolicy_ptr &ptr_;
+    static PriorityBandedConnectionPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
@@ -2793,7 +1859,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2803,10 +1869,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     PriorityBandedConnectionPolicy (void);
     virtual ~PriorityBandedConnectionPolicy (void);
-    
-    friend class _TAO_PriorityBandedConnectionPolicy_Remote_Proxy_Impl;
-    friend class _TAO_PriorityBandedConnectionPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_PriorityBandedConnectionPolicy_Direct_Proxy_Impl;
   
   private:
     PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
@@ -2821,90 +1883,53 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_CURRENT___PTR_CH_)
-#define _RTCORBA_CURRENT___PTR_CH_
+#if !defined (_RTCORBA_CURRENT__ODDS_N_ENDS_CH_)
+#define _RTCORBA_CURRENT__ODDS_N_ENDS_CH_
   
   class Current;
   typedef Current *Current_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_CURRENT___VAR_CH_)
-#define _RTCORBA_CURRENT___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export Current_var : public TAO_Base_var
+  struct tao_Current_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        Current,
+        tao_Current_life
+      >
+    Current_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        Current,
+        tao_Current_life
+      >
+    Current_out;
+  
+  struct TAO_RTCORBA_Export tao_Current_life
   {
-  public:
-    Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {} 
-    Current_var (const Current_var &); // copy constructor
-    ~Current_var (void); // destructor
-    
-    Current_var &operator= (Current_ptr);
-    Current_var &operator= (const Current_var &);
-    Current_ptr operator-> (void) const;
-    
-    operator const Current_ptr &() const;
-    operator Current_ptr &();
-    // in, inout, out, _retn 
-    Current_ptr in (void) const;
-    Current_ptr &inout (void);
-    Current_ptr &out (void);
-    Current_ptr _retn (void);
-    Current_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Current_ptr tao_duplicate (Current_ptr);
     static void tao_release (Current_ptr);
     static Current_ptr tao_nil (void);
-    static Current_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Current_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Current_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Current_var (const TAO_Base_var &rhs);
-    Current_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_CURRENT___OUT_CH_)
-#define _RTCORBA_CURRENT___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_RTCORBA_Export Current_out
+  struct TAO_RTCORBA_Export tao_Current_cast
   {
-  public:
-    Current_out (Current_ptr &);
-    Current_out (Current_var &);
-    Current_out (const Current_out &);
-    Current_out &operator= (const Current_out &);
-    Current_out &operator= (const Current_var &);
-    Current_out &operator= (Current_ptr);
-    operator Current_ptr &();
-    Current_ptr &ptr (void);
-    Current_ptr operator-> (void);
-  
-  private:
-    Current_ptr &ptr_;
+    static Current_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CURRENT_CH_)
 #define _RTCORBA_CURRENT_CH_
@@ -2959,7 +1984,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -2969,10 +1994,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     Current (void);
     virtual ~Current (void);
-    
-    friend class _TAO_Current_Remote_Proxy_Impl;
-    friend class _TAO_Current_ThruPOA_Proxy_Impl;
-    friend class _TAO_Current_Direct_Proxy_Impl;
   
   private:
     Current (const Current &);
@@ -2987,90 +2008,53 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_MUTEX___PTR_CH_)
-#define _RTCORBA_MUTEX___PTR_CH_
+#if !defined (_RTCORBA_MUTEX__ODDS_N_ENDS_CH_)
+#define _RTCORBA_MUTEX__ODDS_N_ENDS_CH_
   
   class Mutex;
   typedef Mutex *Mutex_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_MUTEX___VAR_CH_)
-#define _RTCORBA_MUTEX___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export Mutex_var : public TAO_Base_var
+  struct tao_Mutex_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        Mutex,
+        tao_Mutex_life
+      >
+    Mutex_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        Mutex,
+        tao_Mutex_life
+      >
+    Mutex_out;
+  
+  struct TAO_RTCORBA_Export tao_Mutex_life
   {
-  public:
-    Mutex_var (void); // default constructor
-    Mutex_var (Mutex_ptr p) : ptr_ (p) {} 
-    Mutex_var (const Mutex_var &); // copy constructor
-    ~Mutex_var (void); // destructor
-    
-    Mutex_var &operator= (Mutex_ptr);
-    Mutex_var &operator= (const Mutex_var &);
-    Mutex_ptr operator-> (void) const;
-    
-    operator const Mutex_ptr &() const;
-    operator Mutex_ptr &();
-    // in, inout, out, _retn 
-    Mutex_ptr in (void) const;
-    Mutex_ptr &inout (void);
-    Mutex_ptr &out (void);
-    Mutex_ptr _retn (void);
-    Mutex_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static Mutex_ptr tao_duplicate (Mutex_ptr);
     static void tao_release (Mutex_ptr);
     static Mutex_ptr tao_nil (void);
-    static Mutex_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        Mutex_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    Mutex_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Mutex_var (const TAO_Base_var &rhs);
-    Mutex_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_MUTEX___OUT_CH_)
-#define _RTCORBA_MUTEX___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_RTCORBA_Export Mutex_out
+  struct TAO_RTCORBA_Export tao_Mutex_cast
   {
-  public:
-    Mutex_out (Mutex_ptr &);
-    Mutex_out (Mutex_var &);
-    Mutex_out (const Mutex_out &);
-    Mutex_out &operator= (const Mutex_out &);
-    Mutex_out &operator= (const Mutex_var &);
-    Mutex_out &operator= (Mutex_ptr);
-    operator Mutex_ptr &();
-    Mutex_ptr &ptr (void);
-    Mutex_ptr operator-> (void);
-  
-  private:
-    Mutex_ptr &ptr_;
+    static Mutex_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_MUTEX_CH_)
 #define _RTCORBA_MUTEX_CH_
@@ -3135,7 +2119,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -3145,10 +2129,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     Mutex (void);
     virtual ~Mutex (void);
-    
-    friend class _TAO_Mutex_Remote_Proxy_Impl;
-    friend class _TAO_Mutex_ThruPOA_Proxy_Impl;
-    friend class _TAO_Mutex_Direct_Proxy_Impl;
   
   private:
     Mutex (const Mutex &);
@@ -3163,90 +2143,53 @@ TAO_NAMESPACE  RTCORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTCORBA_RTORB___PTR_CH_)
-#define _RTCORBA_RTORB___PTR_CH_
+#if !defined (_RTCORBA_RTORB__ODDS_N_ENDS_CH_)
+#define _RTCORBA_RTORB__ODDS_N_ENDS_CH_
   
   class RTORB;
   typedef RTORB *RTORB_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_RTORB___VAR_CH_)
-#define _RTCORBA_RTORB___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
-  
-  class TAO_RTCORBA_Export RTORB_var : public TAO_Base_var
+  struct tao_RTORB_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        RTORB,
+        tao_RTORB_life
+      >
+    RTORB_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        RTORB,
+        tao_RTORB_life
+      >
+    RTORB_out;
+  
+  struct TAO_RTCORBA_Export tao_RTORB_life
   {
-  public:
-    RTORB_var (void); // default constructor
-    RTORB_var (RTORB_ptr p) : ptr_ (p) {} 
-    RTORB_var (const RTORB_var &); // copy constructor
-    ~RTORB_var (void); // destructor
-    
-    RTORB_var &operator= (RTORB_ptr);
-    RTORB_var &operator= (const RTORB_var &);
-    RTORB_ptr operator-> (void) const;
-    
-    operator const RTORB_ptr &() const;
-    operator RTORB_ptr &();
-    // in, inout, out, _retn 
-    RTORB_ptr in (void) const;
-    RTORB_ptr &inout (void);
-    RTORB_ptr &out (void);
-    RTORB_ptr _retn (void);
-    RTORB_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static RTORB_ptr tao_duplicate (RTORB_ptr);
     static void tao_release (RTORB_ptr);
     static RTORB_ptr tao_nil (void);
-    static RTORB_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        RTORB_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    RTORB_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    RTORB_var (const TAO_Base_var &rhs);
-    RTORB_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTCORBA_RTORB___OUT_CH_)
-#define _RTCORBA_RTORB___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_RTCORBA_Export RTORB_out
+  struct TAO_RTCORBA_Export tao_RTORB_cast
   {
-  public:
-    RTORB_out (RTORB_ptr &);
-    RTORB_out (RTORB_var &);
-    RTORB_out (const RTORB_out &);
-    RTORB_out &operator= (const RTORB_out &);
-    RTORB_out &operator= (const RTORB_var &);
-    RTORB_out &operator= (RTORB_ptr);
-    operator RTORB_ptr &();
-    RTORB_ptr &ptr (void);
-    RTORB_ptr operator-> (void);
-  
-  private:
-    RTORB_ptr &ptr_;
+    static RTORB_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_RTORB_CH_)
 #define _RTCORBA_RTORB_CH_
@@ -3548,7 +2491,7 @@ TAO_NAMESPACE  RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -3558,10 +2501,6 @@ TAO_NAMESPACE  RTCORBA
   protected:
     RTORB (void);
     virtual ~RTORB (void);
-    
-    friend class _TAO_RTORB_Remote_Proxy_Impl;
-    friend class _TAO_RTORB_ThruPOA_Proxy_Impl;
-    friend class _TAO_RTORB_Direct_Proxy_Impl;
   
   private:
     RTORB (const RTORB &);
@@ -3812,7 +2751,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "RTCORBAC.i"
diff --git a/TAO/tao/RTCORBA/RTCORBAC.i b/TAO/tao/RTCORBA/RTCORBAC.i
index 317cb2dfae2..20d3c167064 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.i
+++ b/TAO/tao/RTCORBA/RTCORBAC.i
@@ -21,653 +21,11 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class RTCORBA::ThreadpoolLane_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (ThreadpoolLane *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (const ::RTCORBA::ThreadpoolLane_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::RTCORBA::ThreadpoolLane (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var::ThreadpoolLane_var (const ::RTCORBA::ThreadpoolLane &p)
-{
-  ACE_NEW (this->ptr_, ::RTCORBA::ThreadpoolLane (p));
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var::~ThreadpoolLane_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var &
-RTCORBA::ThreadpoolLane_var::operator= (ThreadpoolLane *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLane_var &
-RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ThreadpoolLane *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ThreadpoolLane (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ThreadpoolLane *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE RTCORBA::ThreadpoolLane_var &
-RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::RTCORBA::ThreadpoolLane (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::RTCORBA::ThreadpoolLane *
-RTCORBA::ThreadpoolLane_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolLane *
-RTCORBA::ThreadpoolLane_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var::operator const ::RTCORBA::ThreadpoolLane &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::RTCORBA::ThreadpoolLane &
-RTCORBA::ThreadpoolLane_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolLane &
-RTCORBA::ThreadpoolLane_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::RTCORBA::ThreadpoolLane &
-RTCORBA::ThreadpoolLane_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolLane
-RTCORBA::ThreadpoolLane_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolLane *
-RTCORBA::ThreadpoolLane_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CI_
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (CORBA::ULong size)
-{
-  RTCORBA::ThreadpoolLane *retval = 0;
-  ACE_NEW_RETURN (retval, RTCORBA::ThreadpoolLane[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (RTCORBA::ThreadpoolLane *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void)
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    RTCORBA::ThreadpoolLane *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (
-    const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      RTCORBA::ThreadpoolLane *tmp1 =
-        _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->maximum_);
-      RTCORBA::ThreadpoolLane * const tmp2 =
-        ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator= (
-    const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          RTCORBA::ThreadpoolLane *tmp =
-            ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  RTCORBA::ThreadpoolLane *tmp1 =
-    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
-  RTCORBA::ThreadpoolLane * const tmp2 =
-    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-RTCORBA::ThreadpoolLane &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  RTCORBA::ThreadpoolLane* tmp =
-    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const RTCORBA::ThreadpoolLane &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  RTCORBA::ThreadpoolLane * const tmp =
-    ACE_reinterpret_cast (RTCORBA::ThreadpoolLane* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (CORBA::Boolean orphan)
-{
-  RTCORBA::ThreadpoolLane *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const RTCORBA::ThreadpoolLane *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const RTCORBA::ThreadpoolLane * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    RTCORBA::ThreadpoolLane *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      RTCORBA::ThreadpoolLane *tmp =
-        ACE_reinterpret_cast (RTCORBA::ThreadpoolLane*, this->buffer_);
-      _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_RTCORBA_THREADPOOLLANES_CI_)
-#define _RTCORBA_THREADPOOLLANES_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class RTCORBA::ThreadpoolLanes_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (ThreadpoolLanes *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (const ::RTCORBA::ThreadpoolLanes_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::RTCORBA::ThreadpoolLanes (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size base types only.
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::ThreadpoolLanes_var (const ::RTCORBA::ThreadpoolLanes &p)
-{
-  ACE_NEW (this->ptr_, ::RTCORBA::ThreadpoolLanes (p));
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::~ThreadpoolLanes_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var &
-RTCORBA::ThreadpoolLanes_var::operator= (ThreadpoolLanes *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes_var &
-RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ThreadpoolLanes *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ThreadpoolLanes (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ThreadpoolLanes *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// Fixed-size types only.
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes_var &
-RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes &p)
-{
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::RTCORBA::ThreadpoolLanes (p), *this);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::RTCORBA::ThreadpoolLanes *
-RTCORBA::ThreadpoolLanes_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes *
-RTCORBA::ThreadpoolLanes_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::operator const ::RTCORBA::ThreadpoolLanes &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane &
-RTCORBA::ThreadpoolLanes_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const RTCORBA::ThreadpoolLane &
-RTCORBA::ThreadpoolLanes_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const RTCORBA::ThreadpoolLane &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::RTCORBA::ThreadpoolLanes &
-RTCORBA::ThreadpoolLanes_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes &
-RTCORBA::ThreadpoolLanes_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes *&
-RTCORBA::ThreadpoolLanes_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes *
-RTCORBA::ThreadpoolLanes_var::_retn (void)
-{
-  ::RTCORBA::ThreadpoolLanes *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes *
-RTCORBA::ThreadpoolLanes_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class RTCORBA::ThreadpoolLanes_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (ThreadpoolLanes *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (ThreadpoolLanes_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_out::ThreadpoolLanes_out (const ::RTCORBA::ThreadpoolLanes_out &p)
-  : ptr_ (ACE_const_cast (ThreadpoolLanes_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes_out &
-RTCORBA::ThreadpoolLanes_out::operator= (const ::RTCORBA::ThreadpoolLanes_out &p)
-{
-  this->ptr_ = ACE_const_cast (ThreadpoolLanes_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes_out &
-RTCORBA::ThreadpoolLanes_out::operator= (ThreadpoolLanes *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_out::operator ::RTCORBA::ThreadpoolLanes *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes *&
-RTCORBA::ThreadpoolLanes_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ThreadpoolLanes *
-RTCORBA::ThreadpoolLanes_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolLane &
-RTCORBA::ThreadpoolLanes_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY___CI_)
 #define _RTCORBA_PRIORITYMODELPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -702,14 +60,6 @@ TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY___CI_)
 #define _RTCORBA_THREADPOOLPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -745,13 +95,6 @@ TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_PROTOCOLPROPERTIES___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -781,219 +124,8 @@ TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class RTCORBA::Protocol_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::Protocol_var::Protocol_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-RTCORBA::Protocol_var::Protocol_var (Protocol *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-RTCORBA::Protocol_var::Protocol_var (const ::RTCORBA::Protocol_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::RTCORBA::Protocol (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-RTCORBA::Protocol_var::~Protocol_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_var &
-RTCORBA::Protocol_var::operator= (Protocol *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::RTCORBA::Protocol_var &
-RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Protocol *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Protocol (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Protocol *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::RTCORBA::Protocol *
-RTCORBA::Protocol_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Protocol *
-RTCORBA::Protocol_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_var::operator const ::RTCORBA::Protocol &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-RTCORBA::Protocol_var::operator ::RTCORBA::Protocol *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::RTCORBA::Protocol &
-RTCORBA::Protocol_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Protocol &
-RTCORBA::Protocol_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::RTCORBA::Protocol *&
-RTCORBA::Protocol_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Protocol *
-RTCORBA::Protocol_var::_retn (void)
-{
-  ::RTCORBA::Protocol *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::RTCORBA::Protocol *
-RTCORBA::Protocol_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class RTCORBA::Protocol_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::Protocol_out::Protocol_out (::RTCORBA::Protocol *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_out::Protocol_out (Protocol_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_out::Protocol_out (const ::RTCORBA::Protocol_out &p)
-  : ptr_ (ACE_const_cast (Protocol_out&, p).ptr_)
-{}
-
-ACE_INLINE
-RTCORBA::Protocol_out &
-RTCORBA::Protocol_out::operator= (const ::RTCORBA::Protocol_out &p)
-{
-  this->ptr_ = ACE_const_cast (Protocol_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_out &
-RTCORBA::Protocol_out::operator= (Protocol *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-RTCORBA::Protocol_out::operator ::RTCORBA::Protocol *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Protocol *&
-RTCORBA::Protocol_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Protocol *
-RTCORBA::Protocol_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
 template<>
-ACE_INLINE 
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::marshal_value (TAO_OutputCDR &)
 {
@@ -1001,471 +133,15 @@ TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::marshal_value (TAO_OutputCDR &)
 }
 
 template<>
-ACE_INLINE 
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &)
 {
   return 0;
 }
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_
-
-ACE_INLINE
-RTCORBA::Protocol *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (CORBA::ULong size)
-{
-  RTCORBA::Protocol *retval = 0;
-  ACE_NEW_RETURN (retval, RTCORBA::Protocol[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (RTCORBA::Protocol *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void)
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    RTCORBA::Protocol *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (
-    const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      RTCORBA::Protocol *tmp1 =
-        _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->maximum_);
-      RTCORBA::Protocol * const tmp2 =
-        ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator= (
-    const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          RTCORBA::Protocol *tmp =
-            ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  RTCORBA::Protocol *tmp1 =
-    ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
-  RTCORBA::Protocol * const tmp2 =
-    ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-RTCORBA::Protocol &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  RTCORBA::Protocol* tmp =
-    ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
-  return tmp[i];
-}
 
 ACE_INLINE
-const RTCORBA::Protocol &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  RTCORBA::Protocol * const tmp =
-    ACE_reinterpret_cast (RTCORBA::Protocol* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-RTCORBA::Protocol *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (CORBA::Boolean orphan)
-{
-  RTCORBA::Protocol *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const RTCORBA::Protocol *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const RTCORBA::Protocol * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    RTCORBA::Protocol *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      RTCORBA::Protocol *tmp =
-        ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_RTCORBA_PROTOCOLLIST_CI_)
-#define _RTCORBA_PROTOCOLLIST_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class RTCORBA::ProtocolList_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ProtocolList_var::ProtocolList_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-RTCORBA::ProtocolList_var::ProtocolList_var (ProtocolList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-RTCORBA::ProtocolList_var::ProtocolList_var (const ::RTCORBA::ProtocolList_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::RTCORBA::ProtocolList (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-RTCORBA::ProtocolList_var::~ProtocolList_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolList_var &
-RTCORBA::ProtocolList_var::operator= (ProtocolList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList_var &
-RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ProtocolList *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ProtocolList (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ProtocolList *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolList_var::operator const ::RTCORBA::ProtocolList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Protocol &
-RTCORBA::ProtocolList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const RTCORBA::Protocol &
-RTCORBA::ProtocolList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const RTCORBA::Protocol &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::RTCORBA::ProtocolList &
-RTCORBA::ProtocolList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList &
-RTCORBA::ProtocolList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList *&
-RTCORBA::ProtocolList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_var::_retn (void)
-{
-  ::RTCORBA::ProtocolList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class RTCORBA::ProtocolList_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolList_out::ProtocolList_out (const ::RTCORBA::ProtocolList_out &p)
-  : ptr_ (ACE_const_cast (ProtocolList_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::RTCORBA::ProtocolList_out &
-RTCORBA::ProtocolList_out::operator= (const ::RTCORBA::ProtocolList_out &p)
-{
-  this->ptr_ = ACE_const_cast (ProtocolList_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList_out &
-RTCORBA::ProtocolList_out::operator= (ProtocolList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolList_out::operator ::RTCORBA::ProtocolList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList *&
-RTCORBA::ProtocolList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Protocol &
-RTCORBA::ProtocolList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-template<>
-ACE_INLINE
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::marshal_value (TAO_OutputCDR &)
 {
@@ -1480,7 +156,6 @@ TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &)
   return 0;
 }
 
-#endif /* end #if !defined */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
@@ -1488,13 +163,6 @@ TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &)
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___CI_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1530,13 +198,6 @@ TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___CI_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1572,13 +233,6 @@ TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___CI_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1613,14 +267,6 @@ TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES___CI_
-
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1656,13 +302,6 @@ TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1698,13 +337,6 @@ TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1739,14 +371,6 @@ TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_Inp
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_
-
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -1776,637 +400,74 @@ TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_I
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class RTCORBA::PriorityBand_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (PriorityBand *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::RTCORBA::PriorityBand (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand &p)
-{
-  ACE_NEW (this->ptr_, ::RTCORBA::PriorityBand (p));
-}
-
-ACE_INLINE
-RTCORBA::PriorityBand_var::~PriorityBand_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBand_var &
-RTCORBA::PriorityBand_var::operator= (PriorityBand *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::RTCORBA::PriorityBand_var &
-RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PriorityBand *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PriorityBand (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PriorityBand *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE RTCORBA::PriorityBand_var &
-RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::RTCORBA::PriorityBand (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::RTCORBA::PriorityBand *
-RTCORBA::PriorityBand_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBand *
-RTCORBA::PriorityBand_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBand_var::operator const ::RTCORBA::PriorityBand &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::RTCORBA::PriorityBand &
-RTCORBA::PriorityBand_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBand &
-RTCORBA::PriorityBand_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::RTCORBA::PriorityBand &
-RTCORBA::PriorityBand_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBand
-RTCORBA::PriorityBand_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBand *
-RTCORBA::PriorityBand_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_
-
-ACE_INLINE
-RTCORBA::PriorityBand *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (CORBA::ULong size)
-{
-  RTCORBA::PriorityBand *retval = 0;
-  ACE_NEW_RETURN (retval, RTCORBA::PriorityBand[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (RTCORBA::PriorityBand *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void)
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    RTCORBA::PriorityBand *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (
-    const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      RTCORBA::PriorityBand *tmp1 =
-        _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->maximum_);
-      RTCORBA::PriorityBand * const tmp2 =
-        ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator= (
-    const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          RTCORBA::PriorityBand *tmp =
-            ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  RTCORBA::PriorityBand *tmp1 =
-    ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
-  RTCORBA::PriorityBand * const tmp2 =
-    ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-RTCORBA::PriorityBand &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  RTCORBA::PriorityBand* tmp =
-    ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const RTCORBA::PriorityBand &
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  RTCORBA::PriorityBand * const tmp =
-    ACE_reinterpret_cast (RTCORBA::PriorityBand* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-RTCORBA::PriorityBand *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (CORBA::Boolean orphan)
-{
-  RTCORBA::PriorityBand *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const RTCORBA::PriorityBand *
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const RTCORBA::PriorityBand * ACE_CAST_CONST, this->buffer_);
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-void
-RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    RTCORBA::PriorityBand *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      RTCORBA::PriorityBand *tmp =
-        ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
+#if !defined (_RTCORBA_THREADPOOLPOLICY___CI_)
+#define _RTCORBA_THREADPOOLPOLICY___CI_
 
 #endif /* end #if !defined */
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_RTCORBA_PRIORITYBANDS_CI_)
-#define _RTCORBA_PRIORITYBANDS_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class RTCORBA::PriorityBands_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (PriorityBands *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::RTCORBA::PriorityBands (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size base types only.
-ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands &p)
-{
-  ACE_NEW (this->ptr_, ::RTCORBA::PriorityBands (p));
-}
-
-ACE_INLINE
-RTCORBA::PriorityBands_var::~PriorityBands_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBands_var &
-RTCORBA::PriorityBands_var::operator= (PriorityBands *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::RTCORBA::PriorityBands_var &
-RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          PriorityBands *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              PriorityBands (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              PriorityBands *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// Fixed-size types only.
-ACE_INLINE
-::RTCORBA::PriorityBands_var &
-RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands &p)
-{
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBands (p), *this);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_var::operator-> (void) const
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_var::operator-> (void)
-{
-  return this->ptr_;
-}
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_PROTOCOLPROPERTIES___CI_
 
-ACE_INLINE
-RTCORBA::PriorityBands_var::operator const ::RTCORBA::PriorityBands &() const // cast
-{
-  return *this->ptr_;
-}
+#endif /* end #if !defined */
 
-ACE_INLINE
-RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() // cast 
-{
-  return *this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() const // cast 
-{
-  return *this->ptr_;
-}
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___CI_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY___CI_
 
-ACE_INLINE
-RTCORBA::PriorityBand &
-RTCORBA::PriorityBands_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
+#endif /* end #if !defined */
 
-ACE_INLINE
-const RTCORBA::PriorityBand &
-RTCORBA::PriorityBands_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const RTCORBA::PriorityBand &, this->ptr_->operator[] (index));
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-const ::RTCORBA::PriorityBands &
-RTCORBA::PriorityBands_var::in (void) const
-{
-  return *this->ptr_;
-}
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___CI_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY___CI_
 
-ACE_INLINE
-::RTCORBA::PriorityBands &
-RTCORBA::PriorityBands_var::inout (void)
-{
-  return *this->ptr_;
-}
+#endif /* end #if !defined */
 
-ACE_INLINE
-::RTCORBA::PriorityBands *&
-RTCORBA::PriorityBands_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_var::_retn (void)
-{
-  ::RTCORBA::PriorityBands *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___CI_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY___CI_
 
-ACE_INLINE
-::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_var::ptr (void) const
-{
-  return this->ptr_;
-}
+#endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-// *************************************************************
-// Inline operations for class RTCORBA::PriorityBands_out
-// *************************************************************
+#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_TCPPROTOCOLPROPERTIES___CI_
 
-ACE_INLINE
-RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
+#endif /* end #if !defined */
 
-ACE_INLINE
-RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-RTCORBA::PriorityBands_out::PriorityBands_out (const ::RTCORBA::PriorityBands_out &p)
-  : ptr_ (ACE_const_cast (PriorityBands_out&, p).ptr_)
-{}
+#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_GIOPPROTOCOLPROPERTIES___CI_
 
-ACE_INLINE
-::RTCORBA::PriorityBands_out &
-RTCORBA::PriorityBands_out::operator= (const ::RTCORBA::PriorityBands_out &p)
-{
-  this->ptr_ = ACE_const_cast (PriorityBands_out&, p).ptr_;
-  return *this;
-}
+#endif /* end #if !defined */
 
-ACE_INLINE
-::RTCORBA::PriorityBands_out &
-RTCORBA::PriorityBands_out::operator= (PriorityBands *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-RTCORBA::PriorityBands_out::operator ::RTCORBA::PriorityBands *&() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_
 
-ACE_INLINE
-::RTCORBA::PriorityBands *&
-RTCORBA::PriorityBands_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
+#endif /* end #if !defined */
 
-ACE_INLINE
-::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_out::operator-> (void)
-{
-  return this->ptr_;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
-ACE_INLINE
-RTCORBA::PriorityBand &
-RTCORBA::PriorityBands_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
+#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_
 
 #endif /* end #if !defined */
 
@@ -2416,13 +477,6 @@ RTCORBA::PriorityBands_out::operator[] (CORBA::ULong index)
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -2461,13 +515,6 @@ TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_I
 #if !defined (_RTCORBA_CURRENT___CI_)
 #define _RTCORBA_CURRENT___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::Current::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -2503,13 +550,6 @@ TAO::Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
 #if !defined (_RTCORBA_MUTEX___CI_)
 #define _RTCORBA_MUTEX___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::Mutex::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -2545,13 +585,6 @@ TAO::Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
 #if !defined (_RTCORBA_RTORB___CI_)
 #define _RTCORBA_RTORB___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTCORBA::RTORB::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -2582,7 +615,7 @@ TAO::Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -2657,17 +690,17 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enum
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (RTCORBA::PriorityModel, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -2724,4 +757,3 @@ CORBA::Boolean TAO_RTCORBA_Export operator>> (
   );
 
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_I_ */
-
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 5aac33868f3..ef77b727460 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -39,7 +39,7 @@
 int RTPortableServer::POA::_tao_class_id = 0;
 
 RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_duplicate (
+RTPortableServer::tao_POA_life::tao_duplicate (
     RTPortableServer::POA_ptr p
   )
 {
@@ -47,7 +47,7 @@ tao_RTPortableServer_POA_duplicate (
 }
 
 void
-tao_RTPortableServer_POA_release (
+RTPortableServer::tao_POA_life::tao_release (
     RTPortableServer::POA_ptr p
   )
 {
@@ -55,15 +55,24 @@ tao_RTPortableServer_POA_release (
 }
 
 RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_nil (
+RTPortableServer::tao_POA_life::tao_nil (
     void
   )
 {
   return RTPortableServer::POA::_nil ();
 }
 
+CORBA::Boolean
+RTPortableServer::tao_POA_life::tao_marshal (
+    RTPortableServer::POA_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_narrow (
+RTPortableServer::tao_POA_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -72,7 +81,7 @@ tao_RTPortableServer_POA_narrow (
 }
 
 CORBA::Object *
-tao_RTPortableServer_POA_upcast (
+RTPortableServer::tao_POA_cast::tao_upcast (
     void *src
   )
 {
@@ -81,205 +90,32 @@ tao_RTPortableServer_POA_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_RTPortableServer_POA_marshal (
-    RTPortableServer::POA_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// RTPortableServer::POA_var
-// *************************************************************
-
-RTPortableServer::POA_var::POA_var (void)
-  : ptr_ (POA::_nil ())
-{}
-
-::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-RTPortableServer::POA_var::POA_var (const ::RTPortableServer::POA_var &p)
-  : TAO_Base_var (),
-    ptr_ (POA::_duplicate (p.ptr ()))
-{}
-
-RTPortableServer::POA_var::~POA_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-RTPortableServer::POA_var &
-RTPortableServer::POA_var::operator= (POA_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-RTPortableServer::POA_var &
-RTPortableServer::POA_var::operator= (const ::RTPortableServer::POA_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTPortableServer::POA::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-RTPortableServer::POA_var::operator const ::RTPortableServer::POA_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::RTPortableServer::POA_ptr &
-RTPortableServer::POA_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::RTPortableServer::POA_ptr &
-RTPortableServer::POA_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTPortableServer::POA::_nil ();
-  return this->ptr_;
-}
-
-::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTPortableServer::POA_ptr val = this->ptr_;
-  this->ptr_ = ::RTPortableServer::POA::_nil ();
-  return val;
-}
-
-::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::tao_duplicate (POA_ptr p)
-{
-  return ::RTPortableServer::POA::_duplicate (p);
-}
-
-void
-RTPortableServer::POA_var::tao_release (POA_ptr p)
-{
-  CORBA::release (p);
-}
-
-::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::tao_nil (void)
-{
-  return ::RTPortableServer::POA::_nil ();
-}
-
-::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::RTPortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-RTPortableServer::POA_var::tao_upcast (void *src)
-{
-  POA **tmp =
-    ACE_static_cast (POA **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        RTPortableServer::POA,
+        RTPortableServer::tao_POA_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        RTPortableServer::POA,
+        RTPortableServer::tao_POA_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        RTPortableServer::POA, \
+        RTPortableServer::tao_POA_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        RTPortableServer::POA, \
+        RTPortableServer::tao_POA_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// RTPortableServer::POA_out
-// *************************************************************
-
-RTPortableServer::POA_out::POA_out (POA_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTPortableServer::POA::_nil ();
-}
-
-RTPortableServer::POA_out::POA_out (POA_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTPortableServer::POA::_nil ();
-}
-
-RTPortableServer::POA_out::POA_out (const ::RTPortableServer::POA_out &p)
-  : ptr_ (ACE_const_cast (POA_out &, p).ptr_)
-{}
-
-::RTPortableServer::POA_out &
-RTPortableServer::POA_out::operator= (const ::RTPortableServer::POA_out &p)
-{
-  this->ptr_ = ACE_const_cast (POA_out&, p).ptr_;
-  return *this;
-}
-
-RTPortableServer::POA_out &
-RTPortableServer::POA_out::operator= (const ::RTPortableServer::POA_var &p)
-{
-  this->ptr_ = ::RTPortableServer::POA::_duplicate (p.ptr ());
-  return *this;
-}
-
-RTPortableServer::POA_out &
-RTPortableServer::POA_out::operator= (POA_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-RTPortableServer::POA_out::operator ::RTPortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::RTPortableServer::POA_ptr &
-RTPortableServer::POA_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::RTPortableServer::POA_ptr
-RTPortableServer::POA_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 RTPortableServer::POA::POA (void)
 {}
@@ -287,7 +123,7 @@ RTPortableServer::POA::POA (void)
 RTPortableServer::POA::~POA (void)
 {}
 
-void 
+void
 RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *tmp = ACE_static_cast (POA *, _tao_void_pointer);
@@ -303,7 +139,7 @@ RTPortableServer::POA::_narrow (
   return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-RTPortableServer::POA_ptr 
+RTPortableServer::POA_ptr
 RTPortableServer::POA::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -313,7 +149,7 @@ RTPortableServer::POA::_unchecked_narrow (
     {
       return POA::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           POA_ptr,
@@ -333,14 +169,14 @@ RTPortableServer::POA::_duplicate (POA_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::RTPortableServer, POA)::_tao_class_id)
@@ -373,12 +209,12 @@ void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -387,6 +223,12 @@ const char* RTPortableServer::POA::_interface_repository_id (void) const
   return "IDL:omg.org/RTPortableServer/POA:1.0";
 }
 
+CORBA::Boolean
+RTPortableServer::POA::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -394,15 +236,15 @@ static const CORBA::Long _oc_RTPortableServer_POA[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254506f), 
-  ACE_NTOHL (0x72746162), 
-  ACE_NTOHL (0x6c655365), 
-  ACE_NTOHL (0x72766572), 
-  ACE_NTOHL (0x2f504f41), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254506f),
+  ACE_NTOHL (0x72746162),
+  ACE_NTOHL (0x6c655365),
+  ACE_NTOHL (0x72766572),
+  ACE_NTOHL (0x2f504f41),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
     4,
   ACE_NTOHL (0x504f4100),  // name = POA
@@ -478,4 +320,3 @@ operator>>= (
 # pragma instantiate TAO_Object_Manager<RTPortableServer::POA, RTPortableServer::POA_var>
 # pragma instantiate TAO::Any_Impl_T<RTPortableServer::POA>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index 29702181cfb..8c97c6ecdd9 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -67,90 +67,53 @@ TAO_NAMESPACE  RTPortableServer
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_RTPORTABLESERVER_POA___PTR_CH_)
-#define _RTPORTABLESERVER_POA___PTR_CH_
+#if !defined (_RTPORTABLESERVER_POA__ODDS_N_ENDS_CH_)
+#define _RTPORTABLESERVER_POA__ODDS_N_ENDS_CH_
   
   class POA;
   typedef POA *POA_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_RTPORTABLESERVER_POA___VAR_CH_)
-#define _RTPORTABLESERVER_POA___VAR_CH_
+  struct tao_POA_life;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  typedef
+    TAO_Objref_Var_T<
+        POA,
+        tao_POA_life
+      >
+    POA_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        POA,
+        tao_POA_life
+      >
+    POA_out;
   
-  class TAO_RTPortableServer_Export POA_var : public TAO_Base_var
+  struct TAO_RTPortableServer_Export tao_POA_life
   {
-  public:
-    POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {} 
-    POA_var (const POA_var &); // copy constructor
-    ~POA_var (void); // destructor
-    
-    POA_var &operator= (POA_ptr);
-    POA_var &operator= (const POA_var &);
-    POA_ptr operator-> (void) const;
-    
-    operator const POA_ptr &() const;
-    operator POA_ptr &();
-    // in, inout, out, _retn 
-    POA_ptr in (void) const;
-    POA_ptr &inout (void);
-    POA_ptr &out (void);
-    POA_ptr _retn (void);
-    POA_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static POA_ptr tao_duplicate (POA_ptr);
     static void tao_release (POA_ptr);
     static POA_ptr tao_nil (void);
-    static POA_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        POA_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    POA_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    POA_var (const TAO_Base_var &rhs);
-    POA_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_RTPORTABLESERVER_POA___OUT_CH_)
-#define _RTPORTABLESERVER_POA___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_RTPortableServer_Export POA_out
+  struct TAO_RTPortableServer_Export tao_POA_cast
   {
-  public:
-    POA_out (POA_ptr &);
-    POA_out (POA_var &);
-    POA_out (const POA_out &);
-    POA_out &operator= (const POA_out &);
-    POA_out &operator= (const POA_var &);
-    POA_out &operator= (POA_ptr);
-    operator POA_ptr &();
-    POA_ptr &ptr (void);
-    POA_ptr operator-> (void);
-  
-  private:
-    POA_ptr &ptr_;
+    static POA_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTPORTABLESERVER_POA_CH_)
 #define _RTPORTABLESERVER_POA_CH_
@@ -241,7 +204,7 @@ TAO_NAMESPACE  RTPortableServer
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -251,7 +214,7 @@ TAO_NAMESPACE  RTPortableServer
   protected:
     POA (void);
     virtual ~POA (void);
-    
+  
   private:
     POA (const POA &);
     void operator= (const POA &);
@@ -288,7 +251,7 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "RTPortableServerC.i"
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.i b/TAO/tao/RTPortableServer/RTPortableServerC.i
index 5e0c1596d0f..ddbfdcf62e4 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.i
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.i
@@ -26,13 +26,6 @@
 #if !defined (_RTPORTABLESERVER_POA___CI_)
 #define _RTPORTABLESERVER_POA___CI_
 
-ACE_INLINE
-CORBA::Boolean
-RTPortableServer::POA::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -61,4 +54,3 @@ TAO::Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
 }
 
 #endif /* end #if !defined */
-
diff --git a/TAO/tao/Seq_Out_T.cpp b/TAO/tao/Seq_Out_T.cpp
new file mode 100644
index 00000000000..89b13ea1890
--- /dev/null
+++ b/TAO/tao/Seq_Out_T.cpp
@@ -0,0 +1,14 @@
+#ifndef TAO_SEQ_OUT_T_C
+#define TAO_SEQ_OUT_T_C
+
+#include "Seq_Out_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "Seq_Out_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Sequence_Out_T,
+           "$Id$")
+
+#endif /*TAO_SEQUENCE_OUT_T_C*/
diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h
new file mode 100644
index 00000000000..f2034d26402
--- /dev/null
+++ b/TAO/tao/Seq_Out_T.h
@@ -0,0 +1,100 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Seqeunce_Out_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_SEQ_OUT_T_H
+#define TAO_SEQ_OUT_T_H
+#include "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+/**
+ * @class TAO_Seq_Out_T
+ *
+ * @brief Parametrized implementation of _out class for sequences.
+ *
+ */
+template <typename T, typename T_var, typename T_elem>
+class TAO_Seq_Out_T
+{
+public:
+  TAO_Seq_Out_T (T *&);
+  TAO_Seq_Out_T (T_var &);
+  TAO_Seq_Out_T (const TAO_Seq_Out_T<T,T_var,T_elem> &);
+
+  TAO_Seq_Out_T &operator= (const TAO_Seq_Out_T<T,T_var,T_elem> &);
+  TAO_Seq_Out_T &operator= (T *);
+
+  operator T *& ();
+  T *& ptr (void);
+  T * operator-> (void);
+
+  T_elem & operator[] (CORBA::ULong index);
+
+private:
+  typedef TAO_Seq_Out_T<T,T_var,T_elem> THIS_OUT_TYPE;
+  T *& ptr_;
+  // Assignment from T_var not allowed.
+  void operator= (const T_var &);
+};
+
+
+/**
+ * @class TAO_MngSeq_Out_T
+ *
+ * @brief Parametrized implementation of _out class for sequences
+ * having managed types.
+ *
+ */
+template <typename T, typename T_var, typename T_elem>
+class TAO_MngSeq_Out_T
+{
+public:
+  TAO_MngSeq_Out_T (T *&);
+  TAO_MngSeq_Out_T (T_var &);
+  TAO_MngSeq_Out_T (const TAO_MngSeq_Out_T<T,T_var,T_elem> &);
+
+  TAO_MngSeq_Out_T &operator= (const TAO_MngSeq_Out_T<T,T_var,T_elem> &);
+  TAO_MngSeq_Out_T &operator= (T *);
+
+  operator T *& ();
+  T *& ptr (void);
+  T * operator-> (void);
+
+  T_elem operator[] (CORBA::ULong index);
+
+private:
+  typedef TAO_MngSeq_Out_T<T,T_var,T_elem> THIS_OUT_TYPE;
+  T *& ptr_;
+  // Assignment from T_var not allowed.
+  void operator= (const T_var &);
+};
+
+
+
+#if defined (__ACE_INLINE__)
+#include "Seq_Out_T.inl"
+#endif /* defined INLINE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Seq_Out_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Seq_Out_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+#endif /* TAO_SEQ_OUT_T_H */
diff --git a/TAO/tao/Seq_Out_T.inl b/TAO/tao/Seq_Out_T.inl
new file mode 100644
index 00000000000..ddde67b7978
--- /dev/null
+++ b/TAO/tao/Seq_Out_T.inl
@@ -0,0 +1,154 @@
+// -*- C++ -*-
+//$Id$
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (T *& p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (T_var & p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (
+    const TAO_Seq_Out_T<T,T_var,T_elem> & p
+  )
+  : ptr_ (ACE_const_cast (THIS_OUT_TYPE &, p).ptr_)
+{}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_Seq_Out_T<T,T_var,T_elem> &
+TAO_Seq_Out_T<T,T_var,T_elem>::operator= (
+    const TAO_Seq_Out_T<T,T_var,T_elem> & p
+  )
+{
+  this->ptr_ = ACE_const_cast (THIS_OUT_TYPE &, p).ptr_;
+  return *this;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_Seq_Out_T<T,T_var,T_elem> &
+TAO_Seq_Out_T<T,T_var,T_elem>::operator= (T * p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_Seq_Out_T<T,T_var,T_elem>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+T *&
+TAO_Seq_Out_T<T,T_var,T_elem>::ptr (void)
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+T *
+TAO_Seq_Out_T<T,T_var,T_elem>::operator-> (void)
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+T_elem &
+TAO_Seq_Out_T<T,T_var,T_elem>::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+// ****************************************************************
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (T *& p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (T_var & p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Out_T<T,T_var,T_elem>::TAO_MngSeq_Out_T (
+    const TAO_MngSeq_Out_T<T,T_var,T_elem> & p
+  )
+  : ptr_ (ACE_const_cast (THIS_OUT_TYPE &, p).ptr_)
+{}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Out_T<T,T_var,T_elem> &
+TAO_MngSeq_Out_T<T,T_var,T_elem>::operator= (
+    const TAO_MngSeq_Out_T<T,T_var,T_elem> & p
+  )
+{
+  this->ptr_ = ACE_const_cast (THIS_OUT_TYPE &, p).ptr_;
+  return *this;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Out_T<T,T_var,T_elem> &
+TAO_MngSeq_Out_T<T,T_var,T_elem>::operator= (T * p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Out_T<T,T_var,T_elem>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+T *&
+TAO_MngSeq_Out_T<T,T_var,T_elem>::ptr (void)
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+T *
+TAO_MngSeq_Out_T<T,T_var,T_elem>::operator-> (void)
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_elem>
+ACE_INLINE
+T_elem
+TAO_MngSeq_Out_T<T,T_var,T_elem>::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
diff --git a/TAO/tao/Seq_Var_T.cpp b/TAO/tao/Seq_Var_T.cpp
new file mode 100644
index 00000000000..a566fc7a436
--- /dev/null
+++ b/TAO/tao/Seq_Var_T.cpp
@@ -0,0 +1,159 @@
+// $Id$
+
+#ifndef TAO_SEQ_VAR_T_C
+#define TAO_SEQ_VAR_T_C
+
+#include "tao/Seq_Var_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Seq_Var_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Seq_VarOut_T,
+           "$Id$")
+
+template<typename T, typename T_elem>
+TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (
+    const TAO_Seq_Var_Base_T<T,T_elem> & p
+  )
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_,
+               T (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+// ****************************************************************************
+
+template<typename T, typename T_elem>
+TAO_FixedSeq_Var_T<T,T_elem> &
+TAO_FixedSeq_Var_T<T,T_elem>::operator= (
+    const TAO_FixedSeq_Var_T<T,T_elem> & p
+  )
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          T * deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              T (*p.ptr_),
+              *this
+            );
+
+          if (deep_copy != 0)
+            {
+              T * tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+
+  return *this;
+}
+
+// Fixed-size types only.
+template<typename T, typename T_elem>
+TAO_FixedSeq_Var_T<T,T_elem> &
+TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p)
+{
+  if (this->ptr_ != &p)
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_,
+                      T (p),
+                      *this);
+    }
+
+  return *this;
+}
+
+// ****************************************************************************
+
+template<typename T, typename T_elem>
+TAO_VarSeq_Var_T<T,T_elem> &
+TAO_VarSeq_Var_T<T,T_elem>::operator= (
+    const TAO_VarSeq_Var_T<T,T_elem> & p
+  )
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          T * deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              T (*p.ptr_),
+              *this
+            );
+
+          if (deep_copy != 0)
+            {
+              T * tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+
+  return *this;
+}
+
+// ****************************************************************************
+
+template<typename T, typename T_elem>
+TAO_MngSeq_Var_T<T,T_elem> &
+TAO_MngSeq_Var_T<T,T_elem>::operator= (
+    const TAO_MngSeq_Var_T<T,T_elem> & p
+  )
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          T * deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              T (*p.ptr_),
+              *this
+            );
+
+          if (deep_copy != 0)
+            {
+              T * tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+
+  return *this;
+}
+
+#endif /* TAO_SEQ_VAR_T_C */
diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h
new file mode 100644
index 00000000000..bef3486c7ec
--- /dev/null
+++ b/TAO/tao/Seq_Var_T.h
@@ -0,0 +1,152 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Seq_Var_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_SEQ_VAR_T_H
+#define TAO_SEQ_VAR_T_H
+
+#include "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Seq_Var_Base_T
+ *
+ * @brief Parametrized implementation of _var base class for sequences
+ *
+ */
+template <typename T, typename T_elem>
+class TAO_Seq_Var_Base_T
+{
+public:
+  TAO_Seq_Var_Base_T (void);
+  TAO_Seq_Var_Base_T (T *);
+  TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T,T_elem> &);
+
+  ~TAO_Seq_Var_Base_T (void);
+
+  T *operator-> (void);
+  const T *operator-> (void) const;
+
+  operator const T &() const;
+  operator T &();
+  operator T &() const;
+
+  // in, inout, out, _retn
+  const T & in (void) const;
+  T & inout (void);
+  T *& out (void);
+  T * _retn (void);
+
+  // TAO extension.
+  T * ptr (void) const;
+
+protected:
+  T * ptr_;
+};
+
+/**
+ * @class TAO_FixedSeq_Var_T
+ *
+ * @brief Parametrized implementation of _var class for sequences
+ * whose element is of fixed size..
+ *
+ */
+template <typename T, typename T_elem>
+class TAO_FixedSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
+{
+public:
+  TAO_FixedSeq_Var_T (void);
+  TAO_FixedSeq_Var_T (T *);
+  TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T,T_elem> &);
+
+  // Fixed-size base types only.
+  TAO_FixedSeq_Var_T (const T &);
+
+  TAO_FixedSeq_Var_T & operator= (T *);
+  TAO_FixedSeq_Var_T & operator= (const TAO_FixedSeq_Var_T<T,T_elem> &);
+
+  T_elem & operator[] (CORBA::ULong index);
+
+  // Fixed-size base types only.
+  TAO_FixedSeq_Var_T & operator= (const T &);
+};
+
+/**
+ * @class TAO_VarSeq_Var_T
+ *
+ * @brief Parametrized implementation of _var class for sequences
+ * whose element is of variable size..
+ *
+ */
+template <typename T, typename T_elem>
+class TAO_VarSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
+{
+public:
+  TAO_VarSeq_Var_T (void);
+  TAO_VarSeq_Var_T (T *);
+  TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T,T_elem> &);
+
+  TAO_VarSeq_Var_T & operator= (T *);
+  TAO_VarSeq_Var_T & operator= (const TAO_VarSeq_Var_T<T,T_elem> &);
+
+  T_elem & operator[] (CORBA::ULong index);
+
+  // Variable-size base types only.
+  operator T *& ();
+};
+
+/**
+ * @class TAO_MngSeq_Var_T
+ *
+ * @brief Parametrized implementation of _var class for sequences
+ * whose element is of a managed type - string, wstring, valuetype,
+ * interface, abstract interface and pseudo object.
+ *
+ */
+template <typename T, typename T_elem>
+class TAO_MngSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem>
+{
+public:
+  TAO_MngSeq_Var_T (void);
+  TAO_MngSeq_Var_T (T *);
+  TAO_MngSeq_Var_T (const TAO_MngSeq_Var_T<T,T_elem> &);
+
+  TAO_MngSeq_Var_T & operator= (T *);
+  TAO_MngSeq_Var_T & operator= (const TAO_MngSeq_Var_T<T,T_elem> &);
+
+  // Variable-size base types only.
+  operator T *& ();
+
+  // Managed base types only.
+  T_elem operator[] (CORBA::ULong index);
+};
+
+
+
+#if defined (__ACE_INLINE__)
+#include "Seq_Var_T.inl"
+#endif /* defined INLINE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Seq_Var_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Seq_Var_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_SEQ_VAROUT_T_H */
diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl
new file mode 100644
index 00000000000..b625dac9a6e
--- /dev/null
+++ b/TAO/tao/Seq_Var_T.inl
@@ -0,0 +1,241 @@
+//$Id$
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (void)
+  : ptr_ (0)
+{}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (T * p)
+  : ptr_ (p)
+{}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_Seq_Var_Base_T<T,T_elem>::~TAO_Seq_Var_Base_T (void)
+{
+  delete this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+const T *
+TAO_Seq_Var_Base_T<T,T_elem>::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+T *
+TAO_Seq_Var_Base_T<T,T_elem>::operator-> (void)
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_Seq_Var_Base_T<T,T_elem>::operator const T & () const
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_Seq_Var_Base_T<T,T_elem>::operator T & ()
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_Seq_Var_Base_T<T,T_elem>::operator T & () const
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+const T &
+TAO_Seq_Var_Base_T<T,T_elem>::in (void) const
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+T &
+TAO_Seq_Var_Base_T<T,T_elem>::inout (void)
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+T *&
+TAO_Seq_Var_Base_T<T,T_elem>::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+T *
+TAO_Seq_Var_Base_T<T,T_elem>::_retn (void)
+{
+  T * tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+T *
+TAO_Seq_Var_Base_T<T,T_elem>::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// ***************************************************************
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (void)
+{}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (T * p)
+  : TAO_Seq_Var_Base_T<T,T_elem> (p)
+{}
+
+template<typename T, typename T_elem>
+TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (
+    const TAO_FixedSeq_Var_T<T,T_elem> & p
+  )
+  : TAO_Seq_Var_Base_T<T,T_elem> (p)
+{
+}
+
+// Fixed-size base types only.
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (const T & p)
+{
+  ACE_NEW (this->ptr_,
+           T (p));
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_FixedSeq_Var_T<T,T_elem> &
+TAO_FixedSeq_Var_T<T,T_elem>::operator= (T * p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+T_elem &
+TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+// ***************************************************************
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (void)
+{}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (T * p)
+  : TAO_Seq_Var_Base_T<T,T_elem> (p)
+{}
+
+template<typename T, typename T_elem>
+TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (
+    const TAO_VarSeq_Var_T<T,T_elem> & p
+  )
+  : TAO_Seq_Var_Base_T<T,T_elem> (p)
+{}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_VarSeq_Var_T<T,T_elem> &
+TAO_VarSeq_Var_T<T,T_elem>::operator= (T * p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+// Variable-size types only.
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_VarSeq_Var_T<T,T_elem>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+T_elem &
+TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+// ***************************************************************
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (void)
+{}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (T * p)
+  : TAO_Seq_Var_Base_T<T,T_elem> (p)
+{}
+
+template<typename T, typename T_elem>
+TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (
+    const TAO_MngSeq_Var_T<T,T_elem> & p
+  )
+  : TAO_Seq_Var_Base_T<T,T_elem> (p)
+{}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Var_T<T,T_elem> &
+TAO_MngSeq_Var_T<T,T_elem>::operator= (T * p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+// Variable-size types only.
+template<typename T, typename T_elem>
+ACE_INLINE
+TAO_MngSeq_Var_T<T,T_elem>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_elem>
+ACE_INLINE
+T_elem
+TAO_MngSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index 838485381f1..f17948d7ddd 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -24,16 +24,16 @@ void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong)
 }
 
 void
-TAO_Base_Sequence::_downcast (void*,
-                              CORBA::Object*
+TAO_Base_Sequence::_downcast (void *,
+                              CORBA::Object *
                               ACE_ENV_ARG_DECL_NOT_USED)
 {
   // default is no op.
   // @@ TODO Maybe throw an exception?
 }
 
-CORBA::Object*
-TAO_Base_Sequence::_upcast (void*) const
+CORBA::Object *
+TAO_Base_Sequence::_upcast (void *) const
 {
   return 0;
 }
@@ -68,7 +68,7 @@ TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
 }
 
 TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
-    const TAO_Unbounded_String_Sequence &rhs
+    const TAO_Unbounded_String_Sequence & rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
@@ -98,9 +98,10 @@ TAO_Unbounded_String_Sequence::~TAO_Unbounded_String_Sequence (void)
   this->_deallocate_buffer ();
 }
 
-TAO_Unbounded_String_Sequence&
-TAO_Unbounded_String_Sequence::
-operator= (const TAO_Unbounded_String_Sequence &rhs)
+TAO_Unbounded_String_Sequence &
+TAO_Unbounded_String_Sequence::operator= (
+    const TAO_Unbounded_String_Sequence & rhs
+  )
 {
   if (this == &rhs)
     {
@@ -109,8 +110,8 @@ operator= (const TAO_Unbounded_String_Sequence &rhs)
 
   if (this->release_)
     {
-      char **tmp = ACE_reinterpret_cast (char **, 
-                                         this->buffer_);
+      char ** tmp = ACE_reinterpret_cast (char **, 
+                                          this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -120,7 +121,7 @@ operator= (const TAO_Unbounded_String_Sequence &rhs)
 
       if (this->maximum_ < rhs.maximum_)
         {
-          // free the older buffer
+          // Free the older buffer.
           TAO_Unbounded_String_Sequence::freebuf (tmp);
           this->buffer_ =
             TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
@@ -141,7 +142,7 @@ operator= (const TAO_Unbounded_String_Sequence &rhs)
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  char **tmp1 = ACE_reinterpret_cast (char **, this->buffer_);
+  char ** tmp1 = ACE_reinterpret_cast (char **, this->buffer_);
   char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
                                              rhs.buffer_);
 
@@ -157,19 +158,19 @@ TAO_SeqElem_String_Manager
 TAO_Unbounded_String_Sequence::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  char **const tmp =
-    ACE_reinterpret_cast (char **ACE_CAST_CONST,
+  char ** const tmp =
+    ACE_reinterpret_cast (char ** ACE_CAST_CONST,
                           this->buffer_);
   return TAO_SeqElem_String_Manager (tmp + slot,
                                      this->release_);
 }
 
-char* *
+char **
 TAO_Unbounded_String_Sequence::allocbuf (CORBA::ULong nelems)
 {
-  char **buf;
+  char ** buf = 0;
   ACE_NEW_RETURN (buf,
-                  char *[nelems],
+                  char * [nelems],
                   0);
 
   for (CORBA::ULong i = 0; i < nelems; ++i)
@@ -181,7 +182,7 @@ TAO_Unbounded_String_Sequence::allocbuf (CORBA::ULong nelems)
 }
 
 void
-TAO_Unbounded_String_Sequence::freebuf (char* *buffer)
+TAO_Unbounded_String_Sequence::freebuf (char ** buffer)
 {
   if (buffer == 0)
     {
@@ -203,10 +204,21 @@ TAO_Unbounded_String_Sequence::freebuf (char* *buffer)
   delete [] buffer;
 }
 
-char**
+void
+TAO_Unbounded_String_Sequence::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  TAO_Unbounded_String_Sequence * tmp = 
+    ACE_static_cast (TAO_Unbounded_String_Sequence *,
+                     _tao_void_pointer);
+  delete tmp;
+}
+
+char **
 TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
 {
-  char* *result = 0;
+  char ** result = 0;
 
   if (orphan == 0)
     {
@@ -215,11 +227,11 @@ TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
         {
           result = allocbuf (this->length_);
           this->buffer_ = result;
-                this->release_ = 1;
+          this->release_ = 1;
         }
       else
         {
-          result = ACE_reinterpret_cast (char**, this->buffer_);
+          result = ACE_reinterpret_cast (char **, this->buffer_);
         }
     }
   else // if (orphan == 1)
@@ -228,7 +240,7 @@ TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
         {
           // We set the state back to default and relinquish
           // ownership.
-          result = ACE_reinterpret_cast (char**, this->buffer_);
+          result = ACE_reinterpret_cast (char **, this->buffer_);
           this->maximum_ = 0;
           this->length_ = 0;
           this->buffer_ = 0;
@@ -239,21 +251,21 @@ TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
   return result;
 }
 
-const char**
+const char **
 TAO_Unbounded_String_Sequence::get_buffer (void) const
 {
-  return ACE_reinterpret_cast (const char** ACE_CAST_CONST, 
+  return ACE_reinterpret_cast (const char ** ACE_CAST_CONST, 
                                this->buffer_);
 }
 
 void
 TAO_Unbounded_String_Sequence::_allocate_buffer (CORBA::ULong length)
 {
-  char* *tmp = TAO_Unbounded_String_Sequence::allocbuf (length);
+  char ** tmp = TAO_Unbounded_String_Sequence::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
-      char* *old = ACE_reinterpret_cast (char **, this->buffer_);
+      char ** old = ACE_reinterpret_cast (char **, this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -289,7 +301,7 @@ TAO_Unbounded_String_Sequence::_deallocate_buffer (void)
       return;
     }
 
-  char **tmp = ACE_reinterpret_cast (char **, this->buffer_);
+  char ** tmp = ACE_reinterpret_cast (char **, this->buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -305,8 +317,8 @@ void
 TAO_Unbounded_String_Sequence::_shrink_buffer (CORBA::ULong nl,
                                                CORBA::ULong ol)
 {
-  char **tmp = ACE_reinterpret_cast (char **, 
-                                     this->buffer_);
+  char ** tmp = ACE_reinterpret_cast (char **, 
+                                      this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
@@ -318,13 +330,13 @@ TAO_Unbounded_String_Sequence::_shrink_buffer (CORBA::ULong nl,
 void
 TAO_Unbounded_String_Sequence::replace (CORBA::ULong maximum,
                                         CORBA::ULong length,
-                                        char* *data,
+                                        char ** data,
                                         CORBA::Boolean release)
 {
   if (this->release_ == 1)
     {
-      char **tmp = ACE_reinterpret_cast (char **, 
-                                         this->buffer_);
+      char ** tmp = ACE_reinterpret_cast (char **, 
+                                          this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -355,13 +367,13 @@ TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
 }
 
 TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
-    const TAO_Unbounded_WString_Sequence &rhs
+    const TAO_Unbounded_WString_Sequence & rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      CORBA::WChar* *tmp1 =
+      CORBA::WChar ** tmp1 =
         TAO_Unbounded_WString_Sequence::allocbuf (this->maximum_);
 
       CORBA::WChar ** const tmp2 =
@@ -386,9 +398,10 @@ TAO_Unbounded_WString_Sequence::~TAO_Unbounded_WString_Sequence (void)
   this->_deallocate_buffer ();
 }
 
-TAO_Unbounded_WString_Sequence&
-TAO_Unbounded_WString_Sequence::
-operator= (const TAO_Unbounded_WString_Sequence &rhs)
+TAO_Unbounded_WString_Sequence &
+TAO_Unbounded_WString_Sequence::operator= (
+    const TAO_Unbounded_WString_Sequence & rhs
+  )
 {
   if (this == &rhs)
     {
@@ -397,8 +410,8 @@ operator= (const TAO_Unbounded_WString_Sequence &rhs)
 
   if (this->release_)
     {
-      CORBA::WChar **tmp = ACE_reinterpret_cast (CORBA::WChar **,
-                                                 this->buffer_);
+      CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **,
+                                                  this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -429,8 +442,8 @@ operator= (const TAO_Unbounded_WString_Sequence &rhs)
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  CORBA::WChar **tmp1 = ACE_reinterpret_cast (CORBA::WChar **,
-                                              this->buffer_);
+  CORBA::WChar ** tmp1 = ACE_reinterpret_cast (CORBA::WChar **,
+                                               this->buffer_);
   CORBA::WChar ** const tmp2 = 
     ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST,
                           rhs.buffer_);
@@ -447,19 +460,19 @@ TAO_SeqElem_WString_Manager
 TAO_Unbounded_WString_Sequence::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  CORBA::WChar **const tmp =
+  CORBA::WChar ** const tmp =
     ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST,
                           this->buffer_);
   return TAO_SeqElem_WString_Manager (tmp + slot,
                                       this->release_);
 }
 
-CORBA::WChar* *
+CORBA::WChar **
 TAO_Unbounded_WString_Sequence::allocbuf (CORBA::ULong nelems)
 {
-  CORBA::WChar **buf;
+  CORBA::WChar ** buf = 0;
   ACE_NEW_RETURN (buf,
-                  CORBA::WChar *[nelems],
+                  CORBA::WChar * [nelems],
                   0);
 
   for (CORBA::ULong i=0; i < nelems; ++i)
@@ -471,7 +484,7 @@ TAO_Unbounded_WString_Sequence::allocbuf (CORBA::ULong nelems)
 }
 
 void
-TAO_Unbounded_WString_Sequence::freebuf (CORBA::WChar* *buffer)
+TAO_Unbounded_WString_Sequence::freebuf (CORBA::WChar ** buffer)
 {
   if (buffer == 0)
     {
@@ -493,10 +506,21 @@ TAO_Unbounded_WString_Sequence::freebuf (CORBA::WChar* *buffer)
   delete [] buffer;
 }
 
-CORBA::WChar**
+void
+TAO_Unbounded_WString_Sequence::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  TAO_Unbounded_WString_Sequence * tmp = 
+    ACE_static_cast (TAO_Unbounded_WString_Sequence *,
+                     _tao_void_pointer);
+  delete tmp;
+}
+
+CORBA::WChar **
 TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan)
 {
-  CORBA::WChar* *result = 0;
+  CORBA::WChar ** result = 0;
 
   if (orphan == 0)
     {
@@ -505,11 +529,11 @@ TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan)
         {
           result = allocbuf (this->length_);
           this->buffer_ = result;
-                this->release_ = 1;
+          this->release_ = 1;
         }
       else
         {
-          result = ACE_reinterpret_cast (CORBA::WChar**,
+          result = ACE_reinterpret_cast (CORBA::WChar **,
                                          this->buffer_);
         }
     }
@@ -519,7 +543,7 @@ TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan)
         {
           // We set the state back to default and relinquish
           // ownership.
-          result = ACE_reinterpret_cast (CORBA::WChar**,
+          result = ACE_reinterpret_cast (CORBA::WChar **,
                                          this->buffer_);
           this->maximum_ = 0;
           this->length_ = 0;
@@ -531,22 +555,22 @@ TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan)
   return result;
 }
 
-const CORBA::WChar**
+const CORBA::WChar **
 TAO_Unbounded_WString_Sequence::get_buffer (void) const
 {
-  return ACE_reinterpret_cast (const CORBA::WChar** ACE_CAST_CONST,
+  return ACE_reinterpret_cast (const CORBA::WChar ** ACE_CAST_CONST,
                                this->buffer_);
 }
 
 void
 TAO_Unbounded_WString_Sequence::_allocate_buffer (CORBA::ULong length)
 {
-  CORBA::WChar* *tmp = TAO_Unbounded_WString_Sequence::allocbuf (length);
+  CORBA::WChar ** tmp = TAO_Unbounded_WString_Sequence::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
-      CORBA::WChar* *old = ACE_reinterpret_cast (CORBA::WChar **,
-                                                 this->buffer_);
+      CORBA::WChar ** old = ACE_reinterpret_cast (CORBA::WChar **,
+                                                  this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -599,8 +623,8 @@ void
 TAO_Unbounded_WString_Sequence::_shrink_buffer (CORBA::ULong nl,
                                                 CORBA::ULong ol)
 {
-  CORBA::WChar **tmp = ACE_reinterpret_cast (CORBA::WChar **,
-                                             this->buffer_);
+  CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **,
+                                              this->buffer_);
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::wstring_free (tmp[i]);
@@ -646,7 +670,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
 {
   if (rhs.buffer_ != 0)
     {
-      CORBA::Octet *tmp1 =
+      CORBA::Octet * tmp1 =
        TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->maximum_);
 
 
@@ -688,7 +712,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
 
 TAO_Unbounded_Sequence<CORBA::Octet> &
 TAO_Unbounded_Sequence<CORBA::Octet>::operator= (
-    const TAO_Unbounded_Sequence<CORBA::Octet> &rhs
+    const TAO_Unbounded_Sequence<CORBA::Octet> & rhs
   )
 {
   if (this == &rhs)
@@ -711,8 +735,8 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator= (
       if (this->maximum_ < rhs.length_)
         {
           // free the old buffer
-          CORBA::Octet *tmp = ACE_reinterpret_cast (CORBA::Octet *,
-                                                    this->buffer_);
+          CORBA::Octet * tmp = ACE_reinterpret_cast (CORBA::Octet *,
+                                                     this->buffer_);
           TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
           this->buffer_ =
             TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
@@ -733,7 +757,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator= (
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  CORBA::Octet *tmp1 = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_);
+  CORBA::Octet * tmp1 = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_);
   CORBA::Octet * const tmp2 = 
     ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, 
                           rhs.buffer_);
@@ -769,7 +793,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator= (
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
 TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
     CORBA::ULong length,
-    const ACE_Message_Block *mb
+    const ACE_Message_Block * mb
   )
   :  TAO_Unbounded_Base_Sequence (length,
                                   length,
@@ -819,10 +843,10 @@ TAO_Unbounded_Sequence<CORBA::Octet>::~TAO_Unbounded_Sequence (void)
 }
 
 void
-TAO_Unbounded_Sequence<CORBA::Octet>::_tao_any_destructor (void *x)
+TAO_Unbounded_Sequence<CORBA::Octet>::_tao_any_destructor (void * x)
 {
-  TAO_Unbounded_Sequence<CORBA::Octet> *tmp = 
-    ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*,
+  TAO_Unbounded_Sequence<CORBA::Octet> * tmp = 
+    ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet> *,
                      x);
   delete tmp;
 }
@@ -834,8 +858,8 @@ TAO_Unbounded_Sequence<CORBA::Octet>::_allocate_buffer (CORBA::ULong length)
 
   if (this->buffer_ != 0)
     {
-      CORBA::Octet *old = ACE_reinterpret_cast (CORBA::Octet *, 
-                                                this->buffer_);
+      CORBA::Octet * old = ACE_reinterpret_cast (CORBA::Octet *, 
+                                                 this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -867,7 +891,7 @@ void TAO_Unbounded_Sequence<CORBA::Octet>::_deallocate_buffer (void)
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
       && this->release_ != 0)
     {
-      CORBA::Octet *tmp = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_);
+      CORBA::Octet * tmp = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_);
       TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
     }
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -884,8 +908,8 @@ void TAO_Unbounded_Sequence<CORBA::Octet>::_deallocate_buffer (void)
 // ****************************************************************
 
 int
-operator== (const TAO_Unbounded_Sequence<CORBA::Octet> &lhs,
-            const TAO_Unbounded_Sequence<CORBA::Octet> &rhs)
+operator== (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs,
+            const TAO_Unbounded_Sequence<CORBA::Octet> & rhs)
 {
   if (rhs.length () != lhs.length ())
     {
@@ -904,8 +928,8 @@ operator== (const TAO_Unbounded_Sequence<CORBA::Octet> &lhs,
 }
 
 int
-operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &lhs,
-            const TAO_Unbounded_Sequence<CORBA::Octet> &rhs)
+operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs,
+            const TAO_Unbounded_Sequence<CORBA::Octet> & rhs)
 {
   return !(lhs == rhs);
 }
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index fc30aa91375..b08f330293b 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -286,7 +286,7 @@ public:
    */
   TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
                                  CORBA::ULong length,
-                                 char* *data,
+                                 char ** data,
                                  CORBA::Boolean release = 0);
 
   /**
@@ -325,7 +325,7 @@ public:
    * reallocation is performed. After reallocation, the release flag
    * is always set to TRUE.
    */
-  TAO_Unbounded_String_Sequence &operator= (
+  TAO_Unbounded_String_Sequence & operator= (
       const TAO_Unbounded_String_Sequence &
     );
 
@@ -343,7 +343,7 @@ public:
    * reason cannot allocate the requested vector. Vectors allocated by
    * allocbuf should be freed using the freebuf function.
    */
-  static char* *allocbuf (CORBA::ULong);
+  static char ** allocbuf (CORBA::ULong);
 
   /**
    * The freebuf function ensures that the destructor for each element
@@ -354,9 +354,11 @@ public:
    */
   static void freebuf (char **);
 
+  static void _tao_any_destructor (void *);
+
   // = Fast buffer accessors.
-  char **get_buffer (CORBA::Boolean orphan = 0);
-  const char **get_buffer (void) const;
+  char ** get_buffer (CORBA::Boolean orphan = 0);
+  const char ** get_buffer (void) const;
 
   // Functions to create, destroy, and adjust the underlying buffer.
   virtual void _allocate_buffer (CORBA::ULong length);
@@ -367,7 +369,7 @@ public:
   // Parameters work the same as in constructor of the same signature.
   void replace (CORBA::ULong maximum,
                 CORBA::ULong length,
-                char* *data,
+                char ** data,
                 CORBA::Boolean release = 0);
 };
 
@@ -432,7 +434,7 @@ public:
    */
   TAO_Unbounded_WString_Sequence (CORBA::ULong maximum,
                                   CORBA::ULong length,
-                                  CORBA::WChar* *data,
+                                  CORBA::WChar ** data,
                                   CORBA::Boolean release = 0);
 
   /**
@@ -446,7 +448,7 @@ public:
    * elements (items zero through length-1), and sets the release
    * flag to TRUE.
    */
-  TAO_Unbounded_WString_Sequence (const TAO_Unbounded_WString_Sequence&);
+  TAO_Unbounded_WString_Sequence (const TAO_Unbounded_WString_Sequence &);
 
   /// The destructor releases all object reference members and frees
   /// all string members.
@@ -471,7 +473,7 @@ public:
    * reallocation is performed. After reallocation, the release flag
    * is always set to TRUE.
    */
-  TAO_Unbounded_WString_Sequence &operator= (
+  TAO_Unbounded_WString_Sequence & operator= (
       const TAO_Unbounded_WString_Sequence &
     );
 
@@ -489,7 +491,7 @@ public:
    * reason cannot allocate the requested vector. Vectors allocated by
    * allocbuf should be freed using the freebuf function.
    */
-  static CORBA::WChar* *allocbuf (CORBA::ULong);
+  static CORBA::WChar ** allocbuf (CORBA::ULong);
 
   /**
    * The freebuf function ensures that the destructor for each element
@@ -500,9 +502,11 @@ public:
    */
   static void freebuf (CORBA::WChar **);
 
+  static void _tao_any_destructor (void *);
+
   // = Fast buffer accessors.
-  CORBA::WChar **get_buffer (CORBA::Boolean orphan = 0);
-  const CORBA::WChar **get_buffer (void) const;
+  CORBA::WChar ** get_buffer (CORBA::Boolean orphan = 0);
+  const CORBA::WChar ** get_buffer (void) const;
 
   // Functions to create, destroy, and adjust the underlying buffer.
   virtual void _allocate_buffer (CORBA::ULong length);
@@ -513,7 +517,7 @@ public:
   // Parameters work the same as in constructor of the same signature.
   void replace (CORBA::ULong maximum,
                 CORBA::ULong length,
-                CORBA::WChar* *data,
+                CORBA::WChar ** data,
                 CORBA::Boolean release = 0);
 };
 
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
index 9ab782198aa..5bb59f9bb63 100644
--- a/TAO/tao/Sequence.i
+++ b/TAO/tao/Sequence.i
@@ -15,7 +15,7 @@ TAO_Base_Sequence::TAO_Base_Sequence (void)
 ACE_INLINE
 TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
                                       CORBA::ULong length,
-                                      void *buffer,
+                                      void * buffer,
                                       CORBA::Boolean release)
   : maximum_ (maximum),
     length_ (length),
@@ -26,7 +26,7 @@ TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
 
 ACE_INLINE
 TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
-                                      void *data)
+                                      void * data)
   : maximum_ (maximum),
     length_ (0),
     buffer_ (data),
@@ -35,7 +35,7 @@ TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
 }
 
 ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence &rhs)
+TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence & rhs)
   : maximum_ (rhs.maximum_),
     length_ (rhs.length_),
     buffer_ (0),
@@ -43,14 +43,16 @@ TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence &rhs)
 {
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_Base_Sequence::release (void) const
 {
   return this->release_;
 }
 
-ACE_INLINE TAO_Base_Sequence &
-TAO_Base_Sequence::operator= (const TAO_Base_Sequence &rhs)
+ACE_INLINE 
+TAO_Base_Sequence &
+TAO_Base_Sequence::operator= (const TAO_Base_Sequence & rhs)
 {
   this->maximum_ = rhs.maximum_;
   this->length_ = rhs.length_;
@@ -58,7 +60,8 @@ TAO_Base_Sequence::operator= (const TAO_Base_Sequence &rhs)
   return *this;
 }
 
-ACE_INLINE CORBA::ULong
+ACE_INLINE 
+CORBA::ULong
 TAO_Base_Sequence::maximum (void) const
 {
   return this->maximum_;
@@ -72,30 +75,34 @@ TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (void)
 }
 
 ACE_INLINE
-TAO_Unbounded_Base_Sequence::
-TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                             CORBA::ULong length,
-                             void* buffer,
-                             CORBA::Boolean release)
+TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    void * buffer,
+    CORBA::Boolean release
+  )
   :  TAO_Base_Sequence (maximum, length, buffer, release)
 {
 }
 
 ACE_INLINE
-TAO_Unbounded_Base_Sequence::
-TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
-                             void* buffer)
+TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (
+    CORBA::ULong maximum,
+    void * buffer
+  )
   :  TAO_Base_Sequence (maximum, buffer)
 {
 }
 
-ACE_INLINE CORBA::ULong
+ACE_INLINE 
+CORBA::ULong
 TAO_Unbounded_Base_Sequence::length (void) const
 {
   return this->length_;
 }
 
-ACE_INLINE void
+ACE_INLINE 
+void
 TAO_Unbounded_Base_Sequence::length (CORBA::ULong length)
 {
   if (length > this->maximum_)
@@ -108,6 +115,7 @@ TAO_Unbounded_Base_Sequence::length (CORBA::ULong length)
     {
       this->_shrink_buffer (length, this->length_);
     }
+
   this->length_ = length;
 }
 
@@ -119,30 +127,34 @@ TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (void)
 }
 
 ACE_INLINE
-TAO_Bounded_Base_Sequence::
-TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                           CORBA::ULong length,
-                           void* buffer,
-                           CORBA::Boolean release)
+TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    void * buffer,
+    CORBA::Boolean release
+  )
   :  TAO_Base_Sequence (maximum, length, buffer, release)
 {
 }
 
 ACE_INLINE
-TAO_Bounded_Base_Sequence::
-TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
-                           void* buffer)
+TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (
+    CORBA::ULong maximum,
+    void * buffer
+  )
   :  TAO_Base_Sequence (maximum, buffer)
 {
 }
 
-ACE_INLINE CORBA::ULong
+ACE_INLINE 
+CORBA::ULong
 TAO_Bounded_Base_Sequence::length (void) const
 {
   return this->length_;
 }
 
-ACE_INLINE void
+ACE_INLINE 
+void
 TAO_Bounded_Base_Sequence::length (CORBA::ULong length)
 {
   if (this->buffer_ == 0)
@@ -165,18 +177,18 @@ TAO_Bounded_Base_Sequence::length (CORBA::ULong length)
 
 // ****************************************************************
 
-//default constructors
 ACE_INLINE
 TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (void)
 {
 }
 
 ACE_INLINE
-TAO_Unbounded_String_Sequence::
-TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               char* *value,
-                               CORBA::Boolean release)
+TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    char ** value,
+    CORBA::Boolean release
+  )
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
@@ -187,25 +199,28 @@ TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (void)
 }
 
 ACE_INLINE
-TAO_Unbounded_WString_Sequence::
-TAO_Unbounded_WString_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               CORBA::WChar* *value,
-                               CORBA::Boolean release)
+TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::WChar ** value,
+    CORBA::Boolean release
+  )
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
 // ****************************************************************
 
-ACE_INLINE CORBA::Octet *
+ACE_INLINE 
+CORBA::Octet *
 TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (CORBA::ULong size)
 {
   return new CORBA::Octet[size];
 }
 
-ACE_INLINE void
-TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (CORBA::Octet *buffer)
+ACE_INLINE 
+void
+TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (CORBA::Octet * buffer)
 {
   delete [] buffer;
 }
@@ -219,9 +234,13 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (void)
 }
 
 ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (maximum))
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
+    CORBA::ULong maximum
+  )
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (maximum)
+      )
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
   ,  mb_ (0)
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
@@ -229,10 +248,12 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maxim
 }
 
 ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
-                                                   CORBA::ULong length,
-                                                   CORBA::Octet *data,
-                                                   CORBA::Boolean release)
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Octet * data,
+    CORBA::Boolean release
+  )
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
   , mb_ (0)
@@ -240,18 +261,22 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maxim
 {
 }
 
-ACE_INLINE const CORBA::Octet *
+ACE_INLINE 
+const CORBA::Octet *
 TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const CORBA::Octet * ACE_CAST_CONST, this->buffer_);
+  return ACE_reinterpret_cast (const CORBA::Octet * ACE_CAST_CONST, 
+                               this->buffer_);
 }
 
 // This function is a little too big to be inlined, but some compilers
 // (Sun/CC 4.1?) die if it isn't :-(
-ACE_INLINE CORBA::Octet *
+ACE_INLINE 
+CORBA::Octet *
 TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
 {
-  CORBA::Octet *result = 0;
+  CORBA::Octet * result = 0;
+
   if (orphan == 0)
     {
       // We retain ownership.
@@ -259,7 +284,8 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
       if (this->buffer_ == 0)
         {
           // The buffer was not allocated, we must allocate it now.
-          result = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
+          result = 
+            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
           this->buffer_ = result;
 	  this->release_ = 1;
         }
@@ -287,7 +313,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
     {
       // We set the state back to default and relinquish
       // ownership.
-      result = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
+      result = ACE_reinterpret_cast(CORBA::Octet *, this->buffer_);
       this->maximum_ = 0;
       this->length_ = 0;
       this->buffer_ = 0;
@@ -297,6 +323,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
   else
     {
       result = ACE_reinterpret_cast (CORBA::Octet*,this->buffer_);
+
       if (this->release_ != 0)
         {
           // We set the state back to default and relinquish
@@ -315,24 +342,28 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
   return result;
 }
 
-ACE_INLINE CORBA::Octet &
+ACE_INLINE 
+CORBA::Octet &
 TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::Octet* tmp = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
+  CORBA::Octet * tmp = ACE_reinterpret_cast(CORBA::Octet *, this->buffer_);
   return tmp[i];
 }
 
-ACE_INLINE const CORBA::Octet &
+ACE_INLINE 
+const CORBA::Octet &
 TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
-  CORBA::Octet * const tmp = ACE_reinterpret_cast (CORBA::Octet* ACE_CAST_CONST, this->buffer_);
+  CORBA::Octet * const tmp = 
+    ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, this->buffer_);
   return tmp[i];
 }
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-ACE_INLINE ACE_Message_Block*
+ACE_INLINE 
+ACE_Message_Block *
 TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
 {
   return this->mb_;
@@ -340,7 +371,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
 
 ACE_INLINE void
 TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
-                                               const ACE_Message_Block* mb)
+                                               const ACE_Message_Block * mb)
 {
   this->_deallocate_buffer ();
 
@@ -365,7 +396,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
                               ACE_CDR::MAX_ALIGNMENT);
 
       // Get the base pointer of the incoming message block
-      char *start = ACE_ptr_align_binary (mb->base (),
+      char * start = ACE_ptr_align_binary (mb->base (),
                                           ACE_CDR::MAX_ALIGNMENT);
 
       // Get the read and write displacements in the incoming stream
@@ -386,10 +417,11 @@ TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
 
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-ACE_INLINE void
+ACE_INLINE 
+void
 TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max,
                                                CORBA::ULong length,
-                                               CORBA::Octet *data,
+                                               CORBA::Octet * data,
                                                CORBA::Boolean release)
 {
   this->maximum_ = max;
@@ -405,9 +437,11 @@ TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max,
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
     if (this->buffer_ && this->release_ == 1)
     {
-      CORBA::Octet* tmp = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
+      CORBA::Octet * tmp = 
+        ACE_reinterpret_cast(CORBA::Octet *, this->buffer_);
       TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
     }
+
   this->buffer_ = data;
   this->release_ = release;
 }
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index b84b578ad72..a78e7aa8e10 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -15,15 +15,15 @@ ACE_RCSID (tao,
            Sequence_T, 
            "$Id$")
 
-template <class T>
+template <typename T>
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (
-    const TAO_Unbounded_Sequence<T> &rhs
+    const TAO_Unbounded_Sequence<T> & rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T *tmp1 = TAO_Unbounded_Sequence<T>::allocbuf (this->maximum_);
+      T * tmp1 = TAO_Unbounded_Sequence<T>::allocbuf (this->maximum_);
       T * const tmp2 =
         ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
 
@@ -40,8 +40,9 @@ TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (
     }
 }
 
-template <class T> TAO_Unbounded_Sequence<T> &
-TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> &rhs)
+template <typename T> 
+TAO_Unbounded_Sequence<T> &
+TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> & rhs)
 {
   if (this == &rhs)
     {
@@ -53,8 +54,8 @@ TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> &rhs)
       if (this->maximum_ < rhs.maximum_)
         {
           // Free the old buffer.
-          T *tmp = ACE_reinterpret_cast (T *,
-                                         this->buffer_);
+          T * tmp = ACE_reinterpret_cast (T *,
+                                          this->buffer_);
           TAO_Unbounded_Sequence<T>::freebuf (tmp);
           this->buffer_ =
             TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
@@ -75,8 +76,8 @@ TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> &rhs)
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  T *tmp1 = ACE_reinterpret_cast (T *, 
-                                  this->buffer_);
+  T * tmp1 = ACE_reinterpret_cast (T *, 
+                                   this->buffer_);
   T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, 
                                          rhs.buffer_);
 
@@ -88,21 +89,22 @@ TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> &rhs)
   return *this;
 }
 
-template<class T>
+template<typename T>
 TAO_Unbounded_Sequence<T>::~TAO_Unbounded_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template<class T> void
+template<typename T> 
+void
 TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
 {
-  T* tmp = TAO_Unbounded_Sequence<T>::allocbuf (length);
+  T * tmp = TAO_Unbounded_Sequence<T>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
-      T *old = ACE_reinterpret_cast (T *,
-                                     this->buffer_);
+      T * old = ACE_reinterpret_cast (T *,
+                                      this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -118,7 +120,8 @@ TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T> void
+template<typename T> 
+void
 TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
 {
   if (this->release_ == 0)
@@ -126,48 +129,112 @@ TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
       return;
     }
 
-  T *tmp = ACE_reinterpret_cast (T *,
-                                 this->buffer_);
+  T * tmp = ACE_reinterpret_cast (T *,
+                                  this->buffer_);
 
   TAO_Unbounded_Sequence<T>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
+template <typename T>  
+T *
+TAO_Unbounded_Sequence<T>::get_buffer (CORBA::Boolean orphan)
+{
+  T * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          if (this->length_ > 0)
+            {
+              result = TAO_Unbounded_Sequence<T>::allocbuf (this->length_);
+              this->buffer_ = result;
+	            this->release_ = 1;
+            }
+        }
+      else
+        {
+          result = ACE_reinterpret_cast (T *, 
+	                                       this->buffer_);
+        }
+    }
+  else
+    {
+      result = ACE_reinterpret_cast (T *,
+	                                   this->buffer_);
+
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
 // The following function is not inline, to avoid build (template
 // instantiation) problems with Sun C++ 4.2 patch 104631-07/SunOS 5.6.
-template <class T> T &
+template <typename T> 
+T &
 TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
-  T* tmp = ACE_reinterpret_cast (T *,
-                                 this->buffer_);
+  T * tmp = ACE_reinterpret_cast (T *,
+                                  this->buffer_);
   return tmp[i];
 }
 
 // The following function is not inline, to avoid build (template
 // instantiation) problems with Sun C++ 4.2 patch 104631-07/SunOS 5.6.
-template <class T> const T &
+template <typename T> 
+const T &
 TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
-  T * const tmp = ACE_reinterpret_cast (T* ACE_CAST_CONST, 
+  T * const tmp = ACE_reinterpret_cast (T * ACE_CAST_CONST, 
                                         this->buffer_);
   return tmp[i];
 }
 
+template <typename T> 
+void
+TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
+                                    CORBA::ULong length,
+                                    T * data,
+                                    CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+  if (this->buffer_ && this->release_ == 1)
+    {
+      T * tmp = ACE_reinterpret_cast (T *, this->buffer_);
+      TAO_Unbounded_Sequence<T>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 // ****************************************************************
 // Bounded_Sequence
 // ****************************************************************
 
-template <class T, size_t MAX>
+template <typename T, size_t MAX>
 TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (
-    const TAO_Bounded_Sequence<T, MAX> &rhs
+    const TAO_Bounded_Sequence<T,MAX> &rhs
   )
   : TAO_Bounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T *tmp1 = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
+      T * tmp1 = TAO_Bounded_Sequence<T,MAX>::allocbuf (MAX);
 
       T * const tmp2 =
         ACE_reinterpret_cast (T * ACE_CAST_CONST, 
@@ -186,9 +253,10 @@ TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (
     }
 }
 
-template <class T, size_t MAX> TAO_Bounded_Sequence<T, MAX> &
-TAO_Bounded_Sequence<T, MAX>::operator= (
-    const TAO_Bounded_Sequence<T, MAX> &rhs
+template <typename T, size_t MAX> 
+TAO_Bounded_Sequence<T,MAX> &
+TAO_Bounded_Sequence<T,MAX>::operator= (
+    const TAO_Bounded_Sequence<T,MAX> &rhs
   )
 {
   if (this == &rhs)
@@ -216,8 +284,8 @@ TAO_Bounded_Sequence<T, MAX>::operator= (
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  T* tmp1 = ACE_reinterpret_cast (T *, this->buffer_);
-  T* const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
+  T * tmp1 = ACE_reinterpret_cast (T *, this->buffer_);
+  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -227,13 +295,14 @@ TAO_Bounded_Sequence<T, MAX>::operator= (
   return *this;
 }
 
-template<class T, size_t MAX>
+template<typename T, size_t MAX>
 TAO_Bounded_Sequence<T, MAX>::~TAO_Bounded_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template<class T, size_t MAX> void
+template<typename T, size_t MAX> 
+void
 TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
 {
   // For this class memory is never reallocated so the implementation
@@ -241,7 +310,8 @@ TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
   this->buffer_ = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
 }
 
-template<class T, size_t MAX> void
+template<typename T, size_t MAX> 
+void
 TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
 {
   if (this->release_ == 0)
@@ -249,19 +319,80 @@ TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
       return;
     }
 
-  T *tmp = ACE_reinterpret_cast (T *,
-                                 this->buffer_);
+  T * tmp = ACE_reinterpret_cast (T *,
+                                  this->buffer_);
   TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
+template <typename T, size_t MAX> 
+T *
+TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
+{
+  T * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+
+      if (this->buffer_ == 0)
+        {
+          result = TAO_Bounded_Sequence<T,MAX>::allocbuf (this->maximum_);
+          this->buffer_ = result;
+	        this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (T*, this->buffer_);
+        }
+    }
+  else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish
+          // ownership.
+          result = ACE_reinterpret_cast(T*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+template <typename T, size_t MAX>  
+void
+TAO_Bounded_Sequence<T,MAX>::replace (CORBA::ULong max,
+                                      CORBA::ULong length,
+                                      T * data,
+                                      CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+  if (this->buffer_ && this->release_ == 1)
+    {
+      T * tmp = ACE_reinterpret_cast (T *, this->buffer_);
+      TAO_Bounded_Sequence<T,MAX>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 // *************************************************************
 // class TAO_Object_Manager
 // *************************************************************
 
-template <class T, class T_var> TAO_Object_Manager<T,T_var>&
-TAO_Object_Manager<T,T_var>::
-    operator= (const TAO_Object_Manager<T,T_var> &rhs)
+template <typename T, typename T_var, typename T_life> 
+TAO_Object_Manager<T,T_var,T_life> &
+TAO_Object_Manager<T,T_var,T_life>::operator= (
+    const TAO_Object_Manager<T,T_var,T_life> & rhs
+  )
 {
   if (this == &rhs)
     {
@@ -270,17 +401,20 @@ TAO_Object_Manager<T,T_var>::
 
   if (this->release_)
     {
-      T_var::tao_release (*this->ptr_);
-      *this->ptr_ = T_var::tao_duplicate (*rhs.ptr_);
+      T_life::tao_release (*this->ptr_);
+      *this->ptr_ = T_life::tao_duplicate (*rhs.ptr_);
     }
   else
-    *this->ptr_ = *rhs.ptr_;
+    {
+      *this->ptr_ = *rhs.ptr_;
+    }
 
   return *this;
 }
 
-template <class T, class T_var>TAO_Object_Manager<T,T_var> &
-TAO_Object_Manager<T,T_var>::operator=(T* p)
+template <typename T, typename T_var, typename T_life>
+TAO_Object_Manager<T,T_var,T_life> &
+TAO_Object_Manager<T,T_var,T_life>::operator= (T * p)
 {
   if (this->release_)
     {
@@ -288,17 +422,20 @@ TAO_Object_Manager<T,T_var>::operator=(T* p)
       // that of a var variable.  Therefore we will not duplicate the
       // user provided pointer before assigning it to the internal
       // variable.
-      T_var::tao_release (*this->ptr_);
+      T_life::tao_release (*this->ptr_);
       *this->ptr_ = p;
     }
   else
-    *this->ptr_ = p;
+    {
+      *this->ptr_ = p;
+    }
 
   return *this;
 }
 
-template <class T, class T_var>TAO_Object_Manager<T,T_var> &
-TAO_Object_Manager<T,T_var>::operator=(const T_var &p)
+template <typename T, typename T_var, typename T_life>
+TAO_Object_Manager<T,T_var,T_life> &
+TAO_Object_Manager<T,T_var,T_life>::operator= (const T_var & p)
 {
   if (this->release_)
     {
@@ -306,8 +443,8 @@ TAO_Object_Manager<T,T_var>::operator=(const T_var &p)
       // that of a var variable.  Therefore we duplicate p's
       // pointer before assigning it to the internal
       // variable.
-      T_var::tao_release (*this->ptr_);
-      *this->ptr_ = T_var::tao_duplicate (p.in ());
+      T_life::tao_release (*this->ptr_);
+      *this->ptr_ = T_life::tao_duplicate (p.in ());
     }
   else
     {
@@ -317,19 +454,21 @@ TAO_Object_Manager<T,T_var>::operator=(const T_var &p)
   return *this;
 }
 
-template <class T, class T_var> T *&
-TAO_Object_Manager<T,T_var>::out (void)
+template <typename T, typename T_var, typename T_life> 
+T *&
+TAO_Object_Manager<T,T_var,T_life>::out (void)
 {
-  T_var::tao_release (*this->ptr_);
-  *this->ptr_ = T_var::tao_nil ();
+  T_life::tao_release (*this->ptr_);
+  *this->ptr_ = T_life::tao_nil ();
   return *this->ptr_;
 }
 
-template <class T, class T_var> T *
-TAO_Object_Manager<T,T_var>::_retn (void)
+template <typename T, typename T_var, typename T_life> 
+T *
+TAO_Object_Manager<T,T_var,T_life>::_retn (void)
 {
   T *temp = *this->ptr_;
-  *this->ptr_ = T_var::tao_nil ();
+  *this->ptr_ = T_life::tao_nil ();
   return temp;
 }
 
@@ -337,9 +476,10 @@ TAO_Object_Manager<T,T_var>::_retn (void)
 // class TAO_Pseudo_Object_Manager
 // *************************************************************
 
-template <class T, class T_var> TAO_Pseudo_Object_Manager<T,T_var>&
+template <typename T, typename T_var>
+TAO_Pseudo_Object_Manager<T,T_var> &
 TAO_Pseudo_Object_Manager<T,T_var>::operator= (
-    const TAO_Pseudo_Object_Manager<T,T_var> &rhs
+    const TAO_Pseudo_Object_Manager<T,T_var> & rhs
   )
 {
   if (this == &rhs)
@@ -360,8 +500,9 @@ TAO_Pseudo_Object_Manager<T,T_var>::operator= (
   return *this;
 }
 
-template <class T, class T_var> TAO_Pseudo_Object_Manager<T,T_var> &
-TAO_Pseudo_Object_Manager<T,T_var>::operator=(T* p)
+template <typename T, typename T_var>
+TAO_Pseudo_Object_Manager<T,T_var> &
+TAO_Pseudo_Object_Manager<T,T_var>::operator= (T * p)
 {
   if (this->release_)
     {
@@ -380,8 +521,9 @@ TAO_Pseudo_Object_Manager<T,T_var>::operator=(T* p)
   return *this;
 }
 
-template <class T, class T_var> TAO_Pseudo_Object_Manager<T,T_var> &
-TAO_Pseudo_Object_Manager<T,T_var>::operator=(const T_var &p)
+template <typename T, typename T_var>
+TAO_Pseudo_Object_Manager<T,T_var> &
+TAO_Pseudo_Object_Manager<T,T_var>::operator= (const T_var & p)
 {
   if (this->release_)
     {
@@ -404,10 +546,10 @@ TAO_Pseudo_Object_Manager<T,T_var>::operator=(const T_var &p)
 // class TAO_Valuetype_Manager
 // *************************************************************
 
-template <class T, class T_var> 
-TAO_Valuetype_Manager<T,T_var> &
-TAO_Valuetype_Manager<T,T_var>::operator= (
-    const TAO_Valuetype_Manager<T,T_var> &rhs
+template <typename T, typename T_var, typename T_life> 
+TAO_Valuetype_Manager<T,T_var,T_life> &
+TAO_Valuetype_Manager<T,T_var,T_life>::operator= (
+    const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
   )
 {
   if (this == &rhs)
@@ -417,9 +559,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= (
 
   if (this->release_)
     {
-      T_var::tao_remove_ref (*this->ptr_);
+      T_life::tao_remove_ref (*this->ptr_);
       *this->ptr_ = *rhs.ptr_;
-      T_var::tao_add_ref (*this->ptr_);
+      T_life::tao_add_ref (*this->ptr_);
     }
   else
     {
@@ -429,9 +571,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= (
   return *this;
 }
 
-template <class T, class T_var>
-TAO_Valuetype_Manager<T,T_var> &
-TAO_Valuetype_Manager<T,T_var>::operator= (T *p)
+template <typename T, typename T_var, typename T_life> 
+TAO_Valuetype_Manager<T,T_var,T_life> &
+TAO_Valuetype_Manager<T,T_var,T_life>::operator= (T * p)
 {
   if (this->release_)
     {
@@ -439,7 +581,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (T *p)
       // that of a var variable.  Therefore we will not duplicate the
       // user provided pointer before assigning it to the internal
       // variable.
-      T_var::tao_remove_ref (*this->ptr_);
+      T_life::tao_remove_ref (*this->ptr_);
       *this->ptr_ = p;
     }
   else
@@ -450,9 +592,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= (T *p)
   return *this;
 }
 
-template <class T, class T_var>
-TAO_Valuetype_Manager<T,T_var> &
-TAO_Valuetype_Manager<T,T_var>::operator= (const T_var &p)
+template <typename T, typename T_var, typename T_life> 
+TAO_Valuetype_Manager<T,T_var,T_life> &
+TAO_Valuetype_Manager<T,T_var,T_life>::operator= (const T_var & p)
 {
   if (this->release_)
     {
@@ -465,9 +607,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= (const T_var &p)
           (*this->ptr_)->_remove_ref ();
         }
 
-      T_var::tao_remove_ref (*this->ptr_);
+      T_life::tao_remove_ref (*this->ptr_);
       *this->ptr_ = p.in ();
-      T_var::tao_add_ref (*this->ptr_);
+      T_life::tao_add_ref (*this->ptr_);
     }
   else
     {
@@ -481,10 +623,10 @@ TAO_Valuetype_Manager<T,T_var>::operator= (const T_var &p)
 // class TAO_Abstract_Manager
 // *************************************************************
 
-template <class T, class T_var> 
-TAO_Abstract_Manager<T,T_var> &
-TAO_Abstract_Manager<T,T_var>::operator= (
-    const TAO_Abstract_Manager<T,T_var> &rhs
+template<typename T, typename T_var, typename T_life>
+TAO_Abstract_Manager<T,T_var,T_life> &
+TAO_Abstract_Manager<T,T_var,T_life>::operator= (
+    const TAO_Abstract_Manager<T,T_var,T_life> & rhs
   )
 {
   if (this == &rhs)
@@ -494,29 +636,17 @@ TAO_Abstract_Manager<T,T_var>::operator= (
 
   if (this->release_)
     {
-      if (*this->ptr_ != 0)
-        {
-          (*this->ptr_)->_remove_ref ();
-        }
-
-      *this->ptr_ = *rhs.ptr_;
-
-      if (*this->ptr_ != 0)
-        {
-          (*this->ptr_)->_add_ref ();
-        }
-    }
-  else
-    {
-      *this->ptr_ = *rhs.ptr_;
+      T_life::tao_release (*this->ptr_);
+      T_life::tao_duplicate (*rhs->ptr_);
     }
 
+  *this->ptr_ = *rhs.ptr_;
   return *this;
 }
 
-template <class T, class T_var>
-TAO_Abstract_Manager<T,T_var> &
-TAO_Abstract_Manager<T,T_var>::operator= (T *p)
+template<typename T, typename T_var, typename T_life>
+TAO_Abstract_Manager<T,T_var,T_life> &
+TAO_Abstract_Manager<T,T_var,T_life>::operator= (T * p)
 {
   if (this->release_)
     {
@@ -524,24 +654,16 @@ TAO_Abstract_Manager<T,T_var>::operator= (T *p)
       // that of a var variable.  Therefore we will not duplicate the
       // user provided pointer before assigning it to the internal
       // variable.
-      if (*this->ptr_ != 0)
-        {
-          (*this->ptr_)->_remove_ref ();
-        }
-
-      *this->ptr_ = p;
-    }
-  else
-    {
-      *this->ptr_ = p;
+      T_life::tao_release (*this->ptr_);
     }
 
+  *this->ptr_ = p;
   return *this;
 }
 
-template <class T, class T_var>
-TAO_Abstract_Manager<T,T_var> &
-TAO_Abstract_Manager<T,T_var>::operator= (const T_var &p)
+template<typename T, typename T_var, typename T_life>
+TAO_Abstract_Manager<T,T_var,T_life> &
+TAO_Abstract_Manager<T,T_var,T_life>::operator= (const T_var & p)
 {
   if (this->release_)
     {
@@ -549,58 +671,66 @@ TAO_Abstract_Manager<T,T_var>::operator= (const T_var &p)
       // that of a var variable.  Therefore we duplicate p's
       // pointer before assigning it to the internal
       // variable.
-      if (*this->ptr_ != 0)
-        {
-          (*this->ptr_)->_remove_ref ();
-        }
-
-      *this->ptr_ = p.in ();
-
-      if (p != 0)
-        {
-          p->_add_ref ();
-        }
-    }
-  else
-    {
-      *this->ptr_ = p.in ();
+      T_life::tao_release (*this->ptr_);
+      T_life::tao_duplicate (p.in ());
     }
 
+  *this->ptr_ = p.in ();
   return *this;
 }
 
+template<typename T, typename T_var, typename T_life>
+TAO_Abstract_Manager<T,T_var,T_life>::operator const T_var () const
+{
+  T_life::tao_duplicate (*this->ptr_);
+  return *this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_life>
+T *&
+TAO_Abstract_Manager<T,T_var,T_life>::out (void)
+{
+  T_life::tao_release (*this->ptr_);
+  *this->ptr_ = 0;
+  return *this->ptr_;
+}
+
 // *************************************************************
 // Operations for class TAO_Unbounded_Object_Sequence
 // *************************************************************
 
 // constructor for unbounded seq
-template <class T, class T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
-    CORBA::ULong maximum
-  )
+template <typename T, typename T_var, typename T_life, typename T_cast>
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::
+TAO_Unbounded_Object_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (
-        maximum,
-         TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (maximum)
+         maximum,
+         TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::allocbuf (
+             maximum
+           )
        )
 {
 }
 
-template <class T, class T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
-    const TAO_Unbounded_Object_Sequence<T,T_var> &rhs
+template <typename T, typename T_var, typename T_life, typename T_cast>
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::
+TAO_Unbounded_Object_Sequence (
+    const TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast> &rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T **tmp1 =
-        TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (this->maximum_);
+      T ** tmp1 =
+        TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::allocbuf (
+            this->maximum_
+          );
       T ** const tmp2 =
         ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          tmp1[i] = T_var::tao_duplicate (tmp2[i]);
+          tmp1[i] = T_life::tao_duplicate (tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -611,16 +741,18 @@ TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
     }
 }
 
-template<class T, class T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::~TAO_Unbounded_Object_Sequence (void)
+template<typename T, typename T_var, typename T_life, typename T_cast>
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::
+~TAO_Unbounded_Object_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
 // Assignment operator.
-template <class T, class T_var>TAO_Unbounded_Object_Sequence<T,T_var>&
-TAO_Unbounded_Object_Sequence<T,T_var>::
-operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
+template <typename T, typename T_var, typename T_life, typename T_cast>
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>&
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::
+operator= (const TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast> &rhs)
 {
   if (this == &rhs)
     {
@@ -629,20 +761,22 @@ operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
 
   if (this->release_)
     {
-      T **tmp = ACE_reinterpret_cast (T **,
-                                      this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **,
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          T_var::tao_release (tmp[i]);
-          tmp[i] = T_var::tao_nil ();
+          T_life::tao_release (tmp[i]);
+          tmp[i] = T_life::tao_nil ();
         }
 
       if (this->maximum_ < rhs.maximum_)
         {
-          TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
+          TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::freebuf (tmp);
           this->buffer_ =
-            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (rhs.maximum_);
+            TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::allocbuf (
+                rhs.maximum_
+              );
         }
     }
   else
@@ -654,41 +788,47 @@ operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
       else
         {
           this->buffer_ =
-            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (rhs.maximum_);
+            TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::allocbuf (
+                rhs.maximum_
+              );
         }
     }
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  T **tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      tmp1[i] = T_var::tao_duplicate (tmp2[i]);
+      tmp1[i] = T_life::tao_duplicate (tmp2[i]);
     }
 
   return *this;
 }
 
-template <class T, class T_var> T **
-TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
+template <typename T, typename T_var, typename T_life, typename T_cast> 
+T **
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::allocbuf (
+    CORBA::ULong nelems
+  )
 {
-  T **buf = 0;
+  T ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  T*[nelems], 
+                  T * [nelems], 
                   0);
 
-  for (CORBA::ULong i = 0; i < nelems; i++)
+  for (CORBA::ULong i = 0; i < nelems; ++i)
     {
-      buf[i] = T_var::tao_nil ();
+      buf[i] = T_life::tao_nil ();
     }
 
   return buf;
 }
 
-template <class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T **buffer)
+template <typename T, typename T_var, typename T_life, typename T_cast> 
+void
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::freebuf (T ** buffer)
 {
   if (buffer == 0)
     {
@@ -710,15 +850,19 @@ TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T **buffer)
   delete [] buffer;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
+template<typename T, typename T_var, typename T_life, typename T_cast> 
+void
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::_allocate_buffer (
+    CORBA::ULong length
+  )
 {
-  T **tmp = TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (length);
+  T ** tmp = 
+    TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
-      T **old = ACE_reinterpret_cast (T**, 
-                                      this->buffer_);
+      T ** old = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         // Only call duplicate when we did not own the previous
@@ -728,7 +872,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
         // the old instances.
         if (!this->release_)
           {
-            tmp[i] = T_var::tao_duplicate (old[i]);
+            tmp[i] = T_life::tao_duplicate (old[i]);
           }
         else
           {
@@ -744,91 +888,114 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (void)
+template<typename T, typename T_var, typename T_life, typename T_cast> 
+void
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::_deallocate_buffer (
+    void
+  )
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     {
       return;
     }
 
-  T **tmp = ACE_reinterpret_cast (T**, 
-                                  this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      T_var::tao_release (tmp[i]);
-      tmp[i] = T_var::tao_nil ();
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
     }
 
-  TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
+  TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
-                                                        CORBA::ULong ol)
+template<typename T, typename T_var, typename T_life, typename T_cast> 
+void
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
 {
-  T **tmp = ACE_static_cast (T**, this->buffer_);
+  T ** tmp = ACE_static_cast (T **, 
+                              this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      T_var::tao_release (tmp[i]);
-      tmp[i] = T_var::tao_nil ();
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
     }
 }
 
-template <class T, class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
-                                                   CORBA::Object* src
-                                                   ACE_ENV_ARG_DECL)
+template <typename T, typename T_var, typename T_life, typename T_cast> 
+void
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::_downcast (
+    void * target,
+    CORBA::Object_ptr src
+    ACE_ENV_ARG_DECL
+  )
 {
-  T **tmp = ACE_static_cast (T**, 
-                             target);
+  T ** tmp = ACE_static_cast (T **, 
+                              target);
 
-  *tmp = T_var::tao_narrow (src 
-                            ACE_ENV_ARG_PARAMETER);
+  *tmp = T_cast::tao_narrow (src 
+                             ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 }
 
-template <class T, class T_var> CORBA::Object*
-TAO_Unbounded_Object_Sequence<T,T_var>::_upcast (void* src) const
+template <typename T, typename T_var, typename T_life, typename T_cast> 
+CORBA::Object_ptr
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::_upcast (
+    void * src
+  ) const
 {
-  return T_var::tao_upcast (src);
+  return T_cast::tao_upcast (src);
 }
 
 // *************************************************************
 // Operations for class TAO_Bounded_Object_Sequence
 // *************************************************************
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::TAO_Bounded_Object_Sequence (void)
+template <typename T, 
+          typename T_var, 
+          typename T_life, 
+          typename T_cast, 
+          size_t MAX>
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::
+TAO_Bounded_Object_Sequence (void)
   : TAO_Bounded_Base_Sequence (
         MAX,
-        TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (MAX)
+        TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::allocbuf (MAX)
       )
 {
 }
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::TAO_Bounded_Object_Sequence (
-    const TAO_Bounded_Object_Sequence<T, T_var,MAX> &rhs
+template <typename T, 
+          typename T_var, 
+          typename T_life, 
+          typename T_cast, 
+          size_t MAX>
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::
+TAO_Bounded_Object_Sequence (
+    const TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX> & rhs
   )
   : TAO_Bounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T **tmp1 =
-        TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (MAX);
+      T ** tmp1 =
+        TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::allocbuf (MAX);
 
       T ** const tmp2 =
         ACE_reinterpret_cast (T** ACE_CAST_CONST, 
                               rhs.buffer_);
 
-      for (CORBA::ULong i = 0; i < rhs.length_; i++)
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          tmp1[i] = T_var::tao_duplicate (tmp2[i]);
+          tmp1[i] = T_life::tao_duplicate (tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -839,9 +1006,14 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::TAO_Bounded_Object_Sequence (
     }
 }
 
-template <class T, class T_var, size_t MAX> TAO_Bounded_Object_Sequence<T, T_var,MAX>&
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator= (
-    const TAO_Bounded_Object_Sequence<T,T_var, MAX> &rhs
+template <typename T, 
+          typename T_var, 
+          typename T_life, 
+          typename T_cast, 
+          size_t MAX>
+TAO_Bounded_Object_Sequence<T, T_var,T_life,T_cast,MAX> &
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::operator= (
+    const TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX> & rhs
   )
 {
   if (this == &rhs)
@@ -851,13 +1023,13 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator= (
 
   if (this->release_)
     {
-      T **tmp = ACE_reinterpret_cast (T **, 
-                                      this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          T_var::tao_release (tmp[i]);
-          tmp[i] = T_var::tao_nil ();
+          T_life::tao_release (tmp[i]);
+          tmp[i] = T_life::tao_nil ();
         }
       // No need to reallocate the buffer since it is always of size
       // MAX
@@ -871,123 +1043,172 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator= (
       else
         {
           this->buffer_ =
-            TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (rhs.maximum_);
+            TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::allocbuf (
+                rhs.maximum_
+              );
         }
     }
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  T **tmp1 = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                                           rhs.buffer_);
 
   for (CORBA::ULong i=0; i < rhs.length_; ++i)
     {
-      tmp1[i] = T_var::tao_duplicate (tmp2[i]);
+      tmp1[i] = T_life::tao_duplicate (tmp2[i]);
     }
 
   return *this;
 }
 
-template <class T, class T_var, size_t MAX> T **
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
+template <typename T, 
+          typename T_var, 
+          typename T_life, 
+          typename T_cast, 
+          size_t MAX>
+T **
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::allocbuf (
+    CORBA::ULong
+  )
 {
-  T **buf = 0;
+  T ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  T*[MAX], 
+                  T * [MAX], 
                   0);
 
-  for (CORBA::ULong i = 0; i < MAX; i++)
+  for (CORBA::ULong i = 0; i < MAX; ++i)
     {
-      buf[i] = T_var::tao_nil ();
+      buf[i] = T_life::tao_nil ();
     }
 
   return buf;
 }
 
-template <class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::freebuf (T **buffer)
+template <typename T, 
+          typename T_var, 
+          typename T_life, 
+          typename T_cast, 
+          size_t MAX>
+void
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::freebuf (T ** buffer)
 {
   // How much do we deallocate? Easy! allocbuf() always creates MAX
   // elements and initialize them to T::_nil().  So we can be
   // complaint and call CORBA::release() on each one.
   for (CORBA::ULong i = 0; i < MAX; ++i)
     {
-      if (buffer[i] != T_var::tao_nil ())
+      if (buffer[i] != T_life::tao_nil ())
         {
-          T_var::tao_release (buffer[i]);
-          buffer[i] = T_var::tao_nil ();
+          T_life::tao_release (buffer[i]);
+          buffer[i] = T_life::tao_nil ();
         }
     }
 
   delete [] buffer;
 }
 
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length)
+template<typename T, 
+         typename T_var, 
+         typename T_life, 
+         typename T_cast, 
+         size_t MAX> 
+void
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
 {
   // For this class memory is never reallocated so the implementation
   // is *really* simple.
   this->buffer_ =
-    TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (length);
+    TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::allocbuf (length);
 }
 
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
+template<typename T, 
+          typename T_var, 
+          typename T_life, 
+          typename T_cast, 
+          size_t MAX>
+void
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::_deallocate_buffer (
+    void
+  )
 {
   if (this->release_ == 0)
     {
       return;
     }
 
-  T **tmp = ACE_reinterpret_cast (T **, 
-                                  this->buffer_);
-  TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (tmp);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+  TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                           CORBA::ULong ol)
+template<typename T, 
+         typename T_var, 
+         typename T_life, 
+         typename T_cast, 
+         size_t MAX>
+void
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
 {
-  T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      T_var::tao_release (tmp[i]);
-      tmp[i] = T_var::tao_nil ();
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
     }
 }
 
-template <class T, class T_var, size_t MAX> void
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
-                                                      CORBA::Object* src
-                                                      ACE_ENV_ARG_DECL)
+template <typename T, 
+          typename T_var, 
+          typename T_life, 
+          typename T_cast, 
+          size_t MAX>
+void
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::_downcast (
+    void * target,
+    CORBA::Object_ptr src
+    ACE_ENV_ARG_DECL
+  )
 {
-  T **tmp = ACE_static_cast (T**, 
-                             target);
+  T ** tmp = ACE_static_cast (T **, 
+                              target);
 
-  *tmp = T_var::tao_narrow (src 
-                            ACE_ENV_ARG_PARAMETER);
+  *tmp = T_cast::tao_narrow (src 
+                             ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 }
 
-template <class T, class T_var, size_t MAX> CORBA::Object*
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::_upcast (void* src) const
+template <typename T, 
+          typename T_var, 
+          typename T_life, 
+          typename T_cast, 
+          size_t MAX> 
+CORBA::Object_ptr
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::_upcast (
+    void * src
+  ) const
 {
-  return T_var::tao_upcast (src);
+  return T_cast::tao_upcast (src);
 }
 
 // *************************************************************
 // Operations for class TAO_Unbounded_Pseudo_Sequence
 // *************************************************************
 
-// Constructor for unbounded sequence.
-template <class T, class T_var>
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
-TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum)
+template <typename T, typename T_var>
+TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (
+    CORBA::ULong maximum
+  )
   : TAO_Unbounded_Base_Sequence (
         maximum,
         TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (maximum)
@@ -995,9 +1216,9 @@ TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum)
 {
 }
 
-template <class T, class T_var>
+template <typename T, typename T_var>
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (
-    const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs
+    const TAO_Unbounded_Pseudo_Sequence<T,T_var> & rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
@@ -1023,16 +1244,17 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (
     }
 }
 
-template<class T, class T_var>
+template <typename T, typename T_var>
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::~TAO_Unbounded_Pseudo_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-// assignment operator
-template <class T, class T_var> TAO_Unbounded_Pseudo_Sequence<T,T_var>&
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
-operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
+template <typename T, typename T_var>
+TAO_Unbounded_Pseudo_Sequence<T,T_var> &
+TAO_Unbounded_Pseudo_Sequence<T,T_var>::operator= (
+    const TAO_Unbounded_Pseudo_Sequence<T,T_var> & rhs
+  )
 {
   if (this == &rhs)
     {
@@ -1041,8 +1263,8 @@ operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
 
   if (this->release_)
     {
-      T **tmp = ACE_reinterpret_cast (T **,
-                                      this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **,
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -1072,8 +1294,8 @@ operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  T **tmp1 = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                                           rhs.buffer_);
 
@@ -1085,15 +1307,16 @@ operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
   return *this;
 }
 
-template <class T, class T_var> T **
+template <typename T, typename T_var>
+T **
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
 {
-  T **buf = 0;
+  T ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  T*[nelems], 
+                  T * [nelems], 
                   0);
 
-  for (CORBA::ULong i = 0; i < nelems; i++)
+  for (CORBA::ULong i = 0; i < nelems; ++i)
     {
       buf[i] = T::_nil ();
     }
@@ -1101,8 +1324,9 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
   return buf;
 }
 
-template <class T, class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T **buffer)
+template <typename T, typename T_var>
+void
+TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T ** buffer)
 {
   if (buffer == 0)
     {
@@ -1124,15 +1348,16 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T **buffer)
   delete [] buffer;
 }
 
-template<class T, class T_var> void
+template <typename T, typename T_var>
+void
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
 {
-  T **tmp = TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (length);
+  T ** tmp = TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
-      T **old = ACE_reinterpret_cast (T**, 
-                                      this->buffer_);
+      T ** old = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         // Only call duplicate when we did not own the previous
@@ -1154,10 +1379,12 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
           delete [] old;
         }
     }
+
   this->buffer_ = tmp;
 }
 
-template<class T, class T_var> void
+template <typename T, typename T_var>
+void
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
@@ -1165,8 +1392,8 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_deallocate_buffer (void)
       return;
     }
 
-  T **tmp = ACE_reinterpret_cast (T**, 
-                                  this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -1178,11 +1405,12 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_deallocate_buffer (void)
   this->buffer_ = 0;
 }
 
-template<class T, class T_var> void
+template <typename T, typename T_var>
+void
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
-                                                        CORBA::ULong ol)
+                                                  CORBA::ULong ol)
 {
-  T **tmp = ACE_static_cast (T**, this->buffer_);
+  T ** tmp = ACE_static_cast (T **, this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
@@ -1195,31 +1423,30 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
 // Operations for class TAO_Bounded_Pseudo_Sequence
 // *************************************************************
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::
-TAO_Bounded_Pseudo_Sequence (void)
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::TAO_Bounded_Pseudo_Sequence (void)
   : TAO_Bounded_Base_Sequence (
         MAX,
-        TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (MAX)
+        TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::allocbuf (MAX)
       )
 {
 }
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::TAO_Bounded_Pseudo_Sequence (
-    const TAO_Bounded_Pseudo_Sequence<T, T_var,MAX> &rhs
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::TAO_Bounded_Pseudo_Sequence (
+    const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> & rhs
   )
   : TAO_Bounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T **tmp1 =
-        TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (MAX);
+      T ** tmp1 =
+        TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::allocbuf (MAX);
 
       T ** const tmp2 =
-       ACE_reinterpret_cast (T** ACE_CAST_CONST, rhs.buffer_);
+       ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
-      for (CORBA::ULong i = 0; i < rhs.length_; i++)
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
           tmp1[i] = T::_duplicate (tmp2[i]);
         }
@@ -1232,9 +1459,10 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::TAO_Bounded_Pseudo_Sequence (
     }
 }
 
-template <class T, class T_var, size_t MAX> TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>&
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator= (
-    const TAO_Bounded_Pseudo_Sequence<T, T_var,MAX> &rhs
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::operator= (
+    const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> & rhs
   )
 {
   if (this == &rhs)
@@ -1244,8 +1472,8 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator= (
 
   if (this->release_)
     {
-      T **tmp = ACE_reinterpret_cast (T **, 
-                                      this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -1270,8 +1498,8 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator= (
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  T **tmp1 = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                                           rhs.buffer_);
 
@@ -1283,12 +1511,13 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator= (
   return *this;
 }
 
-template <class T, class T_var, size_t MAX> T **
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
+template <typename T, typename T_var, size_t MAX>
+T **
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::allocbuf (CORBA::ULong)
 {
-  T **buf = 0;
+  T ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  T*[MAX], 
+                  T * [MAX], 
                   0);
 
   for (CORBA::ULong i = 0; i < MAX; ++i)
@@ -1299,8 +1528,9 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template <class T, class T_var, size_t MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::freebuf (T **buffer)
+template <typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::freebuf (T ** buffer)
 {
   // How much do we deallocate? Easy! allocbuf() always creates MAX
   // elements and initialize them to T::_nil().  So we can be
@@ -1317,35 +1547,40 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::freebuf (T **buffer)
   delete [] buffer;
 }
 
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length)
+template <typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
 {
   // For this class memory is never reallocated so the implementation
   // is *really* simple.
   this->buffer_ =
-    TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (length);
+    TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::allocbuf (length);
 }
 
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_deallocate_buffer (void)
+template <typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
 {
   if (this->release_ == 0)
     {
       return;
     }
 
-  T **tmp = ACE_reinterpret_cast (T **, 
-                                  this->buffer_);
-  TAO_Bounded_Pseudo_Sequence<T, T_var, MAX>::freebuf (tmp);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+  TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_shrink_buffer (CORBA::ULong nl,
+template <typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::_shrink_buffer (CORBA::ULong nl,
                                                            CORBA::ULong ol)
 {
-  T **tmp = ACE_reinterpret_cast (T **, 
-                                  this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
@@ -1358,35 +1593,38 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_shrink_buffer (CORBA::ULong nl,
 // Operations for class TAO_Unbounded_Valuetype_Sequence
 // *************************************************************
 
-// Constructor for unbounded sequence.
-template <class T, class T_var>
-TAO_Unbounded_Valuetype_Sequence<T, T_var>::TAO_Unbounded_Valuetype_Sequence (
+template <typename T, typename T_var, typename T_life> 
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Valuetype_Sequence (
     CORBA::ULong maximum
   )
   : TAO_Unbounded_Base_Sequence (
         maximum,
-        TAO_Unbounded_Valuetype_Sequence<T, T_var>::allocbuf (maximum)
+        TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (maximum)
       )
 {
 }
 
-template <class T, class T_var>
-TAO_Unbounded_Valuetype_Sequence<T, T_var>::TAO_Unbounded_Valuetype_Sequence (
-    const TAO_Unbounded_Valuetype_Sequence<T, T_var> &rhs
+template <typename T, typename T_var, typename T_life> 
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Valuetype_Sequence (
+    const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T **tmp1 =
-        TAO_Unbounded_Valuetype_Sequence<T, T_var>::allocbuf (this->maximum_);
+      T ** tmp1 =
+        TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (
+            this->maximum_
+          );
       T ** const tmp2 =
         ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                               rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          T_var::tao_add_ref (tmp2[i]);
+          T_life::tao_add_ref (tmp2[i]);
           tmp1[i] = tmp2[i];
         }
 
@@ -1398,19 +1636,17 @@ TAO_Unbounded_Valuetype_Sequence<T, T_var>::TAO_Unbounded_Valuetype_Sequence (
     }
 }
 
-template<class T, class T_var>
-TAO_Unbounded_Valuetype_Sequence<T, T_var>::~TAO_Unbounded_Valuetype_Sequence (
-    void
-  )
+template <typename T, typename T_var, typename T_life> 
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+~TAO_Unbounded_Valuetype_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-// assignment operator
-template <class T, class T_var>
-TAO_Unbounded_Valuetype_Sequence<T, T_var>&
-TAO_Unbounded_Valuetype_Sequence<T, T_var>::operator= (
-    const TAO_Unbounded_Valuetype_Sequence<T, T_var> &rhs
+template <typename T, typename T_var, typename T_life> 
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> &
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::operator= (
+    const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & rhs
   )
 {
   if (this == &rhs)
@@ -1420,20 +1656,20 @@ TAO_Unbounded_Valuetype_Sequence<T, T_var>::operator= (
 
   if (this->release_)
     {
-      T **tmp = ACE_reinterpret_cast (T **,
-                                      this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **,
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          T_var::tao_remove_ref (tmp[i]);
+          T_life::tao_remove_ref (tmp[i]);
           tmp[i] = 0;
         }
 
       if (this->maximum_ < rhs.maximum_)
         {
-          TAO_Unbounded_Valuetype_Sequence<T, T_var>::freebuf (tmp);
+          TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (tmp);
           this->buffer_ =
-            TAO_Unbounded_Valuetype_Sequence<T, T_var>::allocbuf (rhs.maximum_);
+            TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (rhs.maximum_);
         }
     }
   else
@@ -1445,7 +1681,7 @@ TAO_Unbounded_Valuetype_Sequence<T, T_var>::operator= (
       else
         {
           this->buffer_ =
-            TAO_Unbounded_Valuetype_Sequence<T, T_var>::allocbuf (
+            TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (
                 rhs.maximum_
               );
         }
@@ -1453,30 +1689,30 @@ TAO_Unbounded_Valuetype_Sequence<T, T_var>::operator= (
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  T **tmp1 = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                                           rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      T_var::tao_add_ref (tmp2[i]);
+      T_life::tao_add_ref (tmp2[i]);
       tmp1[i] = tmp2[i];
     }
 
   return *this;
 }
 
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 T **
-TAO_Unbounded_Valuetype_Sequence<T, T_var>::allocbuf (CORBA::ULong nelems)
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (CORBA::ULong nelems)
 {
-  T **buf = 0;
+  T ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  T*[nelems], 
+                  T * [nelems], 
                   0);
 
-  for (CORBA::ULong i = 0; i < nelems; i++)
+  for (CORBA::ULong i = 0; i < nelems; ++i)
     {
       buf[i] = 0;
     }
@@ -1484,9 +1720,9 @@ TAO_Unbounded_Valuetype_Sequence<T, T_var>::allocbuf (CORBA::ULong nelems)
   return buf;
 }
 
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 void
-TAO_Unbounded_Valuetype_Sequence<T, T_var>::freebuf (T **buffer)
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (T ** buffer)
 {
   if (buffer == 0)
     {
@@ -1508,18 +1744,19 @@ TAO_Unbounded_Valuetype_Sequence<T, T_var>::freebuf (T **buffer)
   delete [] buffer;
 }
 
-template<class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 void
-TAO_Unbounded_Valuetype_Sequence<T, T_var>::_allocate_buffer (
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_allocate_buffer (
     CORBA::ULong length
   )
 {
-  T **tmp = TAO_Unbounded_Valuetype_Sequence<T, T_var>::allocbuf (length);
+  T ** tmp = 
+    TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
-      T **old = ACE_reinterpret_cast (T**, 
-                                      this->buffer_);
+      T ** old = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         // Only call duplicate when we did not own the previous
@@ -1529,7 +1766,7 @@ TAO_Unbounded_Valuetype_Sequence<T, T_var>::_allocate_buffer (
         // the old instances.
         if (!this->release_)
           {
-            T_var::tao_add_ref (tmp[i]);
+            T_life::tao_add_ref (tmp[i]);
             tmp[i] = old[i];
           }
         else
@@ -1546,37 +1783,41 @@ TAO_Unbounded_Valuetype_Sequence<T, T_var>::_allocate_buffer (
   this->buffer_ = tmp;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Valuetype_Sequence<T, T_var>::_deallocate_buffer (void)
+template <typename T, typename T_var, typename T_life> 
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     {
       return;
     }
 
-  T **tmp = ACE_reinterpret_cast (T**, 
-                                  this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      T_var::tao_remove_ref (tmp[i]);
+      T_life::tao_remove_ref (tmp[i]);
       tmp[i] = 0;
     }
 
-  TAO_Unbounded_Valuetype_Sequence<T, T_var>::freebuf (tmp);
+  TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Valuetype_Sequence<T ,T_var>::_shrink_buffer (CORBA::ULong nl,
-                                                            CORBA::ULong ol)
+template <typename T, typename T_var, typename T_life> 
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
 {
-  T **tmp = ACE_static_cast (T**, 
-                             this->buffer_);
+  T ** tmp = ACE_static_cast (T **, 
+                              this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      T_var::tao_remove_ref (tmp[i]);
+      T_life::tao_remove_ref (tmp[i]);
       tmp[i] = 0;
     }
 }
@@ -1585,34 +1826,34 @@ TAO_Unbounded_Valuetype_Sequence<T ,T_var>::_shrink_buffer (CORBA::ULong nl,
 // Operations for class TAO_Bounded_Valuetype_Sequence
 // *************************************************************
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::TAO_Bounded_Valuetype_Sequence (
-    void
-  )
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Valuetype_Sequence (void)
   : TAO_Bounded_Base_Sequence (
         MAX,
-        TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::allocbuf (MAX)
+        TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX)
       )
 {
 }
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::TAO_Bounded_Valuetype_Sequence (
-    const TAO_Bounded_Valuetype_Sequence<T, T_var, MAX> &rhs
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Valuetype_Sequence (
+    const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> & rhs
   )
   : TAO_Bounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T **tmp1 =
-        TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::allocbuf (MAX);
+      T ** tmp1 =
+        TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX);
 
       T ** const tmp2 =
-        ACE_reinterpret_cast (T** ACE_CAST_CONST, rhs.buffer_);
+        ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
-      for (CORBA::ULong i = 0; i < rhs.length_; i++)
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          T_var::tao_add_ref (tmp2[i]);
+          T_life::tao_add_ref (tmp2[i]);
           tmp1[i] = tmp2[i];
         }
 
@@ -1624,10 +1865,10 @@ TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::TAO_Bounded_Valuetype_Sequence (
     }
 }
 
-template <class T, class T_var, size_t MAX> 
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>&
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::operator= (
-    const TAO_Bounded_Valuetype_Sequence<T, T_var, MAX> &rhs
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>&
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::operator= (
+    const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> & rhs
   )
 {
   if (this == &rhs)
@@ -1637,12 +1878,12 @@ TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::operator= (
 
   if (this->release_)
     {
-      T **tmp = ACE_reinterpret_cast (T **, 
-                                      this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          T_var::tao_remove_ref (tmp[i]);
+          T_life::tao_remove_ref (tmp[i]);
           tmp[i] = 0;
         }
       // No need to reallocate the buffer since it is always of size
@@ -1657,7 +1898,7 @@ TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::operator= (
       else
         {
           this->buffer_ =
-            TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::allocbuf (
+            TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (
                 rhs.maximum_
               );
         }
@@ -1665,27 +1906,27 @@ TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::operator= (
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  T **tmp1 = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                                           rhs.buffer_);
 
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      T_var::tao_add_ref (tmp2[i]);
+      T_life::tao_add_ref (tmp2[i]);
       tmp1[i] = tmp2[i];
     }
 
   return *this;
 }
 
-template <class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 T **
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::allocbuf (CORBA::ULong)
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (CORBA::ULong)
 {
-  T **buf = 0;
+  T ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  T*[MAX], 
+                  T * [MAX], 
                   0);
 
   for (CORBA::ULong i = 0; i < MAX; ++i)
@@ -1696,9 +1937,9 @@ TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template <class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 void
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::freebuf (T **buffer)
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::freebuf (T ** buffer)
 {
   // How much do we deallocate? Easy! allocbuf() always creates MAX
   // elements and initialize them to T::_nil().  So we can be
@@ -1707,7 +1948,7 @@ TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::freebuf (T **buffer)
     {
       if (buffer[i] != 0)
         {
-          T_var::tao_remove_ref (buffer[i]);
+          T_life::tao_remove_ref (buffer[i]);
           buffer[i] = 0;
         }
     }
@@ -1715,44 +1956,46 @@ TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::freebuf (T **buffer)
   delete [] buffer;
 }
 
-template<class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 void
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::_allocate_buffer (
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_allocate_buffer (
     CORBA::ULong length
   )
 {
   // For this class memory is never reallocated so the implementation
   // is *really* simple.
   this->buffer_ =
-    TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::allocbuf (length);
+    TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (length);
 }
 
-template<class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 void
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::_deallocate_buffer (void)
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_deallocate_buffer (void)
 {
   if (this->release_ == 0)
     {
       return;
     }
 
-  T **tmp = ACE_reinterpret_cast (T **, 
-                                  this->buffer_);
-  TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::freebuf (tmp);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+  TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 void
-TAO_Bounded_Valuetype_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                              CORBA::ULong ol)
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
 {
-  T **tmp = ACE_reinterpret_cast (T **, 
-                                  this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      T_var::tao_remove_ref (tmp[i]);
+      T_life::tao_remove_ref (tmp[i]);
       tmp[i] = 0;
     }
 }
@@ -1761,35 +2004,36 @@ TAO_Bounded_Valuetype_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
 // Operations for class TAO_Unbounded_Abstract_Sequence
 // *************************************************************
 
-// Constructor for unbounded sequence.
-template <class T, class T_var>
-TAO_Unbounded_Abstract_Sequence<T, T_var>::TAO_Unbounded_Abstract_Sequence (
-    CORBA::ULong maximum
-  )
+template <typename T, typename T_var, typename T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Abstract_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (
         maximum,
-        TAO_Unbounded_Abstract_Sequence<T, T_var>::allocbuf (maximum)
+        TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (maximum)
       )
 {
 }
 
-template <class T, class T_var>
-TAO_Unbounded_Abstract_Sequence<T, T_var>::TAO_Unbounded_Abstract_Sequence (
-    const TAO_Unbounded_Abstract_Sequence<T, T_var> &rhs
+template <typename T, typename T_var, typename T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Abstract_Sequence (
+    const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> & rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T **tmp1 =
-        TAO_Unbounded_Abstract_Sequence<T, T_var>::allocbuf (this->maximum_);
+      T ** tmp1 =
+        TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
+            this->maximum_
+          );
       T ** const tmp2 =
         ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                               rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          tmp1[i] = T_var::tao_duplicate (tmp2[i]);
+          tmp1[i] = T_life::tao_duplicate (tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -1800,19 +2044,17 @@ TAO_Unbounded_Abstract_Sequence<T, T_var>::TAO_Unbounded_Abstract_Sequence (
     }
 }
 
-template<class T, class T_var>
-TAO_Unbounded_Abstract_Sequence<T, T_var>::~TAO_Unbounded_Abstract_Sequence (
-    void
-  )
+template <typename T, typename T_var, typename T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+~TAO_Unbounded_Abstract_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-// assignment operator
-template <class T, class T_var>
-TAO_Unbounded_Abstract_Sequence<T, T_var>&
-TAO_Unbounded_Abstract_Sequence<T, T_var>::operator= (
-    const TAO_Unbounded_Abstract_Sequence<T, T_var> &rhs
+template <typename T, typename T_var, typename T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::operator= (
+    const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> & rhs
   )
 {
   if (this == &rhs)
@@ -1822,20 +2064,22 @@ TAO_Unbounded_Abstract_Sequence<T, T_var>::operator= (
 
   if (this->release_)
     {
-      T **tmp = ACE_reinterpret_cast (T **,
-                                      this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **,
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          T_var::tao_release (tmp[i]);
-          tmp[i] = T_var::tao_nil ();
+          T_life::tao_release (tmp[i]);
+          tmp[i] = T_life::tao_nil ();
         }
 
       if (this->maximum_ < rhs.maximum_)
         {
-          TAO_Unbounded_Abstract_Sequence<T, T_var>::freebuf (tmp);
+          TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (tmp);
           this->buffer_ =
-            TAO_Unbounded_Abstract_Sequence<T, T_var>::allocbuf (rhs.maximum_);
+            TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
+                rhs.maximum_
+              );
         }
     }
   else
@@ -1847,7 +2091,7 @@ TAO_Unbounded_Abstract_Sequence<T, T_var>::operator= (
       else
         {
           this->buffer_ =
-            TAO_Unbounded_Abstract_Sequence<T, T_var>::allocbuf (
+            TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
                 rhs.maximum_
               );
         }
@@ -1855,39 +2099,41 @@ TAO_Unbounded_Abstract_Sequence<T, T_var>::operator= (
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  T **tmp1 = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                                           rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      tmp1[i] = T_var::tao_duplicate (tmp2[i]);
+      tmp1[i] = T_life::tao_duplicate (tmp2[i]);
     }
 
   return *this;
 }
 
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life>
 T **
-TAO_Unbounded_Abstract_Sequence<T, T_var>::allocbuf (CORBA::ULong nelems)
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
+    CORBA::ULong nelems
+  )
 {
-  T **buf = 0;
+  T ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  T*[nelems], 
+                  T * [nelems], 
                   0);
 
-  for (CORBA::ULong i = 0; i < nelems; i++)
+  for (CORBA::ULong i = 0; i < nelems; ++i)
     {
-      buf[i] = T_var::tao_nil ();
+      buf[i] = T_life::tao_nil ();
     }
 
   return buf;
 }
 
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life>
 void
-TAO_Unbounded_Abstract_Sequence<T, T_var>::freebuf (T **buffer)
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (T ** buffer)
 {
   if (buffer == 0)
     {
@@ -1909,18 +2155,18 @@ TAO_Unbounded_Abstract_Sequence<T, T_var>::freebuf (T **buffer)
   delete [] buffer;
 }
 
-template<class T, class T_var> 
+template <typename T, typename T_var, typename T_life>
 void
-TAO_Unbounded_Abstract_Sequence<T, T_var>::_allocate_buffer (
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_allocate_buffer (
     CORBA::ULong length
   )
 {
-  T **tmp = TAO_Unbounded_Abstract_Sequence<T, T_var>::allocbuf (length);
+  T ** tmp = TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
-      T **old = ACE_reinterpret_cast (T**, 
-                                      this->buffer_);
+      T ** old = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         // Only call duplicate when we did not own the previous
@@ -1930,7 +2176,7 @@ TAO_Unbounded_Abstract_Sequence<T, T_var>::_allocate_buffer (
         // the old instances.
         if (!this->release_)
           {
-            tmp[i] = T_var::tao_duplicate (old[i]);
+            tmp[i] = T_life::tao_duplicate (old[i]);
           }
         else
           {
@@ -1946,38 +2192,42 @@ TAO_Unbounded_Abstract_Sequence<T, T_var>::_allocate_buffer (
   this->buffer_ = tmp;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Abstract_Sequence<T, T_var>::_deallocate_buffer (void)
+template <typename T, typename T_var, typename T_life>
+void
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     {
       return;
     }
 
-  T **tmp = ACE_reinterpret_cast (T**, 
-                                  this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      T_var::tao_release (tmp[i]);
-      tmp[i] = T_var::tao_nil ();
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
     }
 
-  TAO_Unbounded_Abstract_Sequence<T, T_var>::freebuf (tmp);
+  TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Abstract_Sequence<T ,T_var>::_shrink_buffer (CORBA::ULong nl,
-                                                           CORBA::ULong ol)
+template <typename T, typename T_var, typename T_life>
+void
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
 {
-  T **tmp = ACE_static_cast (T**, 
-                             this->buffer_);
+  T ** tmp = ACE_static_cast (T **, 
+                              this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      T_var::tao_release (tmp[i]);
-      tmp[i] = T_var::tao_nil ();
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
     }
 }
 
@@ -1985,34 +2235,34 @@ TAO_Unbounded_Abstract_Sequence<T ,T_var>::_shrink_buffer (CORBA::ULong nl,
 // Operations for class TAO_Bounded_Abstract_Sequence
 // *************************************************************
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::TAO_Bounded_Abstract_Sequence (
-    void
-  )
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Abstract_Sequence (void)
   : TAO_Bounded_Base_Sequence (
         MAX,
-        TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::allocbuf (MAX)
+        TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX)
       )
 {
 }
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::TAO_Bounded_Abstract_Sequence (
-    const TAO_Bounded_Abstract_Sequence<T, T_var, MAX> &rhs
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Abstract_Sequence (
+    const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> & rhs
   )
   : TAO_Bounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T **tmp1 =
-        TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::allocbuf (MAX);
+      T ** tmp1 =
+        TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX);
 
       T ** const tmp2 =
-        ACE_reinterpret_cast (T** ACE_CAST_CONST, rhs.buffer_);
+        ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
-      for (CORBA::ULong i = 0; i < rhs.length_; i++)
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          tmp1[i] = T_var::tao_duplicate (tmp2[i]);
+          tmp1[i] = T_life::tao_duplicate (tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -2023,10 +2273,10 @@ TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::TAO_Bounded_Abstract_Sequence (
     }
 }
 
-template <class T, class T_var, size_t MAX> 
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>&
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::operator= (
-    const TAO_Bounded_Abstract_Sequence<T, T_var, MAX> &rhs
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::operator= (
+    const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> & rhs
   )
 {
   if (this == &rhs)
@@ -2036,13 +2286,13 @@ TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::operator= (
 
   if (this->release_)
     {
-      T **tmp = ACE_reinterpret_cast (T **, 
-                                      this->buffer_);
+      T ** tmp = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          T_var::tao_release (tmp[i]);
-          tmp[i] = T_var::tao_nil ();
+          T_life::tao_release (tmp[i]);
+          tmp[i] = T_life::tao_nil ();
         }
       // No need to reallocate the buffer since it is always of size
       // MAX
@@ -2056,7 +2306,7 @@ TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::operator= (
       else
         {
           this->buffer_ =
-            TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::allocbuf (
+            TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (
                 rhs.maximum_
               );
         }
@@ -2064,94 +2314,96 @@ TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::operator= (
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  T **tmp1 = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
                                           rhs.buffer_);
 
-  for (CORBA::ULong i=0; i < rhs.length_; ++i)
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
-      tmp1[i] = T_var::tao_duplicate (tmp2[i]);
+      tmp1[i] = T_life::tao_duplicate (tmp2[i]);
     }
 
   return *this;
 }
 
-template <class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 T **
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::allocbuf (CORBA::ULong)
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (CORBA::ULong)
 {
-  T **buf = 0;
+  T ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  T*[MAX], 
+                  T * [MAX], 
                   0);
 
   for (CORBA::ULong i = 0; i < MAX; ++i)
     {
-      buf[i] = T_var::tao_nil ();
+      buf[i] = T_life::tao_nil ();
     }
 
   return buf;
 }
 
-template <class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 void
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::freebuf (T **buffer)
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::freebuf (T ** buffer)
 {
   // How much do we deallocate? Easy! allocbuf() always creates MAX
   // elements and initialize them to T::_nil().  So we can be
   // complaint and call CORBA::release() on each one.
   for (CORBA::ULong i = 0; i < MAX; ++i)
     {
-      if (buffer[i] != T_var::tao_nil ())
+      if (buffer[i] != T_life::tao_nil ())
         {
-          T_var::tao_release (buffer[i]);
-          buffer[i] = T_var::tao_nil ();
+          T_life::tao_release (buffer[i]);
+          buffer[i] = T_life::tao_nil ();
         }
     }
 
   delete [] buffer;
 }
 
-template<class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 void
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::_allocate_buffer (
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_allocate_buffer (
     CORBA::ULong length
   )
 {
   // For this class memory is never reallocated so the implementation
   // is *really* simple.
   this->buffer_ =
-    TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::allocbuf (length);
+    TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (length);
 }
 
-template<class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 void
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::_deallocate_buffer (void)
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_deallocate_buffer (void)
 {
   if (this->release_ == 0)
     {
       return;
     }
 
-  T **tmp = ACE_reinterpret_cast (T **, 
-                                  this->buffer_);
-  TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::freebuf (tmp);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+  TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T, class T_var, size_t MAX> 
+template <typename T, typename T_var, typename T_life, size_t MAX>
 void
-TAO_Bounded_Abstract_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
-                                                              CORBA::ULong ol)
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
 {
-  T **tmp = ACE_reinterpret_cast (T **, 
-                                  this->buffer_);
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      T_var::tao_release (tmp[i]);
-      tmp[i] = T_var::tao_nil ();
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
     }
 }
 
@@ -2159,38 +2411,39 @@ TAO_Bounded_Abstract_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
 // Operations for class TAO_Unbounded_Array_Sequence
 // *************************************************************
 
-template <class T, class T_var> T *
-TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (CORBA::ULong nelems)
+template <typename T, typename T_life> 
+T *
+TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (CORBA::ULong nelems)
 {
-  T *buf = 0;
+  T * buf = 0;
   ACE_NEW_RETURN (buf,
-                  T[nelems],
+                  T [nelems],
                   0);
 
   return buf;
 }
 
-template <class T, class T_var>
-TAO_Unbounded_Array_Sequence<T, T_var>::TAO_Unbounded_Array_Sequence (
-    const TAO_Unbounded_Array_Sequence<T, T_var> &rhs
+template <typename T, typename T_life> 
+TAO_Unbounded_Array_Sequence<T,T_life>::TAO_Unbounded_Array_Sequence (
+    const TAO_Unbounded_Array_Sequence<T,T_life> & rhs
   )
   : TAO_Unbounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T *tmp1 =
-        TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (this->maximum_);
+      T * tmp1 =
+        TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (this->maximum_);
 
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-      const T *tmp2 = (const T *) rhs.buffer_;
+      const T * tmp2 = (const T *) rhs.buffer_;
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-      const T *tmp2 = ACE_reinterpret_cast (const T *,
-                                            rhs.buffer_);
+      const T * tmp2 = ACE_reinterpret_cast (const T *,
+                                             rhs.buffer_);
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          T_var::copy (tmp1[i], tmp2[i]);
+          T_life::tao_copy (tmp1[i], tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -2201,16 +2454,16 @@ TAO_Unbounded_Array_Sequence<T, T_var>::TAO_Unbounded_Array_Sequence (
     }
 }
 
-template<class T, class T_var>
-TAO_Unbounded_Array_Sequence<T, T_var>::~TAO_Unbounded_Array_Sequence (void)
+template <typename T, typename T_life> 
+TAO_Unbounded_Array_Sequence<T,T_life>::~TAO_Unbounded_Array_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-// assignment operator
-template <class T, class T_var> TAO_Unbounded_Array_Sequence<T, T_var>&
-TAO_Unbounded_Array_Sequence<T, T_var>::operator= (
-    const TAO_Unbounded_Array_Sequence<T, T_var> &rhs
+template <typename T, typename T_life> 
+TAO_Unbounded_Array_Sequence<T,T_life> &
+TAO_Unbounded_Array_Sequence<T,T_life>::operator= (
+    const TAO_Unbounded_Array_Sequence<T,T_life> & rhs
   )
 {
   if (this == &rhs)
@@ -2224,13 +2477,13 @@ TAO_Unbounded_Array_Sequence<T, T_var>::operator= (
         {
           // free the old buffer
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-          T *tmp = (T *) this->buffer_;
+          T * tmp = (T *) this->buffer_;
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-          T *tmp = ACE_reinterpret_cast (T *,
-                                         this->buffer_);
+          T * tmp = ACE_reinterpret_cast (T *,
+                                          this->buffer_);
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 
-          TAO_Unbounded_Array_Sequence<T, T_var>::freebuf (tmp);
+          TAO_Unbounded_Array_Sequence<T,T_life>::freebuf (tmp);
 
           if (rhs.maximum_ == 0)
             {
@@ -2239,7 +2492,7 @@ TAO_Unbounded_Array_Sequence<T, T_var>::operator= (
           else
             {
               this->buffer_ =
-                TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (
+                TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (
                     rhs.maximum_
                   );
             }
@@ -2254,7 +2507,7 @@ TAO_Unbounded_Array_Sequence<T, T_var>::operator= (
       else
         {
           this->buffer_ =
-            TAO_Unbounded_Array_Sequence<T,T_var>::allocbuf (rhs.maximum_);
+            TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (rhs.maximum_);
         }
     }
 
@@ -2263,11 +2516,11 @@ TAO_Unbounded_Array_Sequence<T, T_var>::operator= (
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-      T_var::copy (((T *) this->buffer_)[i],
-                   ((const T *) rhs.buffer_)[i]);
+      T_life::tao_copy (((T *) this->buffer_)[i],
+                        ((const T *) rhs.buffer_)[i]);
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-      T_var::copy (ACE_reinterpret_cast (T *,
-                                         this->buffer_)[i],
+      T_life::tao_copy (ACE_reinterpret_cast (T *,
+                                              this->buffer_)[i],
                    ACE_reinterpret_cast (const T *,
                                          rhs.buffer_)[i]);
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
@@ -2276,23 +2529,71 @@ TAO_Unbounded_Array_Sequence<T, T_var>::operator= (
   return *this;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Array_Sequence<T, T_var>::_allocate_buffer (CORBA::ULong length)
+template <typename T, typename T_life> 
+T *
+TAO_Unbounded_Array_Sequence<T,T_life>::get_buffer (CORBA::Boolean orphan)
+{
+  T * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+
+      if (this->buffer_ == 0)
+        {
+          if (this->length_ > 0)
+            {
+              result = 
+	        TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (
+                    this->length_
+                  );
+              this->buffer_ = result;
+	      this->release_ = 1;
+            }
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (T*, 
+	                          this->buffer_);
+        }
+    }
+  else
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish
+          // ownership.
+          result = ACE_reinterpret_cast (T *,
+	                                 this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+template <typename T, typename T_life> 
+void
+TAO_Unbounded_Array_Sequence<T,T_life>::_allocate_buffer (CORBA::ULong length)
 {
-  T *tmp = TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (length);
+  T * tmp = TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-      T *old = (T *) this->buffer_;
+      T * old = (T *) this->buffer_;
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-      T *old = ACE_reinterpret_cast (T *,
-                                     this->buffer_);
+      T * old = ACE_reinterpret_cast (T *,
+                                      this->buffer_);
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          T_var::copy (tmp[i], old[i]);
+          T_life::tao_copy (tmp[i], old[i]);
         }
 
       if (this->release_)
@@ -2304,8 +2605,9 @@ TAO_Unbounded_Array_Sequence<T, T_var>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T, class T_var> void
-TAO_Unbounded_Array_Sequence<T, T_var>::_deallocate_buffer (void)
+template <typename T, typename T_life> 
+void
+TAO_Unbounded_Array_Sequence<T,T_life>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     {
@@ -2313,53 +2615,75 @@ TAO_Unbounded_Array_Sequence<T, T_var>::_deallocate_buffer (void)
     }
 
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  T *tmp = (T *) this->buffer_;
+  T * tmp = (T *) this->buffer_;
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  T *tmp = ACE_reinterpret_cast (T *,
+  T * tmp = ACE_reinterpret_cast (T *,
                                  this->buffer_);
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 
-  TAO_Unbounded_Array_Sequence<T, T_var>::freebuf (tmp);
+  TAO_Unbounded_Array_Sequence<T,T_life>::freebuf (tmp);
 
   this->buffer_ = 0;
 }
 
+template <typename T, typename T_life> 
+void
+TAO_Unbounded_Array_Sequence<T,T_life>::replace (CORBA::ULong max,
+				                 CORBA::ULong length,
+                                                 T * data,
+                                                 CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+  if (this->buffer_ && this->release_ == 1)
+    {
+      T * tmp = ACE_reinterpret_cast (T *,
+                                      this->buffer_);
+      TAO_Unbounded_Array_Sequence<T,T_life>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 // *************************************************************
 // Operations for class TAO_Bounded_Array_Sequence
 // *************************************************************
 
-template <class T, class T_var, size_t MAX> T *
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::allocbuf (CORBA::ULong)
+template <typename T, typename T_life, size_t MAX> 
+T *
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::allocbuf (CORBA::ULong)
 {
-  T *buf = 0;
+  T * buf = 0;
   ACE_NEW_RETURN (buf,
-                  T[MAX],
+                  T [MAX],
                   0);
 
   return buf;
 }
 
-template <class T, class T_var, size_t MAX>
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::TAO_Bounded_Array_Sequence (
-    const TAO_Bounded_Array_Sequence<T, T_var, MAX> &rhs
+template <typename T, typename T_life, size_t MAX> 
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::TAO_Bounded_Array_Sequence (
+    const TAO_Bounded_Array_Sequence<T,T_life,MAX> &rhs
   )
   : TAO_Bounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      T *tmp1 =
-        TAO_Bounded_Array_Sequence<T, T_var, MAX>::allocbuf (MAX);
+      T * tmp1 =
+        TAO_Bounded_Array_Sequence<T,T_life,MAX>::allocbuf (MAX);
 
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-      const T *tmp2 = (const T *) rhs.buffer_;
+      const T * tmp2 = (const T *) rhs.buffer_;
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-      const T *tmp2 = ACE_reinterpret_cast (const T *,
-                                            rhs.buffer_);
+      const T * tmp2 = ACE_reinterpret_cast (const T *,
+                                             rhs.buffer_);
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 
-      for (CORBA::ULong i = 0; i < rhs.length_; i++)
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          T_var::copy (tmp1[i], tmp2[i]);
+          T_life::tao_copy (tmp1[i], tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -2370,15 +2694,16 @@ TAO_Bounded_Array_Sequence<T, T_var, MAX>::TAO_Bounded_Array_Sequence (
     }
 }
 
-template<class T, class T_var, size_t MAX>
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::~TAO_Bounded_Array_Sequence (void)
+template <typename T, typename T_life, size_t MAX> 
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::~TAO_Bounded_Array_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var, size_t MAX> TAO_Bounded_Array_Sequence<T, T_var, MAX>&
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::operator= (
-    const TAO_Bounded_Array_Sequence<T, T_var, MAX> &rhs
+template <typename T, typename T_life, size_t MAX> 
+TAO_Bounded_Array_Sequence<T,T_life,MAX> &
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::operator= (
+    const TAO_Bounded_Array_Sequence<T,T_life,MAX> & rhs
   )
 {
   if (this == &rhs)
@@ -2400,7 +2725,7 @@ TAO_Bounded_Array_Sequence<T, T_var, MAX>::operator= (
       else
         {
           this->buffer_ =
-            TAO_Bounded_Array_Sequence<T,T_var,MAX>::allocbuf (rhs.maximum_);
+            TAO_Bounded_Array_Sequence<T,T_life,MAX>::allocbuf (rhs.maximum_);
         }
     }
 
@@ -2409,30 +2734,85 @@ TAO_Bounded_Array_Sequence<T, T_var, MAX>::operator= (
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-      T_var::copy (((T *) this->buffer_)[i],
-                   ((const T *) rhs.buffer_)[i]);
+      T_life::tao_copy (((T *) this->buffer_)[i],
+                        ((const T *) rhs.buffer_)[i]);
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-      T_var::copy (ACE_reinterpret_cast (T *,
-                                         this->buffer_)[i],
-                   ACE_reinterpret_cast (const T *,
-                                         rhs.buffer_)[i]);
+      T_life::tao_copy (ACE_reinterpret_cast (T *,
+                                              this->buffer_)[i],
+                        ACE_reinterpret_cast (const T *,
+                                              rhs.buffer_)[i]);
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
     }
 
   return *this;
 }
 
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::_allocate_buffer (CORBA::ULong length)
+template <typename T, typename T_life, size_t MAX> 
+T *
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::get_buffer (CORBA::Boolean orphan)
+{
+  T * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+
+      if (this->buffer_ == 0)
+        {
+          result = 
+	    TAO_Bounded_Array_Sequence<T,T_life,MAX>::allocbuf (this->maximum_);
+          this->buffer_ = result;
+	  this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (T *, this->buffer_);
+        }
+    }
+  else
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result = ACE_reinterpret_cast(T *,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+template <typename T, typename T_life, size_t MAX> 
+void
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::freebuf (T * buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_life, size_t MAX> 
+void
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
 {
   // For this class memory is never reallocated so the implementation
   // is *really* simple.
   this->buffer_ =
-    TAO_Bounded_Array_Sequence<T, T_var, MAX>::allocbuf (length);
+    TAO_Bounded_Array_Sequence<T,T_life,MAX>::allocbuf (length);
 }
 
-template<class T, class T_var, size_t MAX> void
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::_deallocate_buffer (void)
+template <typename T, typename T_life, size_t MAX> 
+void
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     {
@@ -2440,17 +2820,38 @@ TAO_Bounded_Array_Sequence<T, T_var, MAX>::_deallocate_buffer (void)
     }
 
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  T *tmp = (T *) this->buffer_;
+  T * tmp = (T *) this->buffer_;
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  T *tmp = ACE_reinterpret_cast (T *,
-                                 this->buffer_);
+  T * tmp = ACE_reinterpret_cast (T *,
+                                  this->buffer_);
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 
-  TAO_Bounded_Array_Sequence<T, T_var, MAX>::freebuf (tmp);
+  TAO_Bounded_Array_Sequence<T,T_life,MAX>::freebuf (tmp);
 
   this->buffer_ = 0;
 }
 
+template <typename T, typename T_life, size_t MAX> 
+void
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::replace (CORBA::ULong max,
+                                                   CORBA::ULong length,
+                                                   T * data,
+                                                   CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+  if (this->buffer_ && this->release_ == 1)
+    {
+      T * tmp = ACE_reinterpret_cast (T *, 
+                                      this->buffer_);
+      TAO_Bounded_Array_Sequence<T,T_life,MAX>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
 // *************************************************************
 // Operations for class TAO_Bounded_String_Sequence
 // *************************************************************
@@ -2466,20 +2867,20 @@ TAO_Bounded_String_Sequence<MAX>::TAO_Bounded_String_Sequence (void)
 
 template<size_t MAX>
 TAO_Bounded_String_Sequence<MAX>::TAO_Bounded_String_Sequence (
-    const TAO_Bounded_String_Sequence<MAX> &rhs
+    const TAO_Bounded_String_Sequence<MAX> & rhs
   )
   : TAO_Bounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      char **tmp1 =
+      char ** tmp1 =
         TAO_Bounded_String_Sequence<MAX>::allocbuf (this->maximum_);
 
       char ** const tmp2 =
         ACE_reinterpret_cast (char ** ACE_CAST_CONST,
                               rhs.buffer_);
 
-      for (CORBA::ULong i=0; i < rhs.length_; i++)
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
           tmp1[i] = CORBA::string_dup (tmp2[i]);
         }
@@ -2492,9 +2893,10 @@ TAO_Bounded_String_Sequence<MAX>::TAO_Bounded_String_Sequence (
     }
 }
 
-template<size_t MAX> TAO_Bounded_String_Sequence<MAX>&
+template<size_t MAX> 
+TAO_Bounded_String_Sequence<MAX> &
 TAO_Bounded_String_Sequence<MAX>::operator= (
-    const TAO_Bounded_String_Sequence<MAX> &rhs
+    const TAO_Bounded_String_Sequence<MAX> & rhs
   )
 {
   if (this == &rhs)
@@ -2504,8 +2906,8 @@ TAO_Bounded_String_Sequence<MAX>::operator= (
 
   if (this->release_)
     {
-      char **tmp = ACE_reinterpret_cast (char **, 
-                                         this->buffer_);
+      char ** tmp = ACE_reinterpret_cast (char **, 
+                                          this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -2530,7 +2932,7 @@ TAO_Bounded_String_Sequence<MAX>::operator= (
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  char **tmp1 = ACE_reinterpret_cast (char **, 
+  char ** tmp1 = ACE_reinterpret_cast  (char **, 
                                       this->buffer_);
   char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
                                              rhs.buffer_);
@@ -2543,22 +2945,24 @@ TAO_Bounded_String_Sequence<MAX>::operator= (
   return *this;
 }
 
-template<size_t MAX> TAO_SeqElem_String_Manager
+template<size_t MAX> 
+TAO_SeqElem_String_Manager
 TAO_Bounded_String_Sequence<MAX>::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  char **const tmp = ACE_reinterpret_cast (char **ACE_CAST_CONST,
+  char ** const tmp = ACE_reinterpret_cast  (char ** ACE_CAST_CONST,
                                            this->buffer_);
   return TAO_SeqElem_String_Manager (tmp + slot,
                                      this->release_);
 }
 
-template<size_t MAX> char **
+template<size_t MAX> 
+char **
 TAO_Bounded_String_Sequence<MAX>::allocbuf (CORBA::ULong)
 {
   char **buf = 0;
   ACE_NEW_RETURN (buf, 
-                  char *[MAX], 
+                  char * [MAX], 
                   0);
 
   for (CORBA::ULong i = 0; i < MAX; ++i)
@@ -2569,8 +2973,9 @@ TAO_Bounded_String_Sequence<MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template<size_t MAX> void
-TAO_Bounded_String_Sequence<MAX>::freebuf (char* *buffer)
+template<size_t MAX> 
+void
+TAO_Bounded_String_Sequence<MAX>::freebuf (char ** buffer)
 {
   // How much do we deallocate? Easy! <allocbuf> always creates MAX
   // elements and initialize them to 0 (they say NULL, yuck!).  So we
@@ -2588,7 +2993,8 @@ TAO_Bounded_String_Sequence<MAX>::freebuf (char* *buffer)
   delete [] buffer;
 }
 
-template<size_t MAX> void
+template<size_t MAX> 
+void
 TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
 {
   // For this class memory is never reallocated so the implementation
@@ -2597,7 +3003,8 @@ TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
     TAO_Bounded_String_Sequence<MAX>::allocbuf (MAX);
 }
 
-template<size_t MAX> void
+template<size_t MAX> 
+void
 TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void)
 {
   if (this->release_ == 0)
@@ -2605,18 +3012,19 @@ TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void)
       return;
     }
 
-  char **tmp = ACE_reinterpret_cast (char **, 
-                                     this->buffer_);
+  char ** tmp = ACE_reinterpret_cast (char **, 
+                                      this->buffer_);
   TAO_Bounded_String_Sequence<MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<size_t MAX> void
+template<size_t MAX> 
+void
 TAO_Bounded_String_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
                                                   CORBA::ULong ol)
 {
-  char **tmp = ACE_reinterpret_cast (char **,
-                                     this->buffer_);
+  char ** tmp = ACE_reinterpret_cast (char **,
+                                      this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
@@ -2625,9 +3033,10 @@ TAO_Bounded_String_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
     }
 }
 
-template<size_t MAX> void
+template<size_t MAX> 
+void
 TAO_Bounded_String_Sequence<MAX>::replace (CORBA::ULong length,
-                                           char * *data,
+                                           char ** data,
                                            CORBA::Boolean release)
 {
   ACE_ASSERT (length < this->maximum_);
@@ -2654,20 +3063,20 @@ TAO_Bounded_WString_Sequence<MAX>::TAO_Bounded_WString_Sequence (void)
 
 template<size_t MAX>
 TAO_Bounded_WString_Sequence<MAX>::TAO_Bounded_WString_Sequence (
-    const TAO_Bounded_WString_Sequence<MAX> &rhs
+    const TAO_Bounded_WString_Sequence<MAX> & rhs
   )
   : TAO_Bounded_Base_Sequence (rhs)
 {
   if (rhs.buffer_ != 0)
     {
-      CORBA::WChar **tmp1 =
+      CORBA::WChar ** tmp1 =
         TAO_Bounded_WString_Sequence<MAX>::allocbuf (this->maximum_);
 
       CORBA::WChar ** const tmp2 =
         ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST,
                               rhs.buffer_);
 
-      for (CORBA::ULong i=0; i < rhs.length_; ++i)
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
           tmp1[i] = CORBA::wstring_dup (tmp2[i]);
         }
@@ -2680,9 +3089,10 @@ TAO_Bounded_WString_Sequence<MAX>::TAO_Bounded_WString_Sequence (
     }
 }
 
-template<size_t MAX> TAO_Bounded_WString_Sequence<MAX>&
+template<size_t MAX> 
+TAO_Bounded_WString_Sequence<MAX> &
 TAO_Bounded_WString_Sequence<MAX>::operator= (
-    const TAO_Bounded_WString_Sequence<MAX> &rhs
+    const TAO_Bounded_WString_Sequence<MAX> & rhs
   )
 {
   if (this == &rhs)
@@ -2692,8 +3102,8 @@ TAO_Bounded_WString_Sequence<MAX>::operator= (
 
   if (this->release_)
     {
-      CORBA::WChar **tmp = ACE_reinterpret_cast (CORBA::WChar **,
-                                                 this->buffer_);
+      CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **,
+                                                  this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -2718,8 +3128,8 @@ TAO_Bounded_WString_Sequence<MAX>::operator= (
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  CORBA::WChar **tmp1 = ACE_reinterpret_cast (CORBA::WChar **,
-                                              this->buffer_);
+  CORBA::WChar ** tmp1 = ACE_reinterpret_cast (CORBA::WChar **,
+                                               this->buffer_);
   CORBA::WChar ** const tmp2 =
     ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST,
                           rhs.buffer_);
@@ -2732,23 +3142,25 @@ TAO_Bounded_WString_Sequence<MAX>::operator= (
   return *this;
 }
 
-template<size_t MAX> TAO_SeqElem_WString_Manager
+template<size_t MAX> 
+TAO_SeqElem_WString_Manager
 TAO_Bounded_WString_Sequence<MAX>::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  CORBA::WChar **const tmp =
-    ACE_reinterpret_cast (CORBA::WChar **ACE_CAST_CONST,
+  CORBA::WChar ** const tmp =
+    ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST,
                           this->buffer_);
   return TAO_SeqElem_WString_Manager (tmp + slot,
                                       this->release_);
 }
 
-template<size_t MAX> CORBA::WChar **
+template<size_t MAX> 
+CORBA::WChar **
 TAO_Bounded_WString_Sequence<MAX>::allocbuf (CORBA::ULong)
 {
-  CORBA::WChar **buf = 0;
+  CORBA::WChar ** buf = 0;
   ACE_NEW_RETURN (buf, 
-                  CORBA::WChar *[MAX], 
+                  CORBA::WChar * [MAX], 
                   0);
 
   for (CORBA::ULong i = 0; i < MAX; ++i)
@@ -2759,7 +3171,8 @@ TAO_Bounded_WString_Sequence<MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template<size_t MAX> void
+template<size_t MAX> 
+void
 TAO_Bounded_WString_Sequence<MAX>::freebuf (CORBA::WChar* *buffer)
 {
   // How much do we deallocate? Easy! <allocbuf> always creates MAX
@@ -2778,8 +3191,11 @@ TAO_Bounded_WString_Sequence<MAX>::freebuf (CORBA::WChar* *buffer)
   delete [] buffer;
 }
 
-template<size_t MAX> void
-TAO_Bounded_WString_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
+template<size_t MAX> 
+void
+TAO_Bounded_WString_Sequence<MAX>::_allocate_buffer (
+    CORBA::ULong /* length */
+  )
 {
   // For this class memory is never reallocated so the implementation
   // is *really* simple.
@@ -2787,7 +3203,8 @@ TAO_Bounded_WString_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
     TAO_Bounded_WString_Sequence<MAX>::allocbuf (MAX);
 }
 
-template<size_t MAX> void
+template<size_t MAX> 
+void
 TAO_Bounded_WString_Sequence<MAX>::_deallocate_buffer (void)
 {
   if (this->release_ == 0)
@@ -2795,18 +3212,19 @@ TAO_Bounded_WString_Sequence<MAX>::_deallocate_buffer (void)
       return;
     }
 
-  CORBA::WChar **tmp = ACE_reinterpret_cast (CORBA::WChar **,
-                                             this->buffer_);
+  CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **,
+                                              this->buffer_);
   TAO_Bounded_WString_Sequence<MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<size_t MAX> void
+template<size_t MAX> 
+void
 TAO_Bounded_WString_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
                                                    CORBA::ULong ol)
 {
-  CORBA::WChar **tmp = ACE_reinterpret_cast (CORBA::WChar **,
-                                             this->buffer_);
+  CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **,
+                                              this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
@@ -2815,9 +3233,10 @@ TAO_Bounded_WString_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
     }
 }
 
-template<size_t MAX> void
+template<size_t MAX> 
+void
 TAO_Bounded_WString_Sequence<MAX>::replace (CORBA::ULong length,
-                                            CORBA::WChar * *data,
+                                            CORBA::WChar ** data,
                                             CORBA::Boolean release)
 { 
   ACE_ASSERT (length < this->maximum_);
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 8999044018c..57dac1bd9d9 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_SEQUENCE_T_H
 #define TAO_SEQUENCE_T_H
 
@@ -30,7 +29,7 @@
  * This class completes the implementation for TAO_Base_Sequence
  * for the unbounded case.
  */
-template <class T>
+template <typename T>
 class TAO_Unbounded_Sequence : public TAO_Unbounded_Base_Sequence
 {
 public:
@@ -49,14 +48,14 @@ public:
    */
   TAO_Unbounded_Sequence (CORBA::ULong max,
                           CORBA::ULong length,
-                          T *data,
+                          T * data,
                           CORBA::Boolean release = 0);
 
   /// Copy constructor.
   TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<T> &);
 
   /// Assignment operator.
-  TAO_Unbounded_Sequence<T> &operator= (const TAO_Unbounded_Sequence<T> &);
+  TAO_Unbounded_Sequence<T> & operator= (const TAO_Unbounded_Sequence<T> &);
 
   /// Dtor.
   ~TAO_Unbounded_Sequence (void);
@@ -64,19 +63,21 @@ public:
   // = Accessors.
 
   /// operator []
-  T &operator[] (CORBA::ULong);
+  T & operator[] (CORBA::ULong);
 
   /// operator []
-  const T &operator[] (CORBA::ULong) const;
+  const T & operator[] (CORBA::ULong) const;
 
   // = Static operations.
 
   /// Allocate storage for the sequence.
-  static T *allocbuf (CORBA::ULong);
+  static T * allocbuf (CORBA::ULong);
 
   /// Free the sequence.
   static void freebuf (T *);
 
+  static void _tao_any_destructor (void *);
+
   /// Implement the TAO_Base_Sequence methods (see Sequence.h)
   virtual void _allocate_buffer (CORBA::ULong length);
   virtual void _deallocate_buffer (void);
@@ -110,7 +111,7 @@ public:
    * references), and then freeing the returned buffer itself using
    * <freebuf>.
    */
-  T *get_buffer (CORBA::Boolean orphan = 0);
+  T * get_buffer (CORBA::Boolean orphan = 0);
 
   /**
    * This function allows read-only access to the sequence buffer.
@@ -118,7 +119,7 @@ public:
    * yet been allocated.  No direct modification of the returned
    * buffer by the caller is permitted.
    */
-  const T *get_buffer (void) const;
+  const T * get_buffer (void) const;
 
   /**
    * Allows the buffer underlying a sequence to be replaced.  The
@@ -127,7 +128,7 @@ public:
    */
   void replace (CORBA::ULong max,
                 CORBA::ULong length,
-                T *data,
+                T * data,
                 CORBA::Boolean release = 0);
 };
 
@@ -141,7 +142,7 @@ public:
  * This class completes the implementation for TAO_Base_Sequence
  * for the bounded case.
  */
-template <class T, size_t MAX>
+template <typename T, size_t MAX>
 class TAO_Bounded_Sequence : public TAO_Bounded_Base_Sequence
 {
 public:
@@ -158,7 +159,7 @@ public:
   TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T,MAX> &);
 
   /// Assignment operator.
-  TAO_Bounded_Sequence<T,MAX> &operator= (
+  TAO_Bounded_Sequence<T,MAX> & operator= (
       const TAO_Bounded_Sequence<T,MAX> &
     );
 
@@ -167,19 +168,21 @@ public:
 
   // = Accessors.
   /// operator []
-  T &operator[] (CORBA::ULong);
+  T & operator[] (CORBA::ULong);
 
   /// operator []
-  const T &operator[] (CORBA::ULong) const;
+  const T & operator[] (CORBA::ULong) const;
 
   // = Static operations.
 
   /// Allocate storage for the sequence.
-  static T *allocbuf (CORBA::ULong);
+  static T * allocbuf (CORBA::ULong);
 
   /// Free the sequence.
   static void freebuf (T *);
 
+  static void _tao_any_destructor (void *);
+
   /// allocate a buffer of the requested length. The buffer is allocated for
   /// the right type
   virtual void _allocate_buffer (CORBA::ULong length);
@@ -218,7 +221,7 @@ public:
    * references), and then freeing the returned buffer itself using
    * <freebuf>.
    */
-  T *get_buffer (CORBA::Boolean orphan = 0);
+  T * get_buffer (CORBA::Boolean orphan = 0);
 
   /**
    * This function allows read-only access to the sequence buffer.
@@ -226,7 +229,7 @@ public:
    * yet been allocated.  No direct modification of the returned
    * buffer by the caller is permitted.
    */
-  const T *get_buffer (void) const;
+  const T * get_buffer (void) const;
 
   /**
    * Allows the buffer underlying a sequence to be replaced.  The
@@ -235,17 +238,33 @@ public:
    */
   void replace (CORBA::ULong max,
                 CORBA::ULong length,
-                T *data,
+                T * data,
                 CORBA::Boolean release = 0);
 };
 
 // *************************************************************
 
-template<class T,class T_var> class TAO_Unbounded_Object_Sequence;
+template<typename T,
+         typename T_var,
+         typename T_life,
+         typename T_cast>
+  class TAO_Unbounded_Object_Sequence;
 template<class T,class T_var> class TAO_Unbounded_Pseudo_Sequence;
-template<class T,class T_var> class TAO_Unbounded_Valuetype_Sequence;
-template<class T, class T_var, size_t MAX> class TAO_Bounded_Object_Sequence;
-template<class T, class T_var, size_t MAX> class TAO_Bounded_Valuetype_Sequence;
+template<typename T,
+         typename T_var,
+         typename T_life>
+  class TAO_Unbounded_Valuetype_Sequence;
+template<typename T,
+         typename T_var,
+         typename T_life,
+         typename T_cast,
+         size_t MAX>
+  class TAO_Bounded_Object_Sequence;
+template<typename T,
+         typename T_var,
+         typename T_life,
+         size_t MAX>
+  class TAO_Bounded_Valuetype_Sequence;
 template<size_t MAX> class TAO_Bounded_String_Sequence;
 
 // *************************************************************
@@ -274,10 +293,9 @@ template<size_t MAX> class TAO_Bounded_String_Sequence;
    * says that T_ptr *could* map to a type different to T* in the
    * particular case of TAO it does map to <T*>.
    */
-template<class T, class T_var>
+template<typename T, typename T_var, typename T_life>
 class TAO_Object_Manager
 {
-  friend class TAO_Unbounded_Object_Sequence<T,T_var>;
 public:
   // @@ Use partial template specialization here to give access only
   // to the right kind of sequence.
@@ -291,7 +309,7 @@ public:
    *   release value on the <rhs>.
    *   + In any case a new reference to the same object is created.
    */
-  TAO_Object_Manager (const TAO_Object_Manager<T,T_var> &rhs);
+  TAO_Object_Manager (const TAO_Object_Manager<T,T_var,T_life> & rhs);
 
   /**
    * Constructor from address of an element, it should be private and
@@ -309,43 +327,45 @@ public:
    * @@ TODO what happens if rhs.release_ is true an this->relase_ is
    * false?
    */
-  TAO_Object_Manager<T,T_var> &operator= (const TAO_Object_Manager<T,T_var> &rhs);
+  TAO_Object_Manager<T,T_var,T_life> & operator= (
+      const TAO_Object_Manager<T,T_var,T_life> & rhs
+    );
 
   /// Assignment from T *.
-  TAO_Object_Manager<T,T_var> &operator= (T *);
+  TAO_Object_Manager<T,T_var,T_life> & operator= (T *);
 
-  /// Assignment from T_var.
-  TAO_Object_Manager<T,T_var> &operator= (const T_var &);
+  /// Assignment from T_life.
+  TAO_Object_Manager<T,T_var,T_life> & operator= (const T_var &);
 
   /// Return pointer.
   T * operator-> (void) const;
 
   /// Cast (read-only).
-  operator const T *() const;
+  operator const T * () const;
 
   /// Cast.
-  operator T *&();
+  operator T *& ();
 
   /// Cast (read-only) so that assignment from a structured
   /// type to a T_var will make a copy.
-  operator const T_var() const;
+  operator const T_var () const;
 
   /// for in parameter.
-  T *in (void) const;
+  T * in (void) const;
 
   /// for inout parameter.
-  T *&inout (void);
+  T *& inout (void);
 
   /// for out parameter.
-  T *&out (void);
+  T *& out (void);
 
   /// for return type
-  T *_retn (void);
+  T * _retn (void);
 
 private:
   /// data member, notice that it is a pointer, to implement the
   /// reference behavior for assignment.
-  T **ptr_;
+  T ** ptr_;
 
   /// release flag based on parent's flag
   CORBA::Boolean release_;
@@ -359,7 +379,7 @@ private:
    * @brief Manager for Pseudo Objects.
    *
    */
-template<class T, class T_var>
+template<typename T, typename T_var>
 class TAO_Pseudo_Object_Manager
 {
   friend class TAO_Unbounded_Pseudo_Sequence<T,T_var>;
@@ -376,7 +396,7 @@ public:
    *   release value on the <rhs>.
    *   + In any case a new reference to the same object is created.
    */
-  TAO_Pseudo_Object_Manager (const TAO_Pseudo_Object_Manager<T,T_var> &rhs);
+  TAO_Pseudo_Object_Manager (const TAO_Pseudo_Object_Manager<T,T_var> & rhs);
 
   /**
    * Constructor from address of an element, it should be private and
@@ -394,39 +414,41 @@ public:
    * @@ TODO what happens if rhs.release_ is true an this->relase_ is
    * false?
    */
-  TAO_Pseudo_Object_Manager<T,T_var> &operator= (const TAO_Pseudo_Object_Manager<T,T_var> &rhs);
+  TAO_Pseudo_Object_Manager<T,T_var> & operator= (
+      const TAO_Pseudo_Object_Manager<T,T_var> & rhs
+    );
 
   /// Assignment from T *.
-  TAO_Pseudo_Object_Manager<T,T_var> &operator= (T *);
+  TAO_Pseudo_Object_Manager<T,T_var> & operator= (T *);
 
   /// Assignment from T_var.
-  TAO_Pseudo_Object_Manager<T,T_var> &operator= (const T_var &);
+  TAO_Pseudo_Object_Manager<T,T_var> & operator= (const T_var &);
 
   /// Return pointer.
   T * operator-> (void) const;
 
   /// Cast (read-only).
-  operator const T *() const;
+  operator const T * () const;
 
   /// Cast.
-  operator T *&();
+  operator T *& ();
 
   /// for in parameter.
-  T *in (void) const;
+  T * in (void) const;
 
   /// for inout parameter.
-  T *&inout (void);
+  T *& inout (void);
 
   /// for out parameter.
-  T *&out (void);
+  T *& out (void);
 
   /// for return type
-  T *_retn (void);
+  T * _retn (void);
 
 private:
   /// data member, notice that it is a pointer, to implement the
   /// reference behavior for assignment.
-  T **ptr_;
+  T ** ptr_;
 
   /// release flag based on parent's flag
   CORBA::Boolean release_;
@@ -444,10 +466,10 @@ private:
    *
    * @see TAO_Object_Manager
    */
-template<class T, class T_var>
+template<typename T, typename T_var, typename T_life>
 class TAO_Valuetype_Manager
 {
-  friend class TAO_Unbounded_Valuetype_Sequence<T,T_var>;
+  friend class TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>;
 public:
   // @@ Use partial template specialization here to give access only
   // to the right kind of sequence.
@@ -461,14 +483,14 @@ public:
    *   release value on the <rhs>.
    *   + In any case a new reference to the same object is created.
    */
-  TAO_Valuetype_Manager (const TAO_Valuetype_Manager<T,T_var> &rhs);
+  TAO_Valuetype_Manager (const TAO_Valuetype_Manager<T,T_var,T_life> & rhs);
 
   /**
    * Constructor from address of an element, it should be private and
    * only TAO_*_Object_Sequence would use it, but we have some
    * problems with friendship and templates.
    */
-  TAO_Valuetype_Manager (T **, 
+  TAO_Valuetype_Manager (T **,
                          CORBA::Boolean release);
 
   /// Destructor, only releases the object if <release_> is true.
@@ -480,43 +502,45 @@ public:
    * @@ TODO what happens if rhs.release_ is true an this->relase_ is
    * false?
    */
-  TAO_Valuetype_Manager<T,T_var> &operator= (const TAO_Valuetype_Manager<T,T_var> &rhs);
+  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (
+      const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
+    );
 
   /// Assignment from T *.
-  TAO_Valuetype_Manager<T,T_var> &operator= (T *);
+  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (T *);
 
   /// Assignment from T_var.
-  TAO_Valuetype_Manager<T,T_var> &operator= (const T_var &);
+  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (const T_var &);
 
   /// Return pointer.
   T * operator-> (void) const;
 
   /// Cast (read-only).
-  operator const T *() const;
+  operator const T * () const;
 
   /// Cast.
-  operator T *&();
+  operator T *& ();
 
   /// Cast (read-only) so that assignment from a structured
   /// type to a T_var will make a copy.
   operator const T_var() const;
 
   /// for in parameter.
-  T *in (void) const;
+  T * in (void) const;
 
   /// for inout parameter.
-  T *&inout (void);
+  T *& inout (void);
 
   /// for out parameter.
-  T *&out (void);
+  T * &out (void);
 
   /// for return type
-  T *_retn (void);
+  T * _retn (void);
 
 private:
   /// data member, notice that it is a pointer, to implement the
   /// reference behavior for assignment.
-  T **ptr_;
+  T ** ptr_;
 
   /// release flag based on parent's flag
   CORBA::Boolean release_;
@@ -534,7 +558,7 @@ private:
    *
    * @see TAO_Object_Manager
    */
-template<class T, class T_var>
+template<typename T, typename T_var, typename T_life>
 class TAO_Abstract_Manager
 {
 //  friend class TAO_Unbounded_Abstract_Sequence<T,T_var>;
@@ -546,14 +570,14 @@ public:
    *   release value on the <rhs>.
    *   + In any case a new reference to the same object is created.
    */
-  TAO_Abstract_Manager (const TAO_Abstract_Manager<T,T_var> &rhs);
+  TAO_Abstract_Manager (const TAO_Abstract_Manager<T,T_var,T_life> & rhs);
 
   /**
    * Constructor from address of an element, it should be private and
    * only TAO_*_Object_Sequence would use it, but we have some
    * problems with friendship and templates.
    */
-  TAO_Abstract_Manager (T **, 
+  TAO_Abstract_Manager (T **,
                         CORBA::Boolean release);
 
   /// Destructor, only releases the object if <release_> is true.
@@ -565,29 +589,31 @@ public:
    * @@ TODO what happens if rhs.release_ is true an this->relase_ is
    * false?
    */
-  TAO_Abstract_Manager<T,T_var> &operator= (const TAO_Abstract_Manager<T,T_var> &rhs);
+  TAO_Abstract_Manager<T,T_var,T_life> & operator= (
+      const TAO_Abstract_Manager<T,T_var,T_life> & rhs
+    );
 
   /// Assignment from T *.
-  TAO_Abstract_Manager<T,T_var> &operator= (T *);
+  TAO_Abstract_Manager<T,T_var,T_life> & operator= (T *);
 
   /// Assignment from T_var.
-  TAO_Abstract_Manager<T,T_var> &operator= (const T_var &);
+  TAO_Abstract_Manager<T,T_var,T_life> & operator= (const T_var &);
 
   /// Return pointer.
-  T *operator-> (void) const;
+  T * operator-> (void) const;
 
   /// Cast (read-only).
-  operator const T *() const;
+  operator const T * () const;
 
   /// Cast.
-  operator T *&();
+  operator T *& ();
 
   /// Cast (read-only) so that assignment from a structured
   /// type to a T_var will make a copy.
   operator const T_var () const;
 
   /// for in parameter.
-  T *in (void) const;
+  T * in (void) const;
 
   /// for inout parameter.
   T *& inout (void);
@@ -596,12 +622,12 @@ public:
   T *& out (void);
 
   /// for return type
-  T *_retn (void);
+  T * _retn (void);
 
 private:
   /// data member, notice that it is a pointer, to implement the
   /// reference behavior for assignment.
-  T **ptr_;
+  T ** ptr_;
 
   /// release flag based on parent's flag
   CORBA::Boolean release_;
@@ -618,7 +644,10 @@ private:
  * class, in charge of handling the object lifetime, examples are
  * pseudo objects, object references, valuetypes, and strings.
  */
-template<class T,class T_var>
+template<typename T,
+         typename T_var,
+         typename T_life,
+         typename T_cast>
 class TAO_Unbounded_Object_Sequence : public TAO_Unbounded_Base_Sequence
 {
 
@@ -669,8 +698,8 @@ public:
    */
   TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
                                  CORBA::ULong length,
-                                 T* *data,
-                                 CORBA::Boolean release=0);
+                                 T ** data,
+                                 CORBA::Boolean release = 0);
 
   /**
    * The copy constructor performs a deep copy from the existing
@@ -683,7 +712,9 @@ public:
    * elements (items zero through length-1), and sets the release
    * flag to TRUE.
    */
-  TAO_Unbounded_Object_Sequence(const TAO_Unbounded_Object_Sequence<T,T_var> &);
+  TAO_Unbounded_Object_Sequence (
+      const TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast> &
+    );
 
   /// The destructor releases all object reference memebrs and frees
   /// all string members.
@@ -707,10 +738,14 @@ public:
    * the reallocation is performed. After reallocation, the release
    * flag is always set to TRUE.
    */
-  TAO_Unbounded_Object_Sequence<T,T_var> &operator= (const TAO_Unbounded_Object_Sequence <T,T_var> &);
+  TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast> &operator= (
+      const TAO_Unbounded_Object_Sequence <T,T_var,T_life,T_cast> &
+    );
 
   /// read-write accessor
-  TAO_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Object_Manager<T,T_var,T_life> operator[] (
+      CORBA::ULong slot
+    ) const;
 
   /**
    * The allocbuf function allocates a vector of T elements that can
@@ -723,7 +758,7 @@ public:
    * reason cannot allocate the requested vector. Vectors allocated by
    * allocbuf should be freed using the freebuf function.
    */
-  static T **allocbuf (CORBA::ULong);
+  static T ** allocbuf (CORBA::ULong);
 
   /**
    * The freebuf function ensures that the destructor for each element
@@ -741,10 +776,10 @@ public:
   virtual void _deallocate_buffer (void);
   virtual void _shrink_buffer (CORBA::ULong new_length,
                                CORBA::ULong old_length);
-  virtual void _downcast (void* target,
-                          CORBA::Object* src
+  virtual void _downcast (void * target,
+                          CORBA::Object_ptr src
                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  virtual CORBA::Object* _upcast (void* src) const;
+  virtual CORBA::Object_ptr _upcast (void * src) const;
 };
 
 // *************************************************************
@@ -756,7 +791,11 @@ public:
  *
  * Please see the documentation for the unbounded case.
  */
-template<class T, class T_var, size_t MAX>
+template<typename T,
+         typename T_var,
+         typename T_life,
+         typename T_cast,
+         size_t MAX>
 class TAO_Bounded_Object_Sequence : public TAO_Bounded_Base_Sequence
 {
 public:
@@ -773,27 +812,33 @@ public:
 
   /// Constructor from data.
   TAO_Bounded_Object_Sequence (CORBA::ULong length,
-                               T* *value,
-                               CORBA::Boolean release=0);
+                               T ** value,
+                               CORBA::Boolean release = 0);
 
   /// Copy constructor.
-  TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T,T_var,MAX> &);
+  TAO_Bounded_Object_Sequence (
+      const TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX> &
+    );
 
   /// destructor
   ~TAO_Bounded_Object_Sequence (void);
 
   /// Assignment from another Bounded sequence.
-  TAO_Bounded_Object_Sequence &operator= (const TAO_Bounded_Object_Sequence<T,T_var,MAX> &);
+  TAO_Bounded_Object_Sequence &operator= (
+      const TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX> &
+    );
 
   /// Read-write accessor.
-  TAO_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Object_Manager<T,T_var,T_life> operator[] (
+      CORBA::ULong slot
+    ) const;
 
   /// Allocate storage for a sequence..
-  static T **allocbuf (CORBA::ULong length);
+  static T ** allocbuf (CORBA::ULong length);
 
   /// Free a buffer allocated by allocbuf() and release each element on
   /// it.
-  static void freebuf (T **buffer);
+  static void freebuf (T ** buffer);
 
   // The Base_Sequence functions, please see "tao/sequence.h"
   /// No default to workaround egcs problem with templates and
@@ -802,10 +847,10 @@ public:
   virtual void _deallocate_buffer (void);
   virtual void _shrink_buffer (CORBA::ULong new_length,
                                CORBA::ULong old_length);
-  virtual void _downcast (void* target,
-                          CORBA::Object* src
+  virtual void _downcast (void * target,
+                          CORBA::Object_ptr src
                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  virtual CORBA::Object* _upcast (void* src) const;
+  virtual CORBA::Object_ptr _upcast (void * src) const;
 };
 
 // *************************************************************
@@ -823,7 +868,7 @@ public:
  * TAO internal details. The complete documentation of each method
  * is provided in TAO_Unbounded_Object_Sequece
  */
-template<class T,class T_var>
+template<typename T, typename T_var>
 class TAO_Unbounded_Pseudo_Sequence : public TAO_Unbounded_Base_Sequence
 {
 public:
@@ -838,11 +883,13 @@ public:
   /// Constructor with a given buffer.
   TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
                                  CORBA::ULong length,
-                                 T* *data,
-                                 CORBA::Boolean release=0);
+                                 T ** data,
+                                 CORBA::Boolean release = 0);
 
   /// Copy ctor, deep copies.
-  TAO_Unbounded_Pseudo_Sequence(const TAO_Unbounded_Pseudo_Sequence<T,T_var> &);
+  TAO_Unbounded_Pseudo_Sequence (
+      const TAO_Unbounded_Pseudo_Sequence<T,T_var> &
+    );
 
   /// dtor releases all the contained elements.
   ~TAO_Unbounded_Pseudo_Sequence (void);
@@ -852,14 +899,16 @@ public:
    * members and frees all string members, and then performs a
    * deepcopy to create a new structure.
    */
-  TAO_Unbounded_Pseudo_Sequence<T,T_var> &operator= (const TAO_Unbounded_Pseudo_Sequence <T,T_var> &);
+  TAO_Unbounded_Pseudo_Sequence<T,T_var> & operator= (
+      const TAO_Unbounded_Pseudo_Sequence <T,T_var> &
+    );
 
   /// read-write accessor
   TAO_Pseudo_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
 
   /// The allocbuf function allocates a vector of T elements that can
   /// be passed to the T *data constructor.
-  static T **allocbuf (CORBA::ULong);
+  static T ** allocbuf (CORBA::ULong);
 
   /// Release all the elements.
   static void freebuf (T **);
@@ -880,7 +929,7 @@ public:
  *
  * Please see the documentation for the unbounded case.
  */
-template<class T, class T_var, size_t MAX>
+template<typename T, typename T_var, size_t MAX>
 class TAO_Bounded_Pseudo_Sequence : public TAO_Bounded_Base_Sequence
 {
 public:
@@ -891,27 +940,31 @@ public:
 
   /// Constructor from data.
   TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
-                               T* *value,
-                               CORBA::Boolean release=0);
+                               T ** value,
+                               CORBA::Boolean release = 0);
 
   /// Copy constructor.
-  TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &);
+  TAO_Bounded_Pseudo_Sequence (
+      const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &
+    );
 
   /// destructor
   ~TAO_Bounded_Pseudo_Sequence (void);
 
   /// Assignment from another Bounded sequence.
-  TAO_Bounded_Pseudo_Sequence &operator= (const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &);
+  TAO_Bounded_Pseudo_Sequence & operator= (
+      const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &
+    );
 
   /// Read-write accessor.
   TAO_Pseudo_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
 
   /// Allocate storage for a sequence..
-  static T **allocbuf (CORBA::ULong length);
+  static T ** allocbuf (CORBA::ULong length);
 
   /// Free a buffer allocated by allocbuf() and release each element on
   /// it.
-  static void freebuf (T **buffer);
+  static void freebuf (T ** buffer);
 
   // The Base_Sequence functions, please see "tao/sequence.h"
   virtual void _allocate_buffer (CORBA::ULong length);
@@ -929,7 +982,7 @@ public:
  *
  * @see TAO_Unbounded_Object_Sequence
  */
-template<class T,class T_var>
+template<typename T, typename T_var, typename T_life>
 class TAO_Unbounded_Valuetype_Sequence : public TAO_Unbounded_Base_Sequence
 {
 public:
@@ -944,12 +997,12 @@ public:
   /// Constructor with a given buffer.
   TAO_Unbounded_Valuetype_Sequence (CORBA::ULong maximum,
                                     CORBA::ULong length,
-                                    T* *data,
-                                    CORBA::Boolean release=0);
+                                    T ** data,
+                                    CORBA::Boolean release = 0);
 
   /// Copy ctor, deep copies.
   TAO_Unbounded_Valuetype_Sequence (
-      const TAO_Unbounded_Valuetype_Sequence<T,T_var> &
+      const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> &
     );
 
   /// The destructor releases all object reference memebrs and frees
@@ -961,16 +1014,16 @@ public:
    * members and frees all string members, and then performs a
    * deepcopy to create a new structure.
    */
-  TAO_Unbounded_Valuetype_Sequence<T,T_var> &operator= (
-      const TAO_Unbounded_Valuetype_Sequence <T,T_var> &
+  TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & operator= (
+      const TAO_Unbounded_Valuetype_Sequence <T,T_var,T_life> &
     );
 
   /// read-write accessor
-  TAO_Valuetype_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Valuetype_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
 
   /// The allocbuf function allocates a vector of T elements that can
   /// be passed to the T *data constructor.
-  static T **allocbuf (CORBA::ULong);
+  static T ** allocbuf (CORBA::ULong);
 
   /// Release all the elements.
   static void freebuf (T **);
@@ -993,7 +1046,7 @@ public:
  *
  * Please see the documentation for the unbounded case.
  */
-template<class T, class T_var, size_t MAX>
+template<typename T, typename T_var, typename T_life, size_t MAX>
 class TAO_Bounded_Valuetype_Sequence : public TAO_Bounded_Base_Sequence
 {
 public:
@@ -1004,12 +1057,12 @@ public:
 
   /// Constructor from data.
   TAO_Bounded_Valuetype_Sequence (CORBA::ULong length,
-                                  T* *value,
-                                  CORBA::Boolean release=0);
+                                  T ** value,
+                                  CORBA::Boolean release = 0);
 
   /// Copy constructor.
   TAO_Bounded_Valuetype_Sequence (
-      const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> &
+      const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> &
     );
 
   /// destructor
@@ -1017,18 +1070,18 @@ public:
 
   /// Assignment from another Bounded sequence.
   TAO_Bounded_Valuetype_Sequence &operator= (
-      const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> &
+      const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> &
     );
 
   /// Read-write accessor.
-  TAO_Valuetype_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Valuetype_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
 
   /// Allocate storage for a sequence..
-  static T **allocbuf (CORBA::ULong length);
+  static T ** allocbuf (CORBA::ULong length);
 
   /// Free a buffer allocated by allocbuf() and release each element on
   /// it.
-  static void freebuf (T **buffer);
+  static void freebuf (T ** buffer);
 
   // The Base_Sequence functions, please see "tao/sequence.h"
   /// No default to workaround egcs problem with templates and
@@ -1048,7 +1101,7 @@ public:
  *
  * @see TAO_Unbounded_Object_Sequence
  */
-template<class T,class T_var>
+template<typename T, typename T_var, typename T_life>
 class TAO_Unbounded_Abstract_Sequence : public TAO_Unbounded_Base_Sequence
 {
 public:
@@ -1063,12 +1116,12 @@ public:
   /// Constructor with a given buffer.
   TAO_Unbounded_Abstract_Sequence (CORBA::ULong maximum,
                                    CORBA::ULong length,
-                                   T* *data,
-                                   CORBA::Boolean release=0);
+                                   T ** data,
+                                   CORBA::Boolean release = 0);
 
   /// Copy ctor, deep copies.
   TAO_Unbounded_Abstract_Sequence (
-      const TAO_Unbounded_Abstract_Sequence<T,T_var> &
+      const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &
     );
 
   /// The destructor releases all object reference memebrs and frees
@@ -1080,16 +1133,16 @@ public:
    * members and frees all string members, and then performs a
    * deepcopy to create a new structure.
    */
-  TAO_Unbounded_Abstract_Sequence<T,T_var> &operator= (
-      const TAO_Unbounded_Abstract_Sequence <T,T_var> &
+  TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &operator= (
+      const TAO_Unbounded_Abstract_Sequence <T,T_var,T_life> &
     );
 
   /// read-write accessor
-  TAO_Abstract_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Abstract_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
 
   /// The allocbuf function allocates a vector of T elements that can
   /// be passed to the T *data constructor.
-  static T **allocbuf (CORBA::ULong);
+  static T ** allocbuf (CORBA::ULong);
 
   /// Release all the elements.
   static void freebuf (T **);
@@ -1112,7 +1165,7 @@ public:
  *
  * Please see the documentation for the unbounded case.
  */
-template<class T, class T_var, size_t MAX>
+template<typename T, typename T_var, typename T_life, size_t MAX>
 class TAO_Bounded_Abstract_Sequence : public TAO_Bounded_Base_Sequence
 {
 public:
@@ -1123,12 +1176,12 @@ public:
 
   /// Constructor from data.
   TAO_Bounded_Abstract_Sequence (CORBA::ULong length,
-                                 T* *value,
-                                 CORBA::Boolean release=0);
+                                 T ** value,
+                                 CORBA::Boolean release = 0);
 
   /// Copy constructor.
   TAO_Bounded_Abstract_Sequence (
-      const TAO_Bounded_Abstract_Sequence<T,T_var,MAX> &
+      const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
     );
 
   /// destructor
@@ -1136,18 +1189,18 @@ public:
 
   /// Assignment from another Bounded sequence.
   TAO_Bounded_Abstract_Sequence &operator= (
-      const TAO_Bounded_Abstract_Sequence<T,T_var,MAX> &
+      const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
     );
 
   /// Read-write accessor.
-  TAO_Abstract_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Abstract_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
 
   /// Allocate storage for a sequence..
-  static T **allocbuf (CORBA::ULong length);
+  static T ** allocbuf (CORBA::ULong length);
 
   /// Free a buffer allocated by allocbuf() and release each element on
   /// it.
-  static void freebuf (T **buffer);
+  static void freebuf (T ** buffer);
 
   // The Base_Sequence functions, please see "tao/sequence.h"
   /// No default to workaround egcs problem with templates and
@@ -1187,11 +1240,11 @@ public:
   /// Constructor with a given buffer.
   TAO_Unbounded_Array_Sequence (CORBA::ULong maximum,
                                 CORBA::ULong length,
-                                T *data,
-                                CORBA::Boolean release=0);
+                                T * data,
+                                CORBA::Boolean release = 0);
 
   /// Copy ctor, deep copies.
-  TAO_Unbounded_Array_Sequence(const TAO_Unbounded_Array_Sequence<T, T_var> &);
+  TAO_Unbounded_Array_Sequence(const TAO_Unbounded_Array_Sequence<T,T_var> &);
 
   /// dtor releases all the contained elements.
   ~TAO_Unbounded_Array_Sequence (void);
@@ -1201,24 +1254,26 @@ public:
    * members and frees all string members, and then performs a
    * deepcopy to create a new structure.
    */
-  TAO_Unbounded_Array_Sequence<T, T_var> &operator= (
-      const TAO_Unbounded_Array_Sequence <T, T_var> &
+  TAO_Unbounded_Array_Sequence<T,T_var> & operator= (
+      const TAO_Unbounded_Array_Sequence <T,T_var> &
     );
 
   // = Accessors.
   /// operator []
-  T &operator[] (CORBA::ULong);
+  T & operator[] (CORBA::ULong);
 
   /// operator []
-  const T &operator[] (CORBA::ULong) const;
+  const T & operator[] (CORBA::ULong) const;
 
   /// The allocbuf function allocates a vector of T elements that can
   /// be passed to the T *data constructor.
-  static T *allocbuf (CORBA::ULong);
+  static T * allocbuf (CORBA::ULong);
 
   /// Release all the elements.
   static void freebuf (T *);
 
+  static void _tao_any_destructor (void *);
+
   /// allocate a buffer of the requested length. The buffer is allocated for the
   /// right type
   virtual void _allocate_buffer (CORBA::ULong length);
@@ -1249,7 +1304,7 @@ public:
    * references), and then freeing the returned buffer itself using
    * <freebuf>.
    */
-  T *get_buffer (CORBA::Boolean orphan = 0);
+  T * get_buffer (CORBA::Boolean orphan = 0);
 
   /**
    * This function allows read-only access to the sequence buffer.
@@ -1257,7 +1312,7 @@ public:
    * yet been allocated.  No direct modification of the returned
    * buffer by the caller is permitted.
    */
-  const T *get_buffer (void) const;
+  const T * get_buffer (void) const;
 
   /**
    * Allows the buffer underlying a sequence to be replaced.  The
@@ -1266,7 +1321,7 @@ public:
    */
   void replace (CORBA::ULong max,
                 CORBA::ULong length,
-                T *data,
+                T * data,
                 CORBA::Boolean release = 0);
 };
 
@@ -1310,11 +1365,13 @@ public:
   const T &operator[] (CORBA::ULong) const;
 
   /// Allocate storage for a sequence..
-  static T *allocbuf (CORBA::ULong length);
+  static T * allocbuf (CORBA::ULong length);
 
   /// Free a buffer allocated by allocbuf() and release each element on
   /// it.
-  static void freebuf (T *buffer);
+  static void freebuf (T * buffer);
+
+  static void _tao_any_destructor (void *);
 
   /// allocate a buffer of the requested length. The buffer is allocated for the
   /// right type
@@ -1346,7 +1403,7 @@ public:
    * references), and then freeing the returned buffer itself using
    * <freebuf>.
    */
-  T *get_buffer (CORBA::Boolean orphan = 0);
+  T * get_buffer (CORBA::Boolean orphan = 0);
 
   /**
    * This function allows read-only access to the sequence buffer.
@@ -1354,7 +1411,7 @@ public:
    * yet been allocated.  No direct modification of the returned
    * buffer by the caller is permitted.
    */
-  const T *get_buffer (void) const;
+  const T * get_buffer (void) const;
 
   /**
    * Allows the buffer underlying a sequence to be replaced.  The
@@ -1408,7 +1465,7 @@ public:
    * it to freebuf when finished with it.
    */
   TAO_Bounded_String_Sequence (CORBA::ULong length,
-                               char* *value,
+                               char ** value,
                                CORBA::Boolean release = 0);
 
   /**
@@ -1427,7 +1484,9 @@ public:
    * is destroyed via its destructor and then the source sequence
    * copied using the copy constructor.
    */
-  TAO_Bounded_String_Sequence &operator= (const TAO_Bounded_String_Sequence<MAX> &);
+  TAO_Bounded_String_Sequence & operator= (
+      const TAO_Bounded_String_Sequence<MAX> &
+    );
 
   /**
    * {SPEC}
@@ -1451,7 +1510,7 @@ public:
    * reason cannot allocate the requested vector. Vectors allocated by
    * allocbuf should be freed using the freebuf function.
    */
-  static char **allocbuf (CORBA::ULong length);
+  static char ** allocbuf (CORBA::ULong length);
 
   /**
    * {SPEC}
@@ -1461,7 +1520,9 @@ public:
    * reference elements, which are freed using release(). The freebuf
    * function will ignore null pointers passed to it.
    */
-  static void freebuf (char **buffer);
+  static void freebuf (char ** buffer);
+
+  static void _tao_any_destructor (void *);
 
   // Functions to create, destroy, and adjust the underlying buffer.
   virtual void _allocate_buffer (CORBA::ULong length);
@@ -1471,7 +1532,7 @@ public:
 
   // Parameters work the same as in constructor of the same signature.
   void replace (CORBA::ULong length,
-                char* *value,
+                char ** value,
                 CORBA::Boolean release = 0);
 };
 
@@ -1516,7 +1577,7 @@ public:
    * it to freebuf when finished with it.
    */
   TAO_Bounded_WString_Sequence (CORBA::ULong length,
-                                CORBA::WChar* *value,
+                                CORBA::WChar ** value,
                                 CORBA::Boolean release = 0);
 
   /**
@@ -1535,7 +1596,9 @@ public:
    * is destroyed via its destructor and then the source sequence
    * copied using the copy constructor.
    */
-  TAO_Bounded_WString_Sequence &operator= (const TAO_Bounded_WString_Sequence<MAX> &);
+  TAO_Bounded_WString_Sequence &operator= (
+      const TAO_Bounded_WString_Sequence<MAX> &
+    );
 
   /**
    * {SPEC}
@@ -1559,7 +1622,7 @@ public:
    * reason cannot allocate the requested vector. Vectors allocated by
    * allocbuf should be freed using the freebuf function.
    */
-  static CORBA::WChar **allocbuf (CORBA::ULong length);
+  static CORBA::WChar ** allocbuf (CORBA::ULong length);
 
   /**
    * {SPEC}
@@ -1569,7 +1632,9 @@ public:
    * reference elements, which are freed using release(). The freebuf
    * function will ignore null pointers passed to it.
    */
-  static void freebuf (CORBA::WChar **buffer);
+  static void freebuf (CORBA::WChar ** buffer);
+
+  static void _tao_any_destructor (void *);
 
   // Functions to create, destroy, and adjust the underlying buffer.
   virtual void _allocate_buffer (CORBA::ULong length);
@@ -1579,7 +1644,7 @@ public:
 
   // Parameters work the same as in constructor of the same signature.
   void replace (CORBA::ULong length,
-                CORBA::WChar* *value,
+                CORBA::WChar ** value,
                 CORBA::Boolean release = 0);
 };
 
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index 18e213d2323..f9719391cab 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -5,206 +5,115 @@
 // Operations on the generic unbounded sequence class.
 // ***************************************************
 
-template <class T> ACE_INLINE T *
+template <typename T> 
+ACE_INLINE 
+T *
 TAO_Unbounded_Sequence<T>::allocbuf (CORBA::ULong size)
 {
   return new T[size];
 }
 
-template <class T> ACE_INLINE void
+template <typename T> 
+ACE_INLINE 
+void
 TAO_Unbounded_Sequence<T>::freebuf (T *buffer)
 {
   delete [] buffer;
 }
 
-template <class T> ACE_INLINE
+template <typename T> 
+ACE_INLINE
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (void)
 {
 }
 
-template <class T> ACE_INLINE
+template <typename T> 
+ACE_INLINE
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (maximum,
                                  TAO_Unbounded_Sequence<T>::allocbuf (maximum))
 {
 }
 
-template <class T> ACE_INLINE
+template <typename T> 
+ACE_INLINE
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
                                                    CORBA::ULong length,
-                                                   T *data,
+                                                   T * data,
                                                    CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
 {
 }
 
-template <class T> ACE_INLINE T *
-TAO_Unbounded_Sequence<T>::get_buffer (CORBA::Boolean orphan)
-{
-  T *result = 0;
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          if (this->length_ > 0)
-            {
-              result = TAO_Unbounded_Sequence<T>::allocbuf (this->length_);
-              this->buffer_ = result;
-	      this->release_ = 1;
-            }
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (T*, 
-	                          this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      result = ACE_reinterpret_cast (T*,
-	                             this->buffer_);
-
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-
-  return result;
-}
-
-template <class T> ACE_INLINE const T *
+template <typename T> 
+ACE_INLINE 
+const T *
 TAO_Unbounded_Sequence<T>::get_buffer (void) const
 {
   return ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_);
 }
 
-template <class T> ACE_INLINE void
-TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
-                                    CORBA::ULong length,
-                                    T *data,
-                                    CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T *tmp = ACE_reinterpret_cast(T*,this->buffer_);
-      TAO_Unbounded_Sequence<T>::freebuf (tmp);
-    }
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
 // ***************************************************
 // operations on the generic Bounded sequence class
 // ***************************************************
 
-template <class T, size_t MAX> ACE_INLINE T *
+template <typename T, size_t MAX> 
+ACE_INLINE 
+T *
 TAO_Bounded_Sequence<T, MAX>::allocbuf (CORBA::ULong)
 {
   return new T[MAX];
 }
 
-template <class T, size_t MAX> ACE_INLINE void
-TAO_Bounded_Sequence<T, MAX>::freebuf (T *buffer)
+template <typename T, size_t MAX> 
+ACE_INLINE 
+void
+TAO_Bounded_Sequence<T, MAX>::freebuf (T * buffer)
 {
   delete [] buffer;
 }
 
-template <class T, size_t MAX> ACE_INLINE
+template <typename T, size_t MAX> 
+ACE_INLINE
 TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (void)
 {
   this->maximum_ = MAX;
 }
 
-template <class T, size_t MAX> ACE_INLINE
+template <typename T, size_t MAX> 
+ACE_INLINE
 TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
-                                                    T *data,
+                                                    T * data,
                                                     CORBA::Boolean release)
   : TAO_Bounded_Base_Sequence (MAX, length, data, release)
 {
 }
 
-template <class T, size_t MAX> ACE_INLINE T *
-TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
-{
-  T *result = 0;
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          result = TAO_Bounded_Sequence<T,MAX>::allocbuf (this->maximum_);
-          this->buffer_ = result;
-	  this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (T*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = ACE_reinterpret_cast(T*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  return result;
-}
-
-template <class T, size_t MAX> ACE_INLINE const T *
+template <typename T, size_t MAX> 
+ACE_INLINE 
+const T *
 TAO_Bounded_Sequence<T, MAX>::get_buffer (void) const
 {
-  return ACE_reinterpret_cast(const T * ACE_CAST_CONST, this->buffer_);
-}
-
-template <class T, size_t MAX> ACE_INLINE void
-TAO_Bounded_Sequence<T, MAX>::replace (CORBA::ULong max,
-                                       CORBA::ULong length,
-                                       T *data,
-                                       CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T* tmp = ACE_reinterpret_cast(T*, this->buffer_);
-      TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
-    }
-  this->buffer_ = data;
-  this->release_ = release;
+  return ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_);
 }
 
-template <class T, size_t MAX> ACE_INLINE T &
+template <class T, size_t MAX> 
+ACE_INLINE 
+T &
 TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
-  T *tmp = ACE_reinterpret_cast (T*,this->buffer_);
+  T * tmp = ACE_reinterpret_cast (T *,this->buffer_);
   return tmp[i];
 }
 
-template <class T, size_t MAX> ACE_INLINE const T &
+template <class T, size_t MAX> 
+ACE_INLINE 
+const T &
 TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
-  const T* tmp = ACE_reinterpret_cast (const T* ACE_CAST_CONST,this->buffer_);
+  const T * tmp = ACE_reinterpret_cast (const T * ACE_CAST_CONST,this->buffer_);
   return tmp[i];
 }
 
@@ -212,117 +121,149 @@ TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
 // Inline operations for class TAO_Object_Manager<T>
 // *************************************************************
 
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::~TAO_Object_Manager (void)
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Object_Manager<T,T_var,T_life>::~TAO_Object_Manager (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::TAO_Object_Manager (const TAO_Object_Manager<T,T_var> &rhs)
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Object_Manager<T,T_var,T_life>::TAO_Object_Manager (
+    const TAO_Object_Manager<T,T_var,T_life> & rhs
+  )
   : ptr_ (rhs.ptr_),
     release_ (rhs.release_)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::TAO_Object_Manager(T** buffer, CORBA::Boolean release)
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Object_Manager<T,T_var,T_life>::TAO_Object_Manager (
+    T ** buffer, 
+    CORBA::Boolean release
+  )
   : ptr_ (buffer),
     release_ (release)
 {
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::operator-> (void) const
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE T *
+TAO_Object_Manager<T,T_var,T_life>::operator-> (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator const T_var () const
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Object_Manager<T,T_var,T_life>::operator const T_var () const
 {
-  return T_var::tao_duplicate (*this->ptr_);
+  return T_life::tao_duplicate (*this->ptr_);
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator const T* () const // cast
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Object_Manager<T,T_var,T_life>::operator const T *() const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator T* &() // cast
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Object_Manager<T,T_var,T_life>::operator T *&()
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::in (void) const
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *
+TAO_Object_Manager<T,T_var,T_life>::in (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Object_Manager<T,T_var>::inout (void)
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *&
+TAO_Object_Manager<T,T_var,T_life>::inout (void)
 {
   return *this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class TAO_Pseudo_Object_Manager<T>
+// Inline operations for class TAO_Pseudo_Object_Manager<T,T_var>
 // *************************************************************
 
-template <class T, class T_var> ACE_INLINE
+template <typename T, typename T_var>
+ACE_INLINE
 TAO_Pseudo_Object_Manager<T,T_var>::~TAO_Pseudo_Object_Manager (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::
-    TAO_Pseudo_Object_Manager (const TAO_Pseudo_Object_Manager<T,T_var> &rhs)
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T,T_var>::TAO_Pseudo_Object_Manager (
+    const TAO_Pseudo_Object_Manager<T,T_var> & rhs
+  )
   : ptr_ (rhs.ptr_),
     release_ (rhs.release_)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::
-    TAO_Pseudo_Object_Manager(T** buffer, CORBA::Boolean release)
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T,T_var>::TAO_Pseudo_Object_Manager(
+    T ** buffer, 
+    CORBA::Boolean release
+  )
   : ptr_ (buffer),
     release_ (release)
 {
 }
 
-template <class T, class T_var> ACE_INLINE T *
+template <typename T, typename T_var>
+ACE_INLINE 
+T *
 TAO_Pseudo_Object_Manager<T,T_var>::operator-> (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::operator const T* () const // cast
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T,T_var>::operator const T * () const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Pseudo_Object_Manager<T,T_var>::operator T* &() // cast
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T,T_var>::operator T *& ()
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
+template <typename T, typename T_var>
+ACE_INLINE 
+T *
 TAO_Pseudo_Object_Manager<T,T_var>::in (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
+template <typename T, typename T_var>
+ACE_INLINE 
+T *&
 TAO_Pseudo_Object_Manager<T,T_var>::inout (void)
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
+template <typename T, typename T_var>
+ACE_INLINE 
+T *&
 TAO_Pseudo_Object_Manager<T,T_var>::out (void)
 {
   CORBA::release (*this->ptr_);
@@ -330,10 +271,12 @@ TAO_Pseudo_Object_Manager<T,T_var>::out (void)
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
+template <typename T, typename T_var>
+ACE_INLINE 
+T *
 TAO_Pseudo_Object_Manager<T,T_var>::_retn (void)
 {
-  T *temp = *this->ptr_;
+  T * temp = *this->ptr_;
   *this->ptr_ = T::_nil ();
   return temp;
 }
@@ -342,78 +285,95 @@ TAO_Pseudo_Object_Manager<T,T_var>::_retn (void)
 // Inline operations for class TAO_Valuetype_Manager
 // *************************************************************
 
-template <class T, class T_var> ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::~TAO_Valuetype_Manager (void)
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::~TAO_Valuetype_Manager (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager (
-    const TAO_Valuetype_Manager<T,T_var> &rhs
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::TAO_Valuetype_Manager (
+    const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
   )
   : ptr_ (rhs.ptr_),
     release_ (rhs.release_)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager(
-    T** buffer, CORBA::Boolean release
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::TAO_Valuetype_Manager(
+    T ** buffer, 
+    CORBA::Boolean release
   )
   : ptr_ (buffer),
     release_ (release)
 {
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Valuetype_Manager<T,T_var>::operator-> (void) const
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *
+TAO_Valuetype_Manager<T,T_var,T_life>::operator-> (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::operator const T_var () const
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::operator const T_var () const
 {
-  T_var::tao_add_ref (*this->ptr_);
+  T_life::tao_add_ref (*this->ptr_);
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::operator const T* () const // cast
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::operator const T * () const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Valuetype_Manager<T,T_var>::operator T* &() // cast
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::operator T *& ()
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Valuetype_Manager<T,T_var>::in (void) const
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *
+TAO_Valuetype_Manager<T,T_var,T_life>::in (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Valuetype_Manager<T,T_var>::inout (void)
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *&
+TAO_Valuetype_Manager<T,T_var,T_life>::inout (void)
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Valuetype_Manager<T,T_var>::out (void)
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *&
+TAO_Valuetype_Manager<T,T_var,T_life>::out (void)
 {
-  T_var::tao_remove_ref (*this->ptr_);
+  T_life::tao_remove_ref (*this->ptr_);
   *this->ptr_ = 0;
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Valuetype_Manager<T,T_var>::_retn (void)
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *
+TAO_Valuetype_Manager<T,T_var,T_life>::_retn (void)
 {
-  T *temp = *this->ptr_;
+  T * temp = *this->ptr_;
   *this->ptr_ = 0;
   return temp;
 }
@@ -422,86 +382,77 @@ TAO_Valuetype_Manager<T,T_var>::_retn (void)
 // Inline operations for class TAO_Abstract_Manager
 // *************************************************************
 
-template <class T, class T_var> ACE_INLINE
-TAO_Abstract_Manager<T,T_var>::~TAO_Abstract_Manager (void)
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::~TAO_Abstract_Manager (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Abstract_Manager<T,T_var>::TAO_Abstract_Manager (
-    const TAO_Abstract_Manager<T,T_var> &rhs
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::TAO_Abstract_Manager (
+    const TAO_Abstract_Manager<T,T_var,T_life> & rhs
   )
   : ptr_ (rhs.ptr_),
     release_ (rhs.release_)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Abstract_Manager<T,T_var>::TAO_Abstract_Manager(
-    T** buffer, CORBA::Boolean release
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::TAO_Abstract_Manager(
+    T ** buffer, 
+    CORBA::Boolean release
   )
   : ptr_ (buffer),
     release_ (release)
 {
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Abstract_Manager<T,T_var>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Abstract_Manager<T,T_var>::operator const T_var () const
-{
-  if (*this->ptr_ != 0)
-    {
-      (*this->ptr_)->_add_ref ();
-    }
-
-  return *this->ptr_;
-}
-
-template <class T, class T_var> ACE_INLINE
-TAO_Abstract_Manager<T,T_var>::operator const T* () const // cast
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE 
+T *
+TAO_Abstract_Manager<T,T_var,T_life>::operator-> (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Abstract_Manager<T,T_var>::operator T* &() // cast
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::operator const T * () const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Abstract_Manager<T,T_var>::in (void) const
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::operator T *& ()
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Abstract_Manager<T,T_var>::inout (void)
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE 
+T *
+TAO_Abstract_Manager<T,T_var,T_life>::in (void) const
 {
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *&
-TAO_Abstract_Manager<T,T_var>::out (void)
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE 
+T *&
+TAO_Abstract_Manager<T,T_var,T_life>::inout (void)
 {
-  if (*this->ptr_ != 0)
-    {
-      (*this->ptr_)->_remove_ref ();
-    }
-
-  *this->ptr_ = 0;
   return *this->ptr_;
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Abstract_Manager<T,T_var>::_retn (void)
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE 
+T *
+TAO_Abstract_Manager<T,T_var,T_life>::_retn (void)
 {
-  T *temp = *this->ptr_;
+  T * temp = *this->ptr_;
   *this->ptr_ = 0;
   return temp;
 }
@@ -510,14 +461,16 @@ TAO_Abstract_Manager<T,T_var>::_retn (void)
 // class TAO_Unbounded_Object_Sequence
 // *************************************************************
 
-//default constructor
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (void)
+template <typename T, typename T_var, typename T_life, typename T_cast> 
+ACE_INLINE
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::
+TAO_Unbounded_Object_Sequence (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Object_Sequence<T,T_var>::
+template <typename T, typename T_var, typename T_life, typename T_cast> 
+ACE_INLINE
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::
 TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
                                CORBA::ULong length,
                                T* *value,
@@ -526,62 +479,93 @@ TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
 {
 }
 
-template <class T, class T_var> ACE_INLINE TAO_Object_Manager<T,T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
+template <typename T, typename T_var, typename T_life, typename T_cast> 
+ACE_INLINE 
+TAO_Object_Manager<T,T_var,T_life>
+TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::operator[] (
+    CORBA::ULong slot
+  ) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<T,T_var> (tmp + slot, this->release_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+					 this->buffer_);
+  return 
+    TAO_Object_Manager<T,T_var,T_life> (tmp + slot, this->release_);
 }
 
 // *************************************************************
 // class TAO_Bounded_Object_Sequence
 // *************************************************************
 
-template<class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::~TAO_Bounded_Object_Sequence (void)
+template <typename T, 
+	  typename T_var, 
+	  typename T_life, 
+	  typename T_cast, 
+	  size_t MAX> 
+ACE_INLINE
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::
+~TAO_Bounded_Object_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::
+template <typename T, 
+	  typename T_var, 
+	  typename T_life, 
+	  typename T_cast, 
+  	  size_t MAX> 
+ACE_INLINE
+TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::
 TAO_Bounded_Object_Sequence (CORBA::ULong length,
-                             T **value,
-                             CORBA::Boolean release)
+		             T ** value,
+		             CORBA::Boolean release)
   : TAO_Bounded_Base_Sequence (MAX, length, value, release)
 {
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE TAO_Object_Manager<T,T_var>
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator[] (CORBA::ULong slot) const
+template <typename T, 
+	  typename T_var, 
+  	  typename T_life, 
+	  typename T_cast, 
+	  size_t MAX> 
+ACE_INLINE 
+TAO_Object_Manager<T,T_var,T_life>
+TAO_Bounded_Object_Sequence<T, T_var,T_life,T_cast,MAX>::operator[] (
+    CORBA::ULong slot
+  ) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Object_Manager<T,T_var> (tmp + slot, this->release_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+					 this->buffer_);
+  return 
+    TAO_Object_Manager<T,T_var,T_life> (tmp + slot, this->release_ );
 }
 
 // *************************************************************
 // class TAO_Unbounded_Pseudo_Sequence
 // *************************************************************
 
-//default constructor
-template <class T, class T_var> ACE_INLINE
+template <typename T, typename T_var>
+ACE_INLINE
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
-TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
-                               CORBA::ULong length,
-                               T* *value,
-                               CORBA::Boolean release)
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    T ** value,
+    CORBA::Boolean release
+  )
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
-template <class T, class T_var> ACE_INLINE TAO_Pseudo_Object_Manager<T,T_var>
+template <typename T, typename T_var>
+ACE_INLINE 
+TAO_Pseudo_Object_Manager<T,T_var>
 TAO_Unbounded_Pseudo_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
 {
   ACE_ASSERT (slot < this->maximum_);
@@ -593,84 +577,93 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
 // class TAO_Bounded_Pseudo_Sequence
 // *************************************************************
 
-template<class T, class T_var, size_t MAX> ACE_INLINE
+template <typename T, typename T_var, size_t MAX> 
+ACE_INLINE
 TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::~TAO_Bounded_Pseudo_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE
+template <typename T, typename T_var, size_t MAX> 
+ACE_INLINE
 TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::
 TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
-                             T **value,
+                             T ** value,
                              CORBA::Boolean release)
   : TAO_Bounded_Base_Sequence (MAX, length, value, release)
 {
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE TAO_Pseudo_Object_Manager<T,T_var>
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator[] (CORBA::ULong slot) const
+template <typename T, typename T_var, size_t MAX> 
+ACE_INLINE 
+TAO_Pseudo_Object_Manager<T,T_var>
+TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::operator[] (
+    CORBA::ULong slot
+  ) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST,
-                                        this->buffer_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST,
+                                         this->buffer_);
   return TAO_Pseudo_Object_Manager<T,T_var> (tmp + slot,
-                                             this->release_);
+                                       this->release_);
 }
 
 // *************************************************************
 // class TAO_Unbounded_Valuetype_Sequence
 // *************************************************************
 
-//default constructor
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 ACE_INLINE
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Valuetype_Sequence (
     void
   )
 {
 }
 
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 ACE_INLINE
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Valuetype_Sequence (
     CORBA::ULong maximum,
     CORBA::ULong length,
-    T* *value,
+    T ** value,
     CORBA::Boolean release
   )
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 ACE_INLINE 
-TAO_Valuetype_Manager<T,T_var>
-TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] (
+TAO_Valuetype_Manager<T,T_var,T_life>
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::operator[] (
     CORBA::ULong slot
   ) const
 {
   ACE_ASSERT (slot < this->maximum_);
   T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_);
+  return TAO_Valuetype_Manager<T,T_var,T_life> (tmp + slot, this->release_);
 }
 
 // *************************************************************
 // class TAO_Bounded_Valuetype_Sequence
 // *************************************************************
 
-template<class T, class T_var, size_t MAX> 
+template<typename T, typename T_var, typename T_life, size_t MAX> 
 ACE_INLINE
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence (
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
+~TAO_Bounded_Valuetype_Sequence (
     void
   )
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var, size_t MAX> 
+template<typename T, typename T_var, typename T_life, size_t MAX> 
 ACE_INLINE
-TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Valuetype_Sequence (
     CORBA::ULong length,
     T **value,
     CORBA::Boolean release
@@ -679,347 +672,247 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
 {
 }
 
-template <class T, class T_var, size_t MAX> 
+template<typename T, typename T_var, typename T_life, size_t MAX> 
 ACE_INLINE 
-TAO_Valuetype_Manager<T,T_var>
-TAO_Bounded_Valuetype_Sequence<T, T_var, MAX>::operator[] (
+TAO_Valuetype_Manager<T,T_var,T_life>
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::operator[] (
     CORBA::ULong slot
   ) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Valuetype_Manager<T,T_var,T_life> (tmp + slot, this->release_);
 }
 
 // *************************************************************
 // class TAO_Unbounded_Abstract_Sequence
 // *************************************************************
 
-//default constructor
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 ACE_INLINE
-TAO_Unbounded_Abstract_Sequence<T,T_var>::TAO_Unbounded_Abstract_Sequence (
-    void
-  )
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Abstract_Sequence (void)
 {
 }
 
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 ACE_INLINE
-TAO_Unbounded_Abstract_Sequence<T,T_var>::TAO_Unbounded_Abstract_Sequence (
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Abstract_Sequence (
     CORBA::ULong maximum,
     CORBA::ULong length,
-    T* *value,
+    T ** value,
     CORBA::Boolean release
   )
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
-template <class T, class T_var> 
+template <typename T, typename T_var, typename T_life> 
 ACE_INLINE 
-TAO_Abstract_Manager<T,T_var>
-TAO_Unbounded_Abstract_Sequence<T,T_var>::operator[] (CORBA::ULong slot) const
+TAO_Abstract_Manager<T,T_var,T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::operator[] (
+    CORBA::ULong slot
+  ) const
 {
   ACE_ASSERT (slot < this->maximum_);
   T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Abstract_Manager<T,T_var> (tmp + slot, this->release_);
+  return TAO_Abstract_Manager<T,T_var,T_life> (tmp + slot, this->release_);
 }
 
 // *************************************************************
 // class TAO_Bounded_Abstract_Sequence
 // *************************************************************
 
-template<class T, class T_var, size_t MAX> 
+template<typename T, typename T_var, typename T_life, size_t MAX>
 ACE_INLINE
-TAO_Bounded_Abstract_Sequence<T,T_var,MAX>::~TAO_Bounded_Abstract_Sequence (
-    void
-  )
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
+~TAO_Bounded_Abstract_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Abstract_Sequence<T,T_var,MAX>::TAO_Bounded_Abstract_Sequence (
+template<typename T, typename T_var, typename T_life, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Abstract_Sequence (
     CORBA::ULong length,
-    T **value,
+    T ** value,
     CORBA::Boolean release
   )
   : TAO_Bounded_Base_Sequence (MAX, length, value, release)
 {
 }
 
-template <class T, class T_var, size_t MAX> 
+template<typename T, typename T_var, typename T_life, size_t MAX>
 ACE_INLINE 
-TAO_Abstract_Manager<T,T_var>
-TAO_Bounded_Abstract_Sequence<T, T_var, MAX>::operator[] (
+TAO_Abstract_Manager<T,T_var,T_life>
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::operator[] (
     CORBA::ULong slot
   ) const
 {
   ACE_ASSERT (slot < this->maximum_);
-  T **const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Abstract_Manager<T,T_var> (tmp + slot, this->release_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Abstract_Manager<T,T_var,T_life> (tmp + slot, this->release_);
 }
 
 // *************************************************************
 // class TAO_Unbounded_Array_Sequence
 // *************************************************************
 
-template <class T, class T_var> ACE_INLINE void
-TAO_Unbounded_Array_Sequence<T, T_var>::freebuf (T *buffer)
+template <typename T, typename T_life> 
+ACE_INLINE 
+void
+TAO_Unbounded_Array_Sequence<T,T_life>::freebuf (T * buffer)
 {
   if (buffer == 0)
-    return;
+    {
+        return;
+    }
 
   delete [] buffer;
 }
 
-//default constructor
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Array_Sequence<T, T_var>::TAO_Unbounded_Array_Sequence (void)
+template <typename T, typename T_life> 
+ACE_INLINE
+TAO_Unbounded_Array_Sequence<T,T_life>::TAO_Unbounded_Array_Sequence (void)
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Array_Sequence<T, T_var>::
+template <typename T, typename T_life> 
+ACE_INLINE
+TAO_Unbounded_Array_Sequence<T,T_life>::
 TAO_Unbounded_Array_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (maximum))
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_Array_Sequence<T,T_life>::allocbuf (maximum)
+      )
 {
 }
 
-template <class T, class T_var> ACE_INLINE
-TAO_Unbounded_Array_Sequence<T, T_var>::
+template <typename T, typename T_life> 
+ACE_INLINE
+TAO_Unbounded_Array_Sequence<T,T_life>::
 TAO_Unbounded_Array_Sequence (CORBA::ULong maximum,
                               CORBA::ULong length,
-                              T *value,
+                              T * value,
                               CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
 {
 }
 
-template <class T, class T_var> ACE_INLINE T &
-TAO_Unbounded_Array_Sequence<T, T_var>::operator[] (CORBA::ULong i)
+template <typename T, typename T_life> 
+ACE_INLINE 
+T &
+TAO_Unbounded_Array_Sequence<T,T_life>::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
 
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  return ((T*) this->buffer_)[i];
+  return ((T *) this->buffer_)[i];
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  return (ACE_reinterpret_cast (T*, this->buffer_))[i];
+  return (ACE_reinterpret_cast (T *, this->buffer_))[i];
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 }
 
-template <class T, class T_var> ACE_INLINE const T &
-TAO_Unbounded_Array_Sequence<T, T_var>::operator[] (CORBA::ULong i) const
+template <typename T, typename T_life> 
+ACE_INLINE 
+const T &
+TAO_Unbounded_Array_Sequence<T,T_life>::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
 
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  return ((const T* ACE_CAST_CONST) this->buffer_)[i];
+  return ((const T * ACE_CAST_CONST) this->buffer_)[i];
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  return (ACE_reinterpret_cast (const T* ACE_CAST_CONST, this->buffer_))[i];
+  return (ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_))[i];
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 }
 
-template <class T, class T_var> ACE_INLINE T *
-TAO_Unbounded_Array_Sequence<T, T_var>::get_buffer (CORBA::Boolean orphan)
-{
-  T *result = 0;
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          if (this->length_ > 0)
-            {
-              result = 
-	        TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (
-                    this->length_
-                  );
-              this->buffer_ = result;
-	      this->release_ = 1;
-            }
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (T*, 
-	                          this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = ACE_reinterpret_cast (T*,
-	                                 this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  return result;
-}
-
-template <class T, class T_var> ACE_INLINE const T *
-TAO_Unbounded_Array_Sequence<T, T_var>::get_buffer (void) const
+template <typename T, typename T_life> 
+ACE_INLINE 
+const T *
+TAO_Unbounded_Array_Sequence<T,T_life>::get_buffer (void) const
 {
   return ACE_reinterpret_cast (const T * ACE_CAST_CONST, 
                                this->buffer_);
 }
 
-template <class T, class T_var> ACE_INLINE void
-TAO_Unbounded_Array_Sequence<T, T_var>::replace (CORBA::ULong max,
-				                   CORBA::ULong length,
-                                                   T *data,
-                                                   CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T *tmp = ACE_reinterpret_cast (T*,
-                                     this->buffer_);
-      TAO_Unbounded_Array_Sequence<T, T_var>::freebuf (tmp);
-    }
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
 // *************************************************************
 // class TAO_Bounded_Array_Sequence
 // *************************************************************
 
-template <class T, class T_var, size_t MAX> ACE_INLINE void
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::freebuf (T *buffer)
-{
-  if (buffer == 0)
-    return;
-
-  delete [] buffer;
-}
-
-template <class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::
+template <typename T, typename T_life, size_t MAX> 
+ACE_INLINE
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::
 TAO_Bounded_Array_Sequence (void)
   : TAO_Bounded_Base_Sequence (MAX, 0, allocbuf (MAX), 1)
 {
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::
+template <typename T, typename T_life, size_t MAX> 
+ACE_INLINE
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::
 TAO_Bounded_Array_Sequence (CORBA::ULong length,
-                            T *data,
+                            T * data,
                             CORBA::Boolean release)
   : TAO_Bounded_Base_Sequence (MAX, length, data, release)
 {
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE T &
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::operator[] (CORBA::ULong i)
+template <typename T, typename T_life, size_t MAX> 
+ACE_INLINE 
+T &
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::operator[] (CORBA::ULong i)
 {
   ACE_ASSERT (i < this->maximum_);
 
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  return ((T*) this->buffer_)[i];
+  return ((T *) this->buffer_)[i];
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  return (ACE_reinterpret_cast (T*, this->buffer_))[i];
+  return (ACE_reinterpret_cast (T *, this->buffer_))[i];
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE const T &
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::operator[] (CORBA::ULong i) const
+template <typename T, typename T_life, size_t MAX> 
+ACE_INLINE 
+const T &
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::operator[] (CORBA::ULong i) const
 {
   ACE_ASSERT (i < this->maximum_);
 
 #if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
-  return ((const T* ACE_CAST_CONST) this->buffer_)[i];
+  return ((const T * ACE_CAST_CONST) this->buffer_)[i];
 #else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
-  return (ACE_reinterpret_cast (const T* ACE_CAST_CONST, this->buffer_))[i];
+  return (ACE_reinterpret_cast (const T * ACE_CAST_CONST, this->buffer_))[i];
 #endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE T *
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::get_buffer (CORBA::Boolean orphan)
-{
-  T *result = 0;
-  if (orphan == 0)
-    {
-      // We retain ownership.
-
-      if (this->buffer_ == 0)
-        {
-          result = 
-	    TAO_Bounded_Array_Sequence<T, T_var, MAX>::allocbuf (this->maximum_);
-          this->buffer_ = result;
-	  this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (T*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish
-          // ownership.
-          result = ACE_reinterpret_cast(T*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  return result;
-}
-
-template <class T, class T_var, size_t MAX> ACE_INLINE const T *
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::get_buffer (void) const
+template <typename T, typename T_life, size_t MAX> 
+ACE_INLINE 
+const T *
+TAO_Bounded_Array_Sequence<T,T_life,MAX>::get_buffer (void) const
 {
   return ACE_reinterpret_cast (const T * ACE_CAST_CONST, 
                                this->buffer_);
 }
 
-template <class T, class T_var, size_t MAX> ACE_INLINE void
-TAO_Bounded_Array_Sequence<T, T_var, MAX>::replace (CORBA::ULong max,
-                                                      CORBA::ULong length,
-                                                      T *data,
-                                                      CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  if (this->buffer_ && this->release_ == 1)
-    {
-      T* tmp = ACE_reinterpret_cast (T*, 
-                                     this->buffer_);
-      TAO_Bounded_Array_Sequence<T, T_var, MAX>::freebuf (tmp);
-    }
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
 // *************************************************************
 // class TAO_Bounded_String_Sequence
 // *************************************************************
 
-template<size_t MAX> ACE_INLINE
+template<size_t MAX> 
+ACE_INLINE
 TAO_Bounded_String_Sequence<MAX>::~TAO_Bounded_String_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template<size_t MAX> ACE_INLINE
+template<size_t MAX> 
+ACE_INLINE
 TAO_Bounded_String_Sequence<MAX>::
 TAO_Bounded_String_Sequence (CORBA::ULong length,
-                             char **value,
+                             char ** value,
                              CORBA::Boolean release)
   : TAO_Bounded_Base_Sequence (MAX, length, value, release)
 {
@@ -1029,16 +922,18 @@ TAO_Bounded_String_Sequence (CORBA::ULong length,
 // class TAO_Bounded_WString_Sequence
 // *************************************************************
 
-template<size_t MAX> ACE_INLINE
+template<size_t MAX> 
+ACE_INLINE
 TAO_Bounded_WString_Sequence<MAX>::~TAO_Bounded_WString_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template<size_t MAX> ACE_INLINE
+template<size_t MAX> 
+ACE_INLINE
 TAO_Bounded_WString_Sequence<MAX>::
 TAO_Bounded_WString_Sequence (CORBA::ULong length,
-                              CORBA::WChar **value,
+                              CORBA::WChar ** value,
                               CORBA::Boolean release)
   : TAO_Bounded_Base_Sequence (MAX, length, value, release)
 {
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 412cd5fe5a5..a2146b28d32 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -263,7 +263,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -272,6 +272,37 @@ void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ServiceDetail
+    >;
+
+template class
+  TAO_Out_T<
+      ServiceDetail,
+      ServiceDetail_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ServiceDetail \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ServiceDetail, \
+      ServiceDetail_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_ServiceInformation[] =
@@ -435,7 +466,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -444,116 +475,38 @@ void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
-
-void
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ULong* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old =
-        ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ULong *tmp =
-    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::ServiceInformation::_tao_seq_ServiceOption
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void)
 {}
 
 CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::ServiceOption
+      >
+    (max)
 {}
 
 CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ULong *buffer,
+    CORBA::ULong* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::ServiceOption
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::ServiceOption
+      >
+    (seq)
 {}
 
-CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) // dtor
+CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void)
 {}
 
 void CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_any_destructor (void *_tao_void_pointer)
@@ -562,119 +515,39 @@ void CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_any_destructor (voi
   delete tmp;
 }
 
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
-
-void
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::ServiceDetail* tmp = 0;
-  tmp = _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (length);
-  
-  if (this->buffer_ != 0)
-    {
-      CORBA::ServiceDetail *old =
-        ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp[i] = old[i];
-        }
-      
-      if (this->release_)
-        {
-          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (old);
-        }
-    }
-  
-  this->buffer_ = tmp;
-}
-
-void
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-  
-  CORBA::ServiceDetail *tmp =
-    ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-  this->buffer_ = 0;
-} 
-
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void)
-{
-  this->_deallocate_buffer ();
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::ServiceInformation::_tao_seq_ServiceDetail
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void)
 {}
 
 CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_Sequence<
+        CORBA::ServiceDetail
+      >
+    (max)
 {}
 
 CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::ServiceDetail *buffer,
+    CORBA::ServiceDetail* buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_Sequence<
+        CORBA::ServiceDetail
+      >
+    (max, length, buffer, release)
 {}
 
 CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_Sequence<
+        CORBA::ServiceDetail
+      >
+    (seq)
 {}
 
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) // dtor
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void)
 {}
 
 void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_any_destructor (void *_tao_void_pointer)
@@ -683,7 +556,36 @@ void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_any_destructor (voi
   delete tmp;
 }
 
-#endif /* end #if !defined */
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Var_Var_T<
+      ServiceInformation
+    >;
+
+template class
+  TAO_Out_T<
+      ServiceInformation,
+      ServiceInformation_var
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Var_Var_T< \
+      ServiceInformation \
+    >
+
+# pragma instantiate \
+  TAO_Out_T< \
+      ServiceInformation, \
+      ServiceInformation_var \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
@@ -816,7 +718,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 #if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_
 #define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_
@@ -873,7 +775,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 #if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_
 #define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
index d4dfeceb05a..6fd6cba64ce 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -27,12 +27,13 @@
 
 #include "ace/pre.h"
 #include "tao/OctetSeqC.h"
+#include "tao/CDR.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/CDR.h"
+#include "tao/VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -64,7 +65,7 @@ TAO_NAMESPACE  CORBA
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::UShort ServiceType;
   typedef CORBA::UShort_out ServiceType_out;
@@ -75,7 +76,7 @@ TAO_NAMESPACE  CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceType;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::ULong ServiceOption;
   typedef CORBA::ULong_out ServiceOption_out;
@@ -86,7 +87,7 @@ TAO_NAMESPACE  CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceOption;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::ULong ServiceDetailType;
   typedef CORBA::ULong_out ServiceDetailType_out;
@@ -102,9 +103,25 @@ TAO_NAMESPACE  CORBA
   const CORBA::ServiceType Security = 1U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  struct ServiceDetail;
   
-  class ServiceDetail_var;
+  typedef
+    TAO_Var_Var_T<
+        ServiceDetail
+      >
+    ServiceDetail_var;
+  
+  typedef
+    TAO_Out_T<
+        ServiceDetail,
+        ServiceDetail_var
+      >
+    ServiceDetail_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export ServiceDetail
   {
@@ -116,69 +133,30 @@ TAO_NAMESPACE  CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export ServiceDetail_var
-  {
-  public:
-    ServiceDetail_var (void);
-    ServiceDetail_var (ServiceDetail *);
-    ServiceDetail_var (const ServiceDetail_var &);
-    ~ServiceDetail_var (void);
-    
-    ServiceDetail_var &operator= (ServiceDetail *);
-    ServiceDetail_var &operator= (const ServiceDetail_var &);
-    ServiceDetail *operator-> (void);
-    const ServiceDetail *operator-> (void) const;
-    
-    operator const ServiceDetail &() const;
-    operator ServiceDetail &();
-    operator ServiceDetail &() const;
-    
-    // Variable-size types only.
-    operator ServiceDetail *&();
-    
-    // in, inout, out, _retn 
-    const ServiceDetail &in (void) const;
-    ServiceDetail &inout (void);
-    ServiceDetail *&out (void);
-    ServiceDetail *_retn (void);
-    ServiceDetail *ptr (void) const;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  private:
-    ServiceDetail *ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetail;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class TAO_Export ServiceDetail_out
-  {
-  public:
-    ServiceDetail_out (ServiceDetail *&);
-    ServiceDetail_out (ServiceDetail_var &);
-    ServiceDetail_out (const ServiceDetail_out &);
-    ServiceDetail_out &operator= (const ServiceDetail_out &);
-    ServiceDetail_out &operator= (ServiceDetail *);
-    operator ServiceDetail *&();
-    ServiceDetail *&ptr (void);
-    ServiceDetail *operator-> (void);
-    
-  private:
-    ServiceDetail *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ServiceDetail_var &);
-  };
+  struct ServiceInformation;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  typedef
+    TAO_Var_Var_T<
+        ServiceInformation
+      >
+    ServiceInformation_var;
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetail;
+  typedef
+    TAO_Out_T<
+        ServiceInformation,
+        ServiceInformation_var
+      >
+    ServiceInformation_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class ServiceInformation_var;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export ServiceInformation
   {
@@ -187,101 +165,31 @@ TAO_NAMESPACE  CORBA
     static void _tao_any_destructor (void *);
     
     
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
-    
-    class TAO_Export _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
-          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
-        );
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &operator= (
-          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void);
-      
-      // = Accessors.
-      CORBA::ULong &operator[] (CORBA::ULong i);
-      const CORBA::ULong &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static CORBA::ULong *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA::ULong *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::ULong *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release
-        );
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
-    
-    class _tao_seq_ServiceOption;
-    
-    // *************************************************************
-    // CORBA::ServiceInformation::_tao_seq_ServiceOption
-    // *************************************************************
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
     
-    class TAO_Export _tao_seq_ServiceOption : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::ULong>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    class TAO_Export _tao_seq_ServiceOption
+      : public
+          TAO_Unbounded_Sequence<
+              CORBA::ServiceOption
+            >
     {
     public:
       _tao_seq_ServiceOption (void);
       _tao_seq_ServiceOption (CORBA::ULong max);
       _tao_seq_ServiceOption (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          CORBA::ULong *buffer, 
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA::ULong* buffer, 
           CORBA::Boolean release = 0
         );
       _tao_seq_ServiceOption (const _tao_seq_ServiceOption &);
       ~_tao_seq_ServiceOption (void);
       
-      static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void *);
       
       
     };
-
-#endif /* end #if !defined */
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
@@ -290,101 +198,31 @@ TAO_NAMESPACE  CORBA
     _tao_seq_ServiceOption service_options;
     
     
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
-    
-    class TAO_Export _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-      : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
-          CORBA::ULong maximum,
-          CORBA::ULong length,
-          ACE_NESTED_CLASS (CORBA, ServiceDetail) *data,
-          CORBA::Boolean release = 0
-        );
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
-          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
-        );
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &operator= (
-          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
-        );
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void);
-      
-      // = Accessors.
-      ACE_NESTED_CLASS (CORBA, ServiceDetail) &operator[] (CORBA::ULong i);
-      const ACE_NESTED_CLASS (CORBA, ServiceDetail) &operator[] (CORBA::ULong i) const;
-      
-      // = Static operations.
-      static ACE_NESTED_CLASS (CORBA, ServiceDetail) *allocbuf (CORBA::ULong size);
-      static void freebuf (ACE_NESTED_CLASS (CORBA, ServiceDetail) *buffer);
-      
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      ACE_NESTED_CLASS (CORBA, ServiceDetail) *get_buffer (CORBA::Boolean orphan = 0);
-      const ACE_NESTED_CLASS (CORBA, ServiceDetail) *get_buffer (void) const;
-      void replace (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          ACE_NESTED_CLASS (CORBA, ServiceDetail) *data,
-          CORBA::Boolean release
-        );
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
-    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
     
-    class _tao_seq_ServiceDetail;
-    
-    // *************************************************************
-    // CORBA::ServiceInformation::_tao_seq_ServiceDetail
-    // *************************************************************
-    
-    class TAO_Export _tao_seq_ServiceDetail : public 
-    
-    // TAO_IDL - Generated from 
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<ACE_NESTED_CLASS (CORBA, ServiceDetail)>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    class TAO_Export _tao_seq_ServiceDetail
+      : public
+          TAO_Unbounded_Sequence<
+              CORBA::ServiceDetail
+            >
     {
     public:
       _tao_seq_ServiceDetail (void);
       _tao_seq_ServiceDetail (CORBA::ULong max);
       _tao_seq_ServiceDetail (
-          CORBA::ULong max, 
-          CORBA::ULong length, 
-          ACE_NESTED_CLASS (CORBA, ServiceDetail) *buffer, 
+          CORBA::ULong max,
+          CORBA::ULong length,
+          ACE_NESTED_CLASS (CORBA, ServiceDetail)* buffer, 
           CORBA::Boolean release = 0
         );
       _tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &);
       ~_tao_seq_ServiceDetail (void);
       
-      static void _tao_any_destructor (void*);
+      static void _tao_any_destructor (void *);
       
       
     };
-
-#endif /* end #if !defined */
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
@@ -394,61 +232,6 @@ TAO_NAMESPACE  CORBA
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export ServiceInformation_var
-  {
-  public:
-    ServiceInformation_var (void);
-    ServiceInformation_var (ServiceInformation *);
-    ServiceInformation_var (const ServiceInformation_var &);
-    ~ServiceInformation_var (void);
-    
-    ServiceInformation_var &operator= (ServiceInformation *);
-    ServiceInformation_var &operator= (const ServiceInformation_var &);
-    ServiceInformation *operator-> (void);
-    const ServiceInformation *operator-> (void) const;
-    
-    operator const ServiceInformation &() const;
-    operator ServiceInformation &();
-    operator ServiceInformation &() const;
-    
-    // Variable-size types only.
-    operator ServiceInformation *&();
-    
-    // in, inout, out, _retn 
-    const ServiceInformation &in (void) const;
-    ServiceInformation &inout (void);
-    ServiceInformation *&out (void);
-    ServiceInformation *_retn (void);
-    ServiceInformation *ptr (void) const;
-  
-  private:
-    ServiceInformation *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
-  
-  class TAO_Export ServiceInformation_out
-  {
-  public:
-    ServiceInformation_out (ServiceInformation *&);
-    ServiceInformation_out (ServiceInformation_var &);
-    ServiceInformation_out (const ServiceInformation_out &);
-    ServiceInformation_out &operator= (const ServiceInformation_out &);
-    ServiceInformation_out &operator= (ServiceInformation *);
-    operator ServiceInformation *&();
-    ServiceInformation *&ptr (void);
-    ServiceInformation *operator-> (void);
-    
-  private:
-    ServiceInformation *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const ServiceInformation_var &);
-  };
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceInformation;
@@ -532,7 +315,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "ServicesC.i"
diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesC.i
index c4fb452b840..05f20d51f81 100644
--- a/TAO/tao/ServicesC.i
+++ b/TAO/tao/ServicesC.i
@@ -21,855 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ServiceDetail_var::ServiceDetail_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ServiceDetail_var::ServiceDetail_var (ServiceDetail *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ServiceDetail_var::ServiceDetail_var (const ::CORBA::ServiceDetail_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ServiceDetail (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ServiceDetail_var::~ServiceDetail_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ServiceDetail_var &
-CORBA::ServiceDetail_var::operator= (ServiceDetail *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ServiceDetail_var &
-CORBA::ServiceDetail_var::operator= (const ::CORBA::ServiceDetail_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ServiceDetail *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ServiceDetail (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ServiceDetail *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ServiceDetail *
-CORBA::ServiceDetail_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceDetail *
-CORBA::ServiceDetail_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ServiceDetail_var::operator const ::CORBA::ServiceDetail &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ServiceDetail &
-CORBA::ServiceDetail_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceDetail &
-CORBA::ServiceDetail_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ServiceDetail *&
-CORBA::ServiceDetail_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceDetail *
-CORBA::ServiceDetail_var::_retn (void)
-{
-  ::CORBA::ServiceDetail *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ServiceDetail *
-CORBA::ServiceDetail_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ServiceDetail_out::ServiceDetail_out (::CORBA::ServiceDetail *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ServiceDetail_out::ServiceDetail_out (ServiceDetail_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ServiceDetail_out::ServiceDetail_out (const ::CORBA::ServiceDetail_out &p)
-  : ptr_ (ACE_const_cast (ServiceDetail_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ServiceDetail_out &
-CORBA::ServiceDetail_out::operator= (const ::CORBA::ServiceDetail_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServiceDetail_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ServiceDetail_out &
-CORBA::ServiceDetail_out::operator= (ServiceDetail *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ServiceDetail_out::operator ::CORBA::ServiceDetail *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceDetail *&
-CORBA::ServiceDetail_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceDetail *
-CORBA::ServiceDetail_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ServiceInformation_var::ServiceInformation_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::ServiceInformation_var::ServiceInformation_var (ServiceInformation *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::ServiceInformation_var::ServiceInformation_var (const ::CORBA::ServiceInformation_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::ServiceInformation (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ServiceInformation_var::~ServiceInformation_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation_var &
-CORBA::ServiceInformation_var::operator= (ServiceInformation *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::ServiceInformation_var &
-CORBA::ServiceInformation_var::operator= (const ::CORBA::ServiceInformation_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          ServiceInformation *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              ServiceInformation (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              ServiceInformation *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA::ServiceInformation *
-CORBA::ServiceInformation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceInformation *
-CORBA::ServiceInformation_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation_var::operator const ::CORBA::ServiceInformation &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::CORBA::ServiceInformation &
-CORBA::ServiceInformation_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceInformation &
-CORBA::ServiceInformation_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::CORBA::ServiceInformation *&
-CORBA::ServiceInformation_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceInformation *
-CORBA::ServiceInformation_var::_retn (void)
-{
-  ::CORBA::ServiceInformation *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA::ServiceInformation *
-CORBA::ServiceInformation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ServiceInformation_out::ServiceInformation_out (::CORBA::ServiceInformation *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation_out::ServiceInformation_out (ServiceInformation_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation_out::ServiceInformation_out (const ::CORBA::ServiceInformation_out &p)
-  : ptr_ (ACE_const_cast (ServiceInformation_out&, p).ptr_)
-{}
-
-ACE_INLINE
-CORBA::ServiceInformation_out &
-CORBA::ServiceInformation_out::operator= (const ::CORBA::ServiceInformation_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServiceInformation_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation_out &
-CORBA::ServiceInformation_out::operator= (ServiceInformation *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA::ServiceInformation_out::operator ::CORBA::ServiceInformation *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceInformation *&
-CORBA::ServiceInformation_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA::ServiceInformation *
-CORBA::ServiceInformation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
-
-ACE_INLINE
-CORBA::ULong *
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (CORBA::ULong size)
-{
-  CORBA::ULong *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (CORBA::ULong *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void)
-{
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
-    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ULong *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->maximum_);
-      CORBA::ULong * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ULong *tmp =
-            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ULong *tmp1 =
-    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-  CORBA::ULong * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ULong &
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong* tmp =
-    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ULong &
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ULong * const tmp =
-    ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ULong *
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ULong *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ULong *
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp =
-        ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
-
-ACE_INLINE
-CORBA::ServiceDetail *
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (CORBA::ULong size)
-{
-  CORBA::ServiceDetail *retval = 0;
-  ACE_NEW_RETURN (retval, CORBA::ServiceDetail[size], 0);
-  return retval;
-}
-
-ACE_INLINE
-void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (CORBA::ServiceDetail *buffer)
-{
-  delete [] buffer;
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void)
-{
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum) 
-  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (maximum))
-{
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ServiceDetail *data,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
-    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      CORBA::ServiceDetail *tmp1 =
-        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->maximum_);
-      CORBA::ServiceDetail * const tmp2 =
-        ACE_reinterpret_cast (CORBA::ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          tmp1[i] = tmp2[i];
-        }
-      
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator= (
-    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-  
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // Free the old buffer.
-          CORBA::ServiceDetail *tmp =
-            ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
-          
-          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-          
-          this->buffer_ =
-            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      this->buffer_ =
-        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
-    }
-  
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
-  CORBA::ServiceDetail *tmp1 =
-    ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
-  CORBA::ServiceDetail * const tmp2 =
-    ACE_reinterpret_cast (CORBA::ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
-  
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      tmp1[i] = tmp2[i];
-    }
-  
-  return *this;
-}
-
-// = Accessors.
-ACE_INLINE
-CORBA::ServiceDetail &
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ServiceDetail* tmp =
-    ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_);
-  return tmp[i];
-}
-
-ACE_INLINE
-const CORBA::ServiceDetail &
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->maximum_);
-  CORBA::ServiceDetail * const tmp =
-    ACE_reinterpret_cast (CORBA::ServiceDetail* ACE_CAST_CONST, this->buffer_);
-  return tmp[i];
-}
-
-// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-ACE_INLINE
-CORBA::ServiceDetail *
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::ServiceDetail *result = 0;
-  
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result =
-            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->length_);
-          this->buffer_ = result;
-          this->release_ = 1;
-        }
-      else
-        {
-          result =
-            ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_);
-        }
-    }
-  else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-        {
-          // We set the state back to default and relinquish ownership.
-          result =
-            ACE_reinterpret_cast(CORBA::ServiceDetail*,this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  
-  return result;
-}
-
-ACE_INLINE
-const CORBA::ServiceDetail *
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::ServiceDetail * ACE_CAST_CONST, this->buffer_);
-}
-
-ACE_INLINE
-void
-CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::replace (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::ServiceDetail *data,
-    CORBA::Boolean release
-  )
-{
-  this->maximum_ = max;
-  this->length_ = length;
-  
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ServiceDetail *tmp =
-        ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-    }
-  
-  this->buffer_ = data;
-  this->release_ = release;
-}
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -946,7 +98,7 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 72ca11a8642..d1b4be0b1b5 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -24,72 +24,44 @@
 
 
 #include "StringSeqC.h"
+#include "Any_T.h"
+#include "CDR.h"
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
 #include "StringSeqC.i"
 #endif /* !defined INLINE */
 
-#include "Any_T.h"
-
-#if !defined (_CORBA_STRINGSEQ_CS_)
-#define _CORBA_STRINGSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::StringSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::StringSeq::StringSeq (void)
 {}
 
 CORBA::StringSeq::StringSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_String_Sequence
+    (max)
 {}
 
 CORBA::StringSeq::StringSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    char * *buffer,
+    char ** buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_String_Sequence
+    (max, length, buffer, release)
 {}
 
 CORBA::StringSeq::StringSeq (const StringSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_String_Sequence
+    (seq)
 {}
 
-CORBA::StringSeq::~StringSeq (void) // dtor
+CORBA::StringSeq::~StringSeq (void)
 {}
 
 void CORBA::StringSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -98,7 +70,37 @@ void CORBA::StringSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::StringSeq,
+      TAO_SeqElem_String_Manager
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::StringSeq,
+      CORBA::StringSeq_var,
+      TAO_SeqElem_String_Manager
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_MngSeq_Var_T< \
+      CORBA::StringSeq, \
+      TAO_SeqElem_String_Manager \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      CORBA::StringSeq, \
+      CORBA::StringSeq_var, \
+      TAO_SeqElem_String_Manager \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -107,22 +109,22 @@ static const CORBA::Long _oc_CORBA_StringSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5374), 
-  ACE_NTOHL (0x72696e67), 
-  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5374),
+  ACE_NTOHL (0x72696e67),
+  ACE_NTOHL (0x5365713a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
     10,
-  ACE_NTOHL (0x53747269), 
-  ACE_NTOHL (0x6e675365), 
+  ACE_NTOHL (0x53747269),
+  ACE_NTOHL (0x6e675365),
   ACE_NTOHL (0x71000000),  // name = StringSeq
     CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
     0U,
 
@@ -145,61 +147,33 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-#if !defined (_CORBA_WSTRINGSEQ_CS_)
-#define _CORBA_WSTRINGSEQ_CS_
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// CORBA::WStringSeq
-// *************************************************************
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
 CORBA::WStringSeq::WStringSeq (void)
 {}
 
 CORBA::WStringSeq::WStringSeq (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_WString_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_WString_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
+  : TAO_Unbounded_WString_Sequence
+    (max)
 {}
 
 CORBA::WStringSeq::WStringSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    CORBA::WChar * *buffer,
+    CORBA::WChar ** buffer,
     CORBA::Boolean release
   )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_WString_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_WString_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
+  : TAO_Unbounded_WString_Sequence
+    (max, length, buffer, release)
 {}
 
 CORBA::WStringSeq::WStringSeq (const WStringSeq &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_WString_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_WString_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
+  : TAO_Unbounded_WString_Sequence
+    (seq)
 {}
 
-CORBA::WStringSeq::~WStringSeq (void) // dtor
+CORBA::WStringSeq::~WStringSeq (void)
 {}
 
 void CORBA::WStringSeq::_tao_any_destructor (void *_tao_void_pointer)
@@ -208,7 +182,37 @@ void CORBA::WStringSeq::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-#endif /* end #if !defined */
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_MngSeq_Var_T<
+      CORBA::WStringSeq,
+      TAO_SeqElem_WString_Manager
+    >;
+
+template class
+  TAO_Seq_Out_T<
+      CORBA::WStringSeq,
+      CORBA::WStringSeq_var,
+      TAO_SeqElem_WString_Manager
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_MngSeq_Var_T< \
+      CORBA::WStringSeq, \
+      TAO_SeqElem_WString_Manager \
+    >
+
+# pragma instantiate \
+  TAO_Seq_Out_T< \
+      CORBA::WStringSeq, \
+      CORBA::WStringSeq_var, \
+      TAO_SeqElem_WString_Manager \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -217,23 +221,23 @@ static const CORBA::Long _oc_CORBA_WStringSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5753), 
-  ACE_NTOHL (0x7472696e), 
-  ACE_NTOHL (0x67536571), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5753),
+  ACE_NTOHL (0x7472696e),
+  ACE_NTOHL (0x67536571),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
     11,
-  ACE_NTOHL (0x57537472), 
-  ACE_NTOHL (0x696e6753), 
+  ACE_NTOHL (0x57537472),
+  ACE_NTOHL (0x696e6753),
   ACE_NTOHL (0x65710000),  // name = WStringSeq
     CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_wstring, 
+    CORBA::tk_wstring,
     0U, // string length
     0U,
 
@@ -256,7 +260,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -321,7 +325,7 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::StringSeq>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -387,7 +391,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -395,20 +399,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -418,7 +422,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -428,32 +432,32 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -461,20 +465,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
 
@@ -484,7 +488,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -494,27 +498,26 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return 1;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return 0;
 }
-
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 019234a71cb..ec32640018e 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -27,13 +27,14 @@
 
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "Sequence.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Sequence.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -58,233 +59,129 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-namespace CORBA
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
 {
 
-#if !defined (_CORBA_STRINGSEQ_CH_)
-#define _CORBA_STRINGSEQ_CH_
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
   class StringSeq;
-  class StringSeq_var;
-  
-  // *************************************************************
-  // CORBA::StringSeq
-  // *************************************************************
-  
-  class TAO_Export StringSeq : public 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        StringSeq,
+        TAO_SeqElem_String_Manager
+      >
+    StringSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        StringSeq,
+        StringSeq_var,
+        TAO_SeqElem_String_Manager
+      >
+    StringSeq_out;
+
+  class TAO_Export StringSeq
+    : public
+        TAO_Unbounded_String_Sequence
   {
   public:
-    StringSeq (void); // default ctor
-    StringSeq (CORBA::ULong max); // uses max size
+    StringSeq (void);
+    StringSeq (CORBA::ULong max);
     StringSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      char * *buffer, 
-      CORBA::Boolean release = 0
-    );
-    StringSeq (const StringSeq &); // copy ctor
+        CORBA::ULong max,
+        CORBA::ULong length,
+        char ** buffer,
+        CORBA::Boolean release = 0
+      );
+    StringSeq (const StringSeq &);
     ~StringSeq (void);
-    static void _tao_any_destructor (void*);
-    
-    typedef StringSeq_var _var_type;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_STRINGSEQ___VAR_CH_)
-#define _CORBA_STRINGSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class CORBA::StringSeq_var
-  // *************************************************************
-
-  class TAO_Export StringSeq_var
-  {
-  public:
-    StringSeq_var (void); // default constructor
-    StringSeq_var (StringSeq *);
-    StringSeq_var (const StringSeq_var &); // copy constructor
-    ~StringSeq_var (void); // destructor
-    
-    StringSeq_var &operator= (StringSeq *);
-    StringSeq_var &operator= (const StringSeq_var &);
-    StringSeq *operator-> (void);
-    const StringSeq *operator-> (void) const;
-    
-    operator const StringSeq &() const;
-    operator StringSeq &();
-    operator StringSeq &() const;
-    operator StringSeq *&(); // variable-size base types only
-    
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const StringSeq &in (void) const;
-    StringSeq &inout (void);
-    StringSeq *&out (void);
-    StringSeq *_retn (void);
-    StringSeq *ptr (void) const;
-
-  private:
-    StringSeq *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRINGSEQ___OUT_CH_)
-#define _CORBA_STRINGSEQ___OUT_CH_
-
-  class TAO_Export StringSeq_out
-  {
-  public:
-    StringSeq_out (StringSeq *&);
-    StringSeq_out (StringSeq_var &);
-    StringSeq_out (const StringSeq_out &);
-    StringSeq_out &operator= (const StringSeq_out &);
-    StringSeq_out &operator= (StringSeq *);
-    operator StringSeq *&();
-    StringSeq *&ptr (void);
-    StringSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
-  private:
-    StringSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const StringSeq_var &);
+    typedef StringSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq;
 
-#if !defined (_CORBA_WSTRINGSEQ_CH_)
-#define _CORBA_WSTRINGSEQ_CH_
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
 
   class WStringSeq;
-  class WStringSeq_var;
-  
-  // *************************************************************
-  // CORBA::WStringSeq
-  // *************************************************************
-  
-  class TAO_Export WStringSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_WString_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_WString_Sequence
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+  typedef
+    TAO_MngSeq_Var_T<
+        WStringSeq,
+        TAO_SeqElem_WString_Manager
+      >
+    WStringSeq_var;
+
+  typedef
+    TAO_MngSeq_Out_T<
+        WStringSeq,
+        WStringSeq_var,
+        TAO_SeqElem_WString_Manager
+      >
+    WStringSeq_out;
+
+  class TAO_Export WStringSeq
+    : public
+        TAO_Unbounded_WString_Sequence
   {
   public:
-    WStringSeq (void); // default ctor
-    WStringSeq (CORBA::ULong max); // uses max size
+    WStringSeq (void);
+    WStringSeq (CORBA::ULong max);
     WStringSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::WChar * *buffer, 
-      CORBA::Boolean release = 0
-    );
-    WStringSeq (const WStringSeq &); // copy ctor
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::WChar ** buffer,
+        CORBA::Boolean release = 0
+      );
+    WStringSeq (const WStringSeq &);
     ~WStringSeq (void);
-    static void _tao_any_destructor (void*);
-    
-    typedef WStringSeq_var _var_type;
-  };
 
-#endif /* end #if !defined */
+    static void _tao_any_destructor (void *);
 
-#if !defined (_CORBA_WSTRINGSEQ___VAR_CH_)
-#define _CORBA_WSTRINGSEQ___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class WStringSeq_var
-  // *************************************************************
-
-  class TAO_Export WStringSeq_var
-  {
-  public:
-    WStringSeq_var (void); // default constructor
-    WStringSeq_var (WStringSeq *);
-    WStringSeq_var (const WStringSeq_var &); // copy constructor
-    ~WStringSeq_var (void); // destructor
-    
-    WStringSeq_var &operator= (WStringSeq *);
-    WStringSeq_var &operator= (const WStringSeq_var &);
-    WStringSeq *operator-> (void);
-    const WStringSeq *operator-> (void) const;
-    
-    operator const WStringSeq &() const;
-    operator WStringSeq &();
-    operator WStringSeq &() const;
-    operator WStringSeq *&(); // variable-size base types only
-    
-    TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const WStringSeq &in (void) const;
-    WStringSeq &inout (void);
-    WStringSeq *&out (void);
-    WStringSeq *_retn (void);
-    WStringSeq *ptr (void) const;
-
-  private:
-    WStringSeq *ptr_;
+    typedef WStringSeq_var _var_type;
   };
 
-#endif /* end #if !defined */
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
 
-#if !defined (_CORBA_WSTRINGSEQ___OUT_CH_)
-#define _CORBA_WSTRINGSEQ___OUT_CH_
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq;
 
-  class TAO_Export WStringSeq_out
-  {
-  public:
-    WStringSeq_out (WStringSeq *&);
-    WStringSeq_out (WStringSeq_var &);
-    WStringSeq_out (const WStringSeq_out &);
-    WStringSeq_out &operator= (const WStringSeq_out &);
-    WStringSeq_out &operator= (WStringSeq *);
-    operator WStringSeq *&();
-    WStringSeq *&ptr (void);
-    WStringSeq *operator-> (void);
-    TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-  
-  private:
-    WStringSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const WStringSeq_var &);
-  };
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
-#endif /* end #if !defined */
-  
-}  // End namespace CORBA
+}
+TAO_NAMESPACE_CLOSE // module CORBA
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
+
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
@@ -327,7 +224,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "StringSeqC.i"
@@ -343,4 +240,3 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/StringSeqC.i b/TAO/tao/StringSeqC.i
index 66a4b0ae58d..6e55aadacaa 100644
--- a/TAO/tao/StringSeqC.i
+++ b/TAO/tao/StringSeqC.i
@@ -20,482 +20,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_CORBA_STRINGSEQ_CI_)
-#define _CORBA_STRINGSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::StringSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::StringSeq_var::StringSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::StringSeq_var::StringSeq_var (StringSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::StringSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::StringSeq_var::~StringSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StringSeq_var &
-CORBA::StringSeq_var::operator= (StringSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::StringSeq_var &
-CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          StringSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              StringSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              StringSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::StringSeq *
-CORBA::StringSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StringSeq *
-CORBA::StringSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StringSeq_var::operator const ::CORBA::StringSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StringSeq_var::operator ::CORBA::StringSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::StringSeq_var::operator ::CORBA::StringSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::StringSeq_var::operator ::CORBA::StringSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::StringSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::StringSeq &
-CORBA::StringSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StringSeq &
-CORBA::StringSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StringSeq *&
-CORBA::StringSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StringSeq *
-CORBA::StringSeq_var::_retn (void)
-{
-  ::CORBA::StringSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::StringSeq *
-CORBA::StringSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class CORBA::StringSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::StringSeq_out::StringSeq_out (StringSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StringSeq_out::StringSeq_out (StringSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p)
-  : ptr_ (ACE_const_cast (StringSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::StringSeq_out &
-CORBA::StringSeq_out::operator= (const ::CORBA::StringSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (StringSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::StringSeq_out &
-CORBA::StringSeq_out::operator= (StringSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::StringSeq_out::operator ::CORBA::StringSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StringSeq *&
-CORBA::StringSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::StringSeq *
-CORBA::StringSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_String_Manager
-CORBA::StringSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGSEQ_CI_)
-#define _CORBA_WSTRINGSEQ_CI_
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class CORBA::WStringSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::WStringSeq_var::WStringSeq_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA::WStringSeq_var::WStringSeq_var (WStringSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::CORBA::WStringSeq (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-CORBA::WStringSeq_var::~WStringSeq_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::WStringSeq_var &
-CORBA::WStringSeq_var::operator= (WStringSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq_var &
-CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          WStringSeq *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              WStringSeq (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              WStringSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::CORBA::WStringSeq *
-CORBA::WStringSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq *
-CORBA::WStringSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::WStringSeq_var::operator const ::CORBA::WStringSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-CORBA::WStringSeq_var::operator ::CORBA::WStringSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_WString_Manager
-CORBA::WStringSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const ::CORBA::WStringSeq &
-CORBA::WStringSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq &
-CORBA::WStringSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq *&
-CORBA::WStringSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq *
-CORBA::WStringSeq_var::_retn (void)
-{
-  ::CORBA::WStringSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq *
-CORBA::WStringSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class CORBA::WStringSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::WStringSeq_out::WStringSeq_out (WStringSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::WStringSeq_out::WStringSeq_out (WStringSeq_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p)
-  : ptr_ (ACE_const_cast (WStringSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::CORBA::WStringSeq_out &
-CORBA::WStringSeq_out::operator= (const ::CORBA::WStringSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (WStringSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq_out &
-CORBA::WStringSeq_out::operator= (WStringSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::WStringSeq_out::operator ::CORBA::WStringSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq *&
-CORBA::WStringSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::CORBA::WStringSeq *
-CORBA::WStringSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_SeqElem_WString_Manager
-CORBA::WStringSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
 
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 7863b259e1e..3b856561ce2 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -529,7 +529,6 @@ SOURCE=.\Invocation_Endpoint_Selectors.cpp
 # Begin Source File

 

 SOURCE=.\IOP_CodecC.cpp

-# ADD CPP /GR

 # End Source File

 # Begin Source File

 

@@ -1037,6 +1036,10 @@ SOURCE=.\arg_shifter.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Array_VarOut_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_Invocation.h

 # End Source File

 # Begin Source File

@@ -1545,6 +1548,10 @@ SOURCE=.\ObjectReferenceTemplateC.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Objref_VarOut_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\OctetSeqC.h

 # End Source File

 # Begin Source File

@@ -1657,6 +1664,14 @@ SOURCE=.\Protocols_Hooks.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pseudo_Value_VarOut_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Pseudo_VarOut_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Queued_Message.h

 # End Source File

 # Begin Source File

@@ -1697,6 +1712,10 @@ SOURCE=.\Resume_Handle.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Seq_VarOut_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\sequence.h

 # End Source File

 # Begin Source File

@@ -1845,6 +1864,10 @@ SOURCE=.\TypeCodeFactory_Adapter.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Value_VarOut_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ValueBase.h

 # End Source File

 # Begin Source File

@@ -1861,6 +1884,10 @@ SOURCE=.\varbase.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\VarOut_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Wait_On_Leader_Follower.h

 # End Source File

 # Begin Source File

@@ -1909,6 +1936,10 @@ SOURCE=.\Any_T.inl
 # End Source File

 # Begin Source File

 

+SOURCE=.\Array_VarOut_T.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_Invocation.i

 # End Source File

 # Begin Source File

@@ -2253,6 +2284,10 @@ SOURCE=.\ObjectReferenceTemplateC.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Objref_VarOut_T.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\OctetSeqC.i

 # End Source File

 # Begin Source File

@@ -2333,6 +2368,10 @@ SOURCE=.\Profile.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Pseudo_VarOut_T.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Queued_Message.inl

 # End Source File

 # Begin Source File

@@ -2345,6 +2384,10 @@ SOURCE=.\Resume_Handle.inl
 # End Source File

 # Begin Source File

 

+SOURCE=.\Seq_VarOut_T.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\sequence.i

 # End Source File

 # Begin Source File

@@ -2445,6 +2488,10 @@ SOURCE=.\typecode.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Value_VarOut_T.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\ValueBase.i

 # End Source File

 # Begin Source File

@@ -2455,6 +2502,10 @@ SOURCE=.\ValueFactory.i
 

 SOURCE=.\ValueFactory_Map.i

 # End Source File

+# Begin Source File

+

+SOURCE=.\VarOut_T.inl

+# End Source File

 # End Group

 # Begin Group "Resource files"

 

@@ -2474,14 +2525,49 @@ SOURCE=.\Any_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Array_VarOut_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

 SOURCE=.\Codeset_Translator_Factory_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

+SOURCE=.\Objref_VarOut_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\Pseudo_Value_VarOut_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\Pseudo_VarOut_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\Seq_VarOut_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sequence_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

+# Begin Source File

+

+SOURCE=.\Value_VarOut_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\VarOut_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

 # End Group

 # End Target

 # End Project

diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index d4cbbe0fc82..ee779b40b87 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -29,10 +29,6 @@
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-#include "tao/Any_T.h"
-
 #if !defined (__ACE_INLINE__)
 #include "TAOC.i"
 #endif /* !defined INLINE */
@@ -44,22 +40,22 @@ static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e744d), 
-  ACE_NTOHL (0x6f64653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
+  ACE_NTOHL (0x54414f2f),
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e744d),
+  ACE_NTOHL (0x6f64653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
     24,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e744d), 
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e744d),
   ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
     CORBA::tk_ushort,
 
@@ -89,81 +85,81 @@ static const CORBA::Long _oc_TAO_BufferingConstraint[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
+  ACE_NTOHL (0x54414f2f),
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraint:1.0
     20,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
   ACE_NTOHL (0x696e7400),  // name = BufferingConstraint
   4, // member count
     5,
-  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x6d6f6465),
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_alias, // typecode kind for typedefs
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x74616f2f), 
-    ACE_NTOHL (0x54414f2f), 
-    ACE_NTOHL (0x42756666), 
-    ACE_NTOHL (0x6572696e), 
-    ACE_NTOHL (0x67436f6e), 
-    ACE_NTOHL (0x73747261), 
-    ACE_NTOHL (0x696e744d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x74616f2f),
+    ACE_NTOHL (0x54414f2f),
+    ACE_NTOHL (0x42756666),
+    ACE_NTOHL (0x6572696e),
+    ACE_NTOHL (0x67436f6e),
+    ACE_NTOHL (0x73747261),
+    ACE_NTOHL (0x696e744d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
         24,
-    ACE_NTOHL (0x42756666), 
-    ACE_NTOHL (0x6572696e), 
-    ACE_NTOHL (0x67436f6e), 
-    ACE_NTOHL (0x73747261), 
-    ACE_NTOHL (0x696e744d), 
+    ACE_NTOHL (0x42756666),
+    ACE_NTOHL (0x6572696e),
+    ACE_NTOHL (0x67436f6e),
+    ACE_NTOHL (0x73747261),
+    ACE_NTOHL (0x696e744d),
     ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
         CORBA::tk_ushort,
 
 
   8,
-  ACE_NTOHL (0x74696d65), 
+  ACE_NTOHL (0x74696d65),
   ACE_NTOHL (0x6f757400),  // name = timeout
     CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
         6,
-    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54696d65),
     ACE_NTOHL (0x54000000),  // name = TimeT
         CORBA::tk_ulonglong,
 
 
   14,
-  ACE_NTOHL (0x6d657373), 
-  ACE_NTOHL (0x6167655f), 
-  ACE_NTOHL (0x636f756e), 
+  ACE_NTOHL (0x6d657373),
+  ACE_NTOHL (0x6167655f),
+  ACE_NTOHL (0x636f756e),
   ACE_NTOHL (0x74000000),  // name = message_count
     CORBA::tk_ulong,
 
   14,
-  ACE_NTOHL (0x6d657373), 
-  ACE_NTOHL (0x6167655f), 
-  ACE_NTOHL (0x62797465), 
+  ACE_NTOHL (0x6d657373),
+  ACE_NTOHL (0x6167655f),
+  ACE_NTOHL (0x62797465),
   ACE_NTOHL (0x73000000),  // name = message_bytes
     CORBA::tk_ulong,
 
@@ -186,8 +182,8 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -196,12 +192,31 @@ void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      BufferingConstraint
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      BufferingConstraint \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
 
 int TAO::BufferingConstraintPolicy::_tao_class_id = 0;
 
 TAO::BufferingConstraintPolicy_ptr
-tao_TAO_BufferingConstraintPolicy_duplicate (
+TAO::tao_BufferingConstraintPolicy_life::tao_duplicate (
     TAO::BufferingConstraintPolicy_ptr p
   )
 {
@@ -209,7 +224,7 @@ tao_TAO_BufferingConstraintPolicy_duplicate (
 }
 
 void
-tao_TAO_BufferingConstraintPolicy_release (
+TAO::tao_BufferingConstraintPolicy_life::tao_release (
     TAO::BufferingConstraintPolicy_ptr p
   )
 {
@@ -217,15 +232,24 @@ tao_TAO_BufferingConstraintPolicy_release (
 }
 
 TAO::BufferingConstraintPolicy_ptr
-tao_TAO_BufferingConstraintPolicy_nil (
+TAO::tao_BufferingConstraintPolicy_life::tao_nil (
     void
   )
 {
   return TAO::BufferingConstraintPolicy::_nil ();
 }
 
+CORBA::Boolean
+TAO::tao_BufferingConstraintPolicy_life::tao_marshal (
+    TAO::BufferingConstraintPolicy_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 TAO::BufferingConstraintPolicy_ptr
-tao_TAO_BufferingConstraintPolicy_narrow (
+TAO::tao_BufferingConstraintPolicy_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -234,7 +258,7 @@ tao_TAO_BufferingConstraintPolicy_narrow (
 }
 
 CORBA::Object *
-tao_TAO_BufferingConstraintPolicy_upcast (
+TAO::tao_BufferingConstraintPolicy_cast::tao_upcast (
     void *src
   )
 {
@@ -243,205 +267,32 @@ tao_TAO_BufferingConstraintPolicy_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_TAO_BufferingConstraintPolicy_marshal (
-    TAO::BufferingConstraintPolicy_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// TAO::BufferingConstraintPolicy_var
-// *************************************************************
-
-TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void)
-  : ptr_ (BufferingConstraintPolicy::_nil ())
-{}
-
-::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const ::TAO::BufferingConstraintPolicy_var &p)
-  : TAO_Base_var (),
-    ptr_ (BufferingConstraintPolicy::_duplicate (p.ptr ()))
-{}
-
-TAO::BufferingConstraintPolicy_var::~BufferingConstraintPolicy_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-TAO::BufferingConstraintPolicy_var &
-TAO::BufferingConstraintPolicy_var::operator= (BufferingConstraintPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO::BufferingConstraintPolicy_var &
-TAO::BufferingConstraintPolicy_var::operator= (const ::TAO::BufferingConstraintPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::TAO::BufferingConstraintPolicy_ptr &
-TAO::BufferingConstraintPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::TAO::BufferingConstraintPolicy_ptr &
-TAO::BufferingConstraintPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
-  return this->ptr_;
-}
-
-::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO::BufferingConstraintPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
-  return val;
-}
-
-::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::tao_duplicate (BufferingConstraintPolicy_ptr p)
-{
-  return ::TAO::BufferingConstraintPolicy::_duplicate (p);
-}
-
-void
-TAO::BufferingConstraintPolicy_var::tao_release (BufferingConstraintPolicy_ptr p)
-{
-  CORBA::release (p);
-}
-
-::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::tao_nil (void)
-{
-  return ::TAO::BufferingConstraintPolicy::_nil ();
-}
-
-::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-TAO::BufferingConstraintPolicy_var::tao_upcast (void *src)
-{
-  BufferingConstraintPolicy **tmp =
-    ACE_static_cast (BufferingConstraintPolicy **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        TAO::BufferingConstraintPolicy,
+        TAO::tao_BufferingConstraintPolicy_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        TAO::BufferingConstraintPolicy,
+        TAO::tao_BufferingConstraintPolicy_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        TAO::BufferingConstraintPolicy, \
+        TAO::tao_BufferingConstraintPolicy_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        TAO::BufferingConstraintPolicy, \
+        TAO::tao_BufferingConstraintPolicy_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// TAO::BufferingConstraintPolicy_out
-// *************************************************************
-
-TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
-}
-
-TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
-}
-
-TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (const ::TAO::BufferingConstraintPolicy_out &p)
-  : ptr_ (ACE_const_cast (BufferingConstraintPolicy_out &, p).ptr_)
-{}
-
-::TAO::BufferingConstraintPolicy_out &
-TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (BufferingConstraintPolicy_out&, p).ptr_;
-  return *this;
-}
-
-TAO::BufferingConstraintPolicy_out &
-TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_var &p)
-{
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-TAO::BufferingConstraintPolicy_out &
-TAO::BufferingConstraintPolicy_out::operator= (BufferingConstraintPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::TAO::BufferingConstraintPolicy_ptr &
-TAO::BufferingConstraintPolicy_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 {}
@@ -449,7 +300,7 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
-void 
+void
 TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   BufferingConstraintPolicy *tmp = ACE_static_cast (BufferingConstraintPolicy *, _tao_void_pointer);
@@ -465,7 +316,7 @@ TAO::BufferingConstraintPolicy::_narrow (
   return BufferingConstraintPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-TAO::BufferingConstraintPolicy_ptr 
+TAO::BufferingConstraintPolicy_ptr
 TAO::BufferingConstraintPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -475,7 +326,7 @@ TAO::BufferingConstraintPolicy::_unchecked_narrow (
     {
       return BufferingConstraintPolicy::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           BufferingConstraintPolicy_ptr,
@@ -495,14 +346,14 @@ TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_tao_class_id)
@@ -535,12 +386,12 @@ void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -549,6 +400,12 @@ const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) cons
   return "IDL:tao/TAO/BufferingConstraintPolicy:1.0";
 }
 
+CORBA::Boolean
+TAO::BufferingConstraintPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -556,24 +413,24 @@ static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e7450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
+  ACE_NTOHL (0x54414f2f),
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e7450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0
     26,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e7450), 
-  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e7450),
+  ACE_NTOHL (0x6f6c6963),
   ACE_NTOHL (0x79000000),  // name = BufferingConstraintPolicy
   };
 
@@ -594,7 +451,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -709,10 +566,6 @@ operator>>= (
   template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>;
   template class TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>
+# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy, TAO::BufferingConstraintPolicy_var>
 # pragma instantiate TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
-
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index e65c81b3a69..b99122161f4 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -27,14 +27,15 @@
 
 #include "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PolicyC.h"
+#include "Messaging_SyncScopeC.h"
 #include "TimeBaseC.h"
+#include "VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -64,10 +65,9 @@
 
 TAO_NAMESPACE  TAO
 {
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_out;
@@ -80,27 +80,40 @@ TAO_NAMESPACE  TAO
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::UShort BUFFER_FLUSH = 0U;
+  const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::UShort BUFFER_TIMEOUT = 1U;
+  const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::UShort BUFFER_MESSAGE_COUNT = 2U;
+  const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::UShort BUFFER_MESSAGE_BYTES = 4U;
+  const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
+  
+  struct BufferingConstraint;
   
-  class BufferingConstraint_var;
+  typedef
+    TAO_Fixed_Var_T<
+        BufferingConstraint
+      >
+    BufferingConstraint_var;
+  
+  typedef
+    BufferingConstraint &
+    BufferingConstraint_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export BufferingConstraint
   {
@@ -114,48 +127,6 @@ TAO_NAMESPACE  TAO
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export BufferingConstraint_var
-  {
-  public:
-    BufferingConstraint_var (void);
-    BufferingConstraint_var (BufferingConstraint *);
-    BufferingConstraint_var (const BufferingConstraint_var &);
-    // Fixed-size types only.
-    BufferingConstraint_var (const BufferingConstraint &);
-    ~BufferingConstraint_var (void);
-    
-    BufferingConstraint_var &operator= (BufferingConstraint *);
-    BufferingConstraint_var &operator= (const BufferingConstraint_var &);
-    
-    // Fixed-size types only.
-    BufferingConstraint_var &operator= (const BufferingConstraint &);
-    
-    BufferingConstraint *operator-> (void);
-    const BufferingConstraint *operator-> (void) const;
-    
-    operator const BufferingConstraint &() const;
-    operator BufferingConstraint &();
-    operator BufferingConstraint &() const;
-    
-    // in, inout, out, _retn 
-    const BufferingConstraint &in (void) const;
-    BufferingConstraint &inout (void);
-    BufferingConstraint &out (void);
-    BufferingConstraint _retn (void);
-    BufferingConstraint *ptr (void) const;
-  
-  private:
-    BufferingConstraint *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
-  
-  typedef BufferingConstraint &BufferingConstraint_out;
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint;
@@ -163,93 +134,44 @@ TAO_NAMESPACE  TAO
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::ULong BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
+  const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___PTR_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY___PTR_CH_
+#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__ODDS_N_ENDS_CH_)
+#define _TAO_BUFFERINGCONSTRAINTPOLICY__ODDS_N_ENDS_CH_
   
   class BufferingConstraintPolicy;
   typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  struct tao_BufferingConstraintPolicy_life;
+  typedef TAO_Objref_Var_T<BufferingConstraintPolicy, tao_BufferingConstraintPolicy_life> BufferingConstraintPolicy_var;
+  typedef TAO_Objref_Out_T<BufferingConstraintPolicy, tao_BufferingConstraintPolicy_life> BufferingConstraintPolicy_out;
   
-  class TAO_Export BufferingConstraintPolicy_var : public TAO_Base_var
+  struct TAO_Export tao_BufferingConstraintPolicy_life
   {
-  public:
-    BufferingConstraintPolicy_var (void); // default constructor
-    BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {} 
-    BufferingConstraintPolicy_var (const BufferingConstraintPolicy_var &); // copy constructor
-    ~BufferingConstraintPolicy_var (void); // destructor
-    
-    BufferingConstraintPolicy_var &operator= (BufferingConstraintPolicy_ptr);
-    BufferingConstraintPolicy_var &operator= (const BufferingConstraintPolicy_var &);
-    BufferingConstraintPolicy_ptr operator-> (void) const;
-    
-    operator const BufferingConstraintPolicy_ptr &() const;
-    operator BufferingConstraintPolicy_ptr &();
-    // in, inout, out, _retn 
-    BufferingConstraintPolicy_ptr in (void) const;
-    BufferingConstraintPolicy_ptr &inout (void);
-    BufferingConstraintPolicy_ptr &out (void);
-    BufferingConstraintPolicy_ptr _retn (void);
-    BufferingConstraintPolicy_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static BufferingConstraintPolicy_ptr tao_duplicate (BufferingConstraintPolicy_ptr);
     static void tao_release (BufferingConstraintPolicy_ptr);
     static BufferingConstraintPolicy_ptr tao_nil (void);
-    static BufferingConstraintPolicy_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        BufferingConstraintPolicy_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    BufferingConstraintPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    BufferingConstraintPolicy_var (const TAO_Base_var &rhs);
-    BufferingConstraintPolicy_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___OUT_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
   
-  class TAO_Export BufferingConstraintPolicy_out
+  struct TAO_Export tao_BufferingConstraintPolicy_cast
   {
-  public:
-    BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &);
-    BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &);
-    BufferingConstraintPolicy_out (const BufferingConstraintPolicy_out &);
-    BufferingConstraintPolicy_out &operator= (const BufferingConstraintPolicy_out &);
-    BufferingConstraintPolicy_out &operator= (const BufferingConstraintPolicy_var &);
-    BufferingConstraintPolicy_out &operator= (BufferingConstraintPolicy_ptr);
-    operator BufferingConstraintPolicy_ptr &();
-    BufferingConstraintPolicy_ptr &ptr (void);
-    BufferingConstraintPolicy_ptr operator-> (void);
-  
-  private:
-    BufferingConstraintPolicy_ptr &ptr_;
+    static BufferingConstraintPolicy_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
@@ -293,7 +215,7 @@ TAO_NAMESPACE  TAO
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -303,10 +225,6 @@ TAO_NAMESPACE  TAO
   protected:
     BufferingConstraintPolicy (void);
     virtual ~BufferingConstraintPolicy (void);
-    
-    friend class _TAO_BufferingConstraintPolicy_Remote_Proxy_Impl;
-    friend class _TAO_BufferingConstraintPolicy_ThruPOA_Proxy_Impl;
-    friend class _TAO_BufferingConstraintPolicy_Direct_Proxy_Impl;
   
   private:
     BufferingConstraintPolicy (const BufferingConstraintPolicy &);
@@ -320,17 +238,15 @@ TAO_NAMESPACE  TAO
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy;
   
-#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short SYNC_EAGER_BUFFERING = 0;
+  const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
   
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
   
-  const CORBA::Short SYNC_DELAYED_BUFFERING = -2;
+  const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
@@ -338,8 +254,6 @@ TAO_NAMESPACE  TAO
 }
 TAO_NAMESPACE_CLOSE // module TAO
 
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
@@ -372,14 +286,12 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "TAOC.i"
 #endif /* defined INLINE */
 
-#endif  /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index 38fdd22685a..0e5dcf9bb14 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -21,181 +21,10 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class TAO::BufferingConstraint_var
-// *************************************************************
-
-ACE_INLINE
-TAO::BufferingConstraint_var::BufferingConstraint_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TAO::BufferingConstraint_var::BufferingConstraint_var (BufferingConstraint *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::TAO::BufferingConstraint (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint &p)
-{
-  ACE_NEW (this->ptr_, ::TAO::BufferingConstraint (p));
-}
-
-ACE_INLINE
-TAO::BufferingConstraint_var::~BufferingConstraint_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-TAO::BufferingConstraint_var &
-TAO::BufferingConstraint_var::operator= (BufferingConstraint *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::TAO::BufferingConstraint_var &
-TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          BufferingConstraint *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              BufferingConstraint (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              BufferingConstraint *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE TAO::BufferingConstraint_var &
-TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::TAO::BufferingConstraint (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::TAO::BufferingConstraint *
-TAO::BufferingConstraint_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::BufferingConstraint *
-TAO::BufferingConstraint_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO::BufferingConstraint_var::operator const ::TAO::BufferingConstraint &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::TAO::BufferingConstraint &
-TAO::BufferingConstraint_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TAO::BufferingConstraint &
-TAO::BufferingConstraint_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::TAO::BufferingConstraint &
-TAO::BufferingConstraint_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TAO::BufferingConstraint
-TAO::BufferingConstraint_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TAO::BufferingConstraint *
-TAO::BufferingConstraint_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_
-
-ACE_INLINE
-CORBA::Boolean
-TAO::BufferingConstraintPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -226,7 +55,7 @@ TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -269,4 +98,3 @@ CORBA::Boolean operator>> (
       return 0;
     }
 }
-
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index fff9ea8f003..335360ceab2 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -19,8 +19,11 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "TimeBaseC.h"
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
 
+#include "tao/TimeBaseC.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 
@@ -262,7 +265,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -271,6 +274,25 @@ void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      UtcT
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      UtcT \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_TimeBase_IntervalT[] =
@@ -339,7 +361,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
 void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer)
 {
@@ -347,6 +369,25 @@ void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
+  TAO_Fixed_Var_T<
+      IntervalT
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+  TAO_Fixed_Var_T< \
+      IntervalT \
+    >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index 04632051f26..e30bb4552d2 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -26,15 +26,13 @@
 #define _TAO_IDL_ORIG_TIMEBASEC_H_
 
 #include "ace/pre.h"
-#include "tao/corbafwd.h"
 #include "tao/Any_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "tao/SmartProxies/Smart_Proxies.h"
+#include "tao/VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -66,7 +64,7 @@ TAO_NAMESPACE  TimeBase
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::ULongLong TimeT;
   typedef CORBA::ULongLong_out TimeT_out;
@@ -77,7 +75,7 @@ TAO_NAMESPACE  TimeBase
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TimeT;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef TimeT InaccuracyT;
   typedef TimeT_out InaccuracyT_out;
@@ -88,7 +86,7 @@ TAO_NAMESPACE  TimeBase
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InaccuracyT;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
   
   typedef CORBA::Short TdfT;
   typedef CORBA::Short_out TdfT_out;
@@ -99,9 +97,22 @@ TAO_NAMESPACE  TimeBase
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TdfT;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  class UtcT_var;
+  struct UtcT;
+  
+  typedef
+    TAO_Fixed_Var_T<
+        UtcT
+      >
+    UtcT_var;
+  
+  typedef
+    UtcT &
+    UtcT_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export UtcT
   {
@@ -115,56 +126,27 @@ TAO_NAMESPACE  TimeBase
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export UtcT_var
-  {
-  public:
-    UtcT_var (void);
-    UtcT_var (UtcT *);
-    UtcT_var (const UtcT_var &);
-    // Fixed-size types only.
-    UtcT_var (const UtcT &);
-    ~UtcT_var (void);
-    
-    UtcT_var &operator= (UtcT *);
-    UtcT_var &operator= (const UtcT_var &);
-    
-    // Fixed-size types only.
-    UtcT_var &operator= (const UtcT &);
-    
-    UtcT *operator-> (void);
-    const UtcT *operator-> (void) const;
-    
-    operator const UtcT &() const;
-    operator UtcT &();
-    operator UtcT &() const;
-    
-    // in, inout, out, _retn 
-    const UtcT &in (void) const;
-    UtcT &inout (void);
-    UtcT &out (void);
-    UtcT _retn (void);
-    UtcT *ptr (void) const;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
-  private:
-    UtcT *ptr_;
-  };
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UtcT;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231
   
-  typedef UtcT &UtcT_out;
+  struct IntervalT;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  typedef
+    TAO_Fixed_Var_T<
+        IntervalT
+      >
+    IntervalT_var;
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UtcT;
+  typedef
+    IntervalT &
+    IntervalT_out;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
-  
-  class IntervalT_var;
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export IntervalT
   {
@@ -176,48 +158,6 @@ TAO_NAMESPACE  TimeBase
   };
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
-  
-  class TAO_Export IntervalT_var
-  {
-  public:
-    IntervalT_var (void);
-    IntervalT_var (IntervalT *);
-    IntervalT_var (const IntervalT_var &);
-    // Fixed-size types only.
-    IntervalT_var (const IntervalT &);
-    ~IntervalT_var (void);
-    
-    IntervalT_var &operator= (IntervalT *);
-    IntervalT_var &operator= (const IntervalT_var &);
-    
-    // Fixed-size types only.
-    IntervalT_var &operator= (const IntervalT &);
-    
-    IntervalT *operator-> (void);
-    const IntervalT *operator-> (void) const;
-    
-    operator const IntervalT &() const;
-    operator IntervalT &();
-    operator IntervalT &() const;
-    
-    // in, inout, out, _retn 
-    const IntervalT &in (void) const;
-    IntervalT &inout (void);
-    IntervalT &out (void);
-    IntervalT _retn (void);
-    IntervalT *ptr (void) const;
-  
-  private:
-    IntervalT *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105
-  
-  typedef IntervalT &IntervalT_out;
-  
-  // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IntervalT;
@@ -267,7 +207,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "TimeBaseC.i"
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
index 3db4462317f..02bd740e22c 100644
--- a/TAO/tao/TimeBaseC.i
+++ b/TAO/tao/TimeBaseC.i
@@ -21,333 +21,7 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class TimeBase::UtcT_var
-// *************************************************************
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (UtcT *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::TimeBase::UtcT (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT &p)
-{
-  ACE_NEW (this->ptr_, ::TimeBase::UtcT (p));
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::~UtcT_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (UtcT *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          UtcT *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              UtcT (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              UtcT *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::TimeBase::UtcT (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::TimeBase::UtcT *
-TimeBase::UtcT_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TimeBase::UtcT *
-TimeBase::UtcT_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator const ::TimeBase::UtcT &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator ::TimeBase::UtcT &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator ::TimeBase::UtcT &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::TimeBase::UtcT &
-TimeBase::UtcT_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TimeBase::UtcT &
-TimeBase::UtcT_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::TimeBase::UtcT &
-TimeBase::UtcT_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TimeBase::UtcT
-TimeBase::UtcT_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TimeBase::UtcT *
-TimeBase::UtcT_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class TimeBase::IntervalT_var
-// *************************************************************
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (IntervalT *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::TimeBase::IntervalT (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size types only.
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT &p)
-{
-  ACE_NEW (this->ptr_, ::TimeBase::IntervalT (p));
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::~IntervalT_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (IntervalT *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          IntervalT *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              IntervalT (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              IntervalT *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (
-        this->ptr_,
-        ::TimeBase::IntervalT (p),
-        *this
-      );
-  }
-  
-  return *this;
-}
-
-ACE_INLINE const ::TimeBase::IntervalT *
-TimeBase::IntervalT_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TimeBase::IntervalT *
-TimeBase::IntervalT_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator const ::TimeBase::IntervalT &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator ::TimeBase::IntervalT &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator ::TimeBase::IntervalT &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::TimeBase::IntervalT &
-TimeBase::IntervalT_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TimeBase::IntervalT &
-TimeBase::IntervalT_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::TimeBase::IntervalT &
-TimeBase::IntervalT_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TimeBase::IntervalT
-TimeBase::IntervalT_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::TimeBase::IntervalT *
-TimeBase::IntervalT_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -392,7 +66,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index 2aa239bf0d7..95a187f66b7 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -35,7 +35,6 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -50,7 +49,7 @@
 int CORBA::TypeCodeFactory::_tao_class_id = 0;
 
 CORBA::TypeCodeFactory_ptr
-tao_CORBA_TypeCodeFactory_duplicate (
+CORBA::tao_TypeCodeFactory_life::tao_duplicate (
     CORBA::TypeCodeFactory_ptr p
   )
 {
@@ -58,7 +57,7 @@ tao_CORBA_TypeCodeFactory_duplicate (
 }
 
 void
-tao_CORBA_TypeCodeFactory_release (
+CORBA::tao_TypeCodeFactory_life::tao_release (
     CORBA::TypeCodeFactory_ptr p
   )
 {
@@ -66,15 +65,24 @@ tao_CORBA_TypeCodeFactory_release (
 }
 
 CORBA::TypeCodeFactory_ptr
-tao_CORBA_TypeCodeFactory_nil (
+CORBA::tao_TypeCodeFactory_life::tao_nil (
     void
   )
 {
   return CORBA::TypeCodeFactory::_nil ();
 }
 
+CORBA::Boolean
+CORBA::tao_TypeCodeFactory_life::tao_marshal (
+    CORBA::TypeCodeFactory_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
 CORBA::TypeCodeFactory_ptr
-tao_CORBA_TypeCodeFactory_narrow (
+CORBA::tao_TypeCodeFactory_cast::tao_narrow (
     CORBA::Object *p
     ACE_ENV_ARG_DECL
   )
@@ -83,7 +91,7 @@ tao_CORBA_TypeCodeFactory_narrow (
 }
 
 CORBA::Object *
-tao_CORBA_TypeCodeFactory_upcast (
+CORBA::tao_TypeCodeFactory_cast::tao_upcast (
     void *src
   )
 {
@@ -92,205 +100,32 @@ tao_CORBA_TypeCodeFactory_upcast (
   return *tmp;
 }
 
-CORBA::Boolean
-tao_CORBA_TypeCodeFactory_marshal (
-    CORBA::TypeCodeFactory_ptr p,
-    TAO_OutputCDR &strm
-  )
-{
-  return p->marshal (strm);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721
-
-// *************************************************************
-// CORBA::TypeCodeFactory_var
-// *************************************************************
-
-CORBA::TypeCodeFactory_var::TypeCodeFactory_var (void)
-  : ptr_ (TypeCodeFactory::_nil ())
-{}
-
-::CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::TypeCodeFactory_var::TypeCodeFactory_var (const ::CORBA::TypeCodeFactory_var &p)
-  : TAO_Base_var (),
-    ptr_ (TypeCodeFactory::_duplicate (p.ptr ()))
-{}
-
-CORBA::TypeCodeFactory_var::~TypeCodeFactory_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-CORBA::TypeCodeFactory_var &
-CORBA::TypeCodeFactory_var::operator= (TypeCodeFactory_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::TypeCodeFactory_var &
-CORBA::TypeCodeFactory_var::operator= (const ::CORBA::TypeCodeFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA::TypeCodeFactory::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-CORBA::TypeCodeFactory_var::operator const ::CORBA::TypeCodeFactory_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-CORBA::TypeCodeFactory_var::operator ::CORBA::TypeCodeFactory_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-::CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-::CORBA::TypeCodeFactory_ptr &
-CORBA::TypeCodeFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::TypeCodeFactory_ptr &
-CORBA::TypeCodeFactory_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::TypeCodeFactory::_nil ();
-  return this->ptr_;
-}
-
-::CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA::TypeCodeFactory_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA::TypeCodeFactory::_nil ();
-  return val;
-}
-
-::CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory_var::tao_duplicate (TypeCodeFactory_ptr p)
-{
-  return ::CORBA::TypeCodeFactory::_duplicate (p);
-}
-
-void
-CORBA::TypeCodeFactory_var::tao_release (TypeCodeFactory_ptr p)
-{
-  CORBA::release (p);
-}
-
-::CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory_var::tao_nil (void)
-{
-  return ::CORBA::TypeCodeFactory::_nil ();
-}
-
-::CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory_var::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ::CORBA::TypeCodeFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-CORBA::TypeCodeFactory_var::tao_upcast (void *src)
-{
-  TypeCodeFactory **tmp =
-    ACE_static_cast (TypeCodeFactory **, src);
-  return *tmp;
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        CORBA::TypeCodeFactory,
+        CORBA::tao_TypeCodeFactory_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        CORBA::TypeCodeFactory,
+        CORBA::tao_TypeCodeFactory_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        CORBA::TypeCodeFactory, \
+        CORBA::tao_TypeCodeFactory_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        CORBA::TypeCodeFactory, \
+        CORBA::tao_TypeCodeFactory_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030
-
-// *************************************************************
-// CORBA::TypeCodeFactory_out
-// *************************************************************
-
-CORBA::TypeCodeFactory_out::TypeCodeFactory_out (TypeCodeFactory_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA::TypeCodeFactory::_nil ();
-}
-
-CORBA::TypeCodeFactory_out::TypeCodeFactory_out (TypeCodeFactory_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA::TypeCodeFactory::_nil ();
-}
-
-CORBA::TypeCodeFactory_out::TypeCodeFactory_out (const ::CORBA::TypeCodeFactory_out &p)
-  : ptr_ (ACE_const_cast (TypeCodeFactory_out &, p).ptr_)
-{}
-
-::CORBA::TypeCodeFactory_out &
-CORBA::TypeCodeFactory_out::operator= (const ::CORBA::TypeCodeFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (TypeCodeFactory_out&, p).ptr_;
-  return *this;
-}
-
-CORBA::TypeCodeFactory_out &
-CORBA::TypeCodeFactory_out::operator= (const ::CORBA::TypeCodeFactory_var &p)
-{
-  this->ptr_ = ::CORBA::TypeCodeFactory::_duplicate (p.ptr ());
-  return *this;
-}
-
-CORBA::TypeCodeFactory_out &
-CORBA::TypeCodeFactory_out::operator= (TypeCodeFactory_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-CORBA::TypeCodeFactory_out::operator ::CORBA::TypeCodeFactory_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-::CORBA::TypeCodeFactory_ptr &
-CORBA::TypeCodeFactory_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-::CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
 
 CORBA::TypeCodeFactory::TypeCodeFactory (void)
 {}
@@ -298,7 +133,7 @@ CORBA::TypeCodeFactory::TypeCodeFactory (void)
 CORBA::TypeCodeFactory::~TypeCodeFactory (void)
 {}
 
-void 
+void
 CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypeCodeFactory *tmp = ACE_static_cast (TypeCodeFactory *, _tao_void_pointer);
@@ -314,7 +149,7 @@ CORBA::TypeCodeFactory::_narrow (
   return TypeCodeFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCodeFactory_ptr 
+CORBA::TypeCodeFactory_ptr
 CORBA::TypeCodeFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -324,7 +159,7 @@ CORBA::TypeCodeFactory::_unchecked_narrow (
     {
       return TypeCodeFactory::_nil ();
     }
-  
+
   return
       ACE_reinterpret_cast (
           TypeCodeFactory_ptr,
@@ -344,14 +179,14 @@ CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
 void *CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
-  
+
   if (type == ACE_reinterpret_cast (
               ptr_arith_t,
               &ACE_NESTED_CLASS (::CORBA, TypeCodeFactory)::_tao_class_id)
@@ -370,12 +205,12 @@ void *CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-  
+
   if (retv != 0)
     {
       this->_add_ref ();
     }
-  
+
   return retv;
 }
 
@@ -384,6 +219,12 @@ const char* CORBA::TypeCodeFactory::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/TypeCodeFactory:1.0";
 }
 
+CORBA::Boolean
+CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -391,20 +232,20 @@ static const CORBA::Long _oc_CORBA_TypeCodeFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5479), 
-  ACE_NTOHL (0x7065436f), 
-  ACE_NTOHL (0x64654661), 
-  ACE_NTOHL (0x63746f72), 
-  ACE_NTOHL (0x793a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5479),
+  ACE_NTOHL (0x7065436f),
+  ACE_NTOHL (0x64654661),
+  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x793a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeCodeFactory:1.0
     16,
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x46616374), 
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x46616374),
   ACE_NTOHL (0x6f727900),  // name = TypeCodeFactory
   };
 
@@ -473,7 +314,8 @@ operator>>= (
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
   template class TAO_Object_Manager<CORBA::TypeCodeFactory,CORBA::TypeCodeFactory_var>;
+  template class TAO::Any_Impl_T<CORBA::TypeCodeFactory>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::TypeCodeFactory,CORBA::TypeCodeFactory_var>
+# pragma instantiate TAO_Object_Manager<CORBA::TypeCodeFactory, CORBA::TypeCodeFactory_var>
+# pragma instantiate TAO::Any_Impl_T<CORBA::TypeCodeFactory>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 42e91c491ce..b901608f52b 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -27,17 +27,14 @@
 
 #include "ace/pre.h"
 
-#include "tao/corba.h"
+#include "tao/IFR_Client/IFR_ExtendedC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #include "typecodefactory_export.h"
 
-#include "tao/IFR_Client/IFR_ExtendedC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -68,90 +65,53 @@ TAO_NAMESPACE  CORBA
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
 
-#if !defined (_CORBA_TYPECODEFACTORY___PTR_CH_)
-#define _CORBA_TYPECODEFACTORY___PTR_CH_
+#if !defined (_CORBA_TYPECODEFACTORY__ODDS_N_ENDS_CH_)
+#define _CORBA_TYPECODEFACTORY__ODDS_N_ENDS_CH_
   
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_TYPECODEFACTORY___VAR_CH_)
-#define _CORBA_TYPECODEFACTORY___VAR_CH_
+  struct tao_TypeCodeFactory_life;
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571
+  typedef
+    TAO_Objref_Var_T<
+        TypeCodeFactory,
+        tao_TypeCodeFactory_life
+      >
+    TypeCodeFactory_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        TypeCodeFactory,
+        tao_TypeCodeFactory_life
+      >
+    TypeCodeFactory_out;
   
-  class TAO_TypeCodeFactory_Export TypeCodeFactory_var : public TAO_Base_var
+  struct TAO_TypeCodeFactory_Export tao_TypeCodeFactory_life
   {
-  public:
-    TypeCodeFactory_var (void); // default constructor
-    TypeCodeFactory_var (TypeCodeFactory_ptr p) : ptr_ (p) {} 
-    TypeCodeFactory_var (const TypeCodeFactory_var &); // copy constructor
-    ~TypeCodeFactory_var (void); // destructor
-    
-    TypeCodeFactory_var &operator= (TypeCodeFactory_ptr);
-    TypeCodeFactory_var &operator= (const TypeCodeFactory_var &);
-    TypeCodeFactory_ptr operator-> (void) const;
-    
-    operator const TypeCodeFactory_ptr &() const;
-    operator TypeCodeFactory_ptr &();
-    // in, inout, out, _retn 
-    TypeCodeFactory_ptr in (void) const;
-    TypeCodeFactory_ptr &inout (void);
-    TypeCodeFactory_ptr &out (void);
-    TypeCodeFactory_ptr _retn (void);
-    TypeCodeFactory_ptr ptr (void) const;
-    
-    // Hooks used by template sequence and object manager classes
-    // for non-defined forward declared interfaces.
     static TypeCodeFactory_ptr tao_duplicate (TypeCodeFactory_ptr);
     static void tao_release (TypeCodeFactory_ptr);
     static TypeCodeFactory_ptr tao_nil (void);
-    static TypeCodeFactory_ptr tao_narrow (
-        CORBA::Object *
-        ACE_ENV_ARG_DECL_NOT_USED
+    static CORBA::Boolean tao_marshal (
+        TypeCodeFactory_ptr,
+        TAO_OutputCDR &
       );
-    static CORBA::Object * tao_upcast (void *);
-  
-  private:
-    TypeCodeFactory_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    TypeCodeFactory_var (const TAO_Base_var &rhs);
-    TypeCodeFactory_var &operator= (const TAO_Base_var &rhs);
   };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_TYPECODEFACTORY___OUT_CH_)
-#define _CORBA_TYPECODEFACTORY___OUT_CH_
   
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946
-  
-  class TAO_TypeCodeFactory_Export TypeCodeFactory_out
+  struct TAO_TypeCodeFactory_Export tao_TypeCodeFactory_cast
   {
-  public:
-    TypeCodeFactory_out (TypeCodeFactory_ptr &);
-    TypeCodeFactory_out (TypeCodeFactory_var &);
-    TypeCodeFactory_out (const TypeCodeFactory_out &);
-    TypeCodeFactory_out &operator= (const TypeCodeFactory_out &);
-    TypeCodeFactory_out &operator= (const TypeCodeFactory_var &);
-    TypeCodeFactory_out &operator= (TypeCodeFactory_ptr);
-    operator TypeCodeFactory_ptr &();
-    TypeCodeFactory_ptr &ptr (void);
-    TypeCodeFactory_ptr operator-> (void);
-  
-  private:
-    TypeCodeFactory_ptr &ptr_;
+    static TypeCodeFactory_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
   };
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPECODEFACTORY_CH_)
 #define _CORBA_TYPECODEFACTORY_CH_
@@ -435,7 +395,7 @@ TAO_NAMESPACE  CORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
     
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
@@ -445,10 +405,6 @@ TAO_NAMESPACE  CORBA
   protected:
     TypeCodeFactory (void);
     virtual ~TypeCodeFactory (void);
-    
-    friend class _TAO_TypeCodeFactory_Remote_Proxy_Impl;
-    friend class _TAO_TypeCodeFactory_ThruPOA_Proxy_Impl;
-    friend class _TAO_TypeCodeFactory_Direct_Proxy_Impl;
   
   private:
     TypeCodeFactory (const TypeCodeFactory &);
@@ -486,7 +442,7 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
 
 #if defined (__ACE_INLINE__)
 #include "TypeCodeFactoryC.inl"
@@ -503,4 +459,3 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA
 #include "ace/post.h"
 #endif /* ifndef */
 
-
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
index 7113bb15dbd..b9d173d03a1 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
@@ -26,13 +26,6 @@
 #if !defined (_CORBA_TYPECODEFACTORY___CI_)
 #define _CORBA_TYPECODEFACTORY___CI_
 
-ACE_INLINE
-CORBA::Boolean
-CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -61,4 +54,3 @@ TAO::Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
 }
 
 #endif /* end #if !defined */
-
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 01d3b22bc7a..ea4c2ef817a 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 // Typecodes essentially consist of just the CDR octets that get
 // marshaled and unmarshaled, and this code knows how to parse those
 // octets and answer questions CORBA's TypeCode APIs require.
@@ -1129,12 +1128,12 @@ CORBA::TypeCode::private_equal_struct (
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc = 
+      CORBA::TypeCode_var my_member_tc =
         this->member_type (i
                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = 
+      CORBA::TypeCode_var tc_member_tc =
         tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -1288,12 +1287,12 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name = 
+          const char *my_member_name =
             this->member_name (i
                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name = 
+          const char *tc_member_name =
             tc->member_name (i
                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
@@ -1308,12 +1307,12 @@ CORBA::TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc = 
+      CORBA::TypeCode_var my_member_tc =
         this->member_type (i
                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = 
+      CORBA::TypeCode_var tc_member_tc =
         tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -1406,12 +1405,12 @@ CORBA::TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name = 
+          const char *my_member_name =
             this->member_name (i
                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name = 
+          const char *tc_member_name =
             tc->member_name (i
                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
@@ -1471,11 +1470,11 @@ CORBA::TypeCode::private_equal_sequence (
 {
   // this involves comparing the typecodes of the element type as well
   // as the bounds
-  CORBA::TypeCode_var my_elem = 
+  CORBA::TypeCode_var my_elem =
     this->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::TypeCode_var tc_elem = 
+  CORBA::TypeCode_var tc_elem =
     tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -1618,12 +1617,12 @@ CORBA::TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
   for (CORBA::ULong i = 0; i < my_count; ++i)
     {
       // Check if member names are same.
-      const char *my_member_name = 
+      const char *my_member_name =
         this->member_name (i
                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_member_name = 
+      const char *tc_member_name =
         tc->member_name (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -1636,11 +1635,11 @@ CORBA::TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
         }
 
       // Now compare the typecodes of the members.
-      CORBA::TypeCode_var my_member_tc = 
+      CORBA::TypeCode_var my_member_tc =
         this->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = 
+      CORBA::TypeCode_var tc_member_tc =
         tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
@@ -1702,11 +1701,11 @@ CORBA::TypeCode::private_equal_valuetype (
     }
 
   // Compare value modifiers.
-  CORBA::ValueModifier my_vm = 
+  CORBA::ValueModifier my_vm =
     this->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ValueModifier tc_vm = 
+  CORBA::ValueModifier tc_vm =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -1757,12 +1756,12 @@ CORBA::TypeCode::private_equal_valuetype (
   for (CORBA::ULong i = 0; i < my_count; ++i)
     {
       // Check if the member visibilities are the same.
-      CORBA::Visibility my_vs = 
+      CORBA::Visibility my_vs =
         this->member_visibility (i
                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::Visibility tc_vs = 
+      CORBA::Visibility tc_vs =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -1773,12 +1772,12 @@ CORBA::TypeCode::private_equal_valuetype (
         }
 
       // Check if the (optional) member names are same.
-      const char *my_member_name = 
+      const char *my_member_name =
         this->member_name (i
                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_member_name = 
+      const char *tc_member_name =
         tc->member_name (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
@@ -1791,13 +1790,13 @@ CORBA::TypeCode::private_equal_valuetype (
         }
 
       // Now compare the typecodes of the members.
-      CORBA::TypeCode_var my_member_tc = 
-        this->member_type (i 
+      CORBA::TypeCode_var my_member_tc =
+        this->member_type (i
                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = 
-        tc->member_type (i 
+      CORBA::TypeCode_var tc_member_tc =
+        tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
@@ -1844,9 +1843,9 @@ CORBA::TypeCode::private_id (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_event:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                           guard,
-                          this->private_state_->mutex_, 
+                          this->private_state_->mutex_,
                           0);
 
         if (this->private_state_->tc_id_known_)
@@ -1865,7 +1864,7 @@ CORBA::TypeCode::private_id (ACE_ENV_SINGLE_ARG_DECL) const
       }
     // No other typecodes ever have type IDs
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 
+      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                         0);
     }
 }
@@ -1893,9 +1892,9 @@ CORBA::TypeCode::private_name (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_event:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                           guard,
-                          this->private_state_->mutex_, 
+                          this->private_state_->mutex_,
                           0);
 
         if (this->private_state_->tc_name_known_)
@@ -1920,7 +1919,7 @@ CORBA::TypeCode::private_name (ACE_ENV_SINGLE_ARG_DECL) const
           }
         else
           {
-            ACE_THROW_RETURN (CORBA::INTERNAL (), 
+            ACE_THROW_RETURN (CORBA::INTERNAL (),
                               0);
           }
       }
@@ -2024,7 +2023,7 @@ CORBA::TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const
                               0);
           }
 
-        tc_kind = ACE_static_cast (CORBA::TCKind, 
+        tc_kind = ACE_static_cast (CORBA::TCKind,
                                    tc_kind_holder);
 
         // The tc_kind can be either tk_null or tk_value.
@@ -2364,7 +2363,7 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
   // Build the de-encapsulating CDR stream, bypassing the stringent
   // alignment tests (we're a bit looser in what we need here, and we
   // _know_ we're OK).  Then skip the byte order code.
-  TAO_InputCDR stream (this->buffer_+4, 
+  TAO_InputCDR stream (this->buffer_+4,
                        this->length_-4,
                        this->byte_order_);
 
@@ -2373,9 +2372,9 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
   ACE_CHECK_RETURN (0);
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
-                    this->private_state_->mutex_, 
+                    this->private_state_->mutex_,
                     0);
 
   if (this->private_state_->tc_member_name_list_known_)
@@ -2386,7 +2385,7 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
         }
       else
         {
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 
+          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
                             0);
         }
     }
@@ -2458,7 +2457,7 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
                    )
                 || !this->skip_typecode (stream))
               {
-                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 
+                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
                                   0);
               }
           }
@@ -2588,7 +2587,7 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
                 || !this->skip_typecode (stream)    // member typecode
                 || !stream.skip_short ())           // member visibility
               {
-                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 
+                ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
                                   0);
               }
           }
@@ -2646,14 +2645,14 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TypeCode::private_member_label -- ")
                   ACE_TEXT ("error reading from stream")));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 
+      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
                         0);
     }
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
-                    this->private_state_->mutex_, 
+                    this->private_state_->mutex_,
                     0);
 
   if (this->private_state_->tc_member_label_list_known_)
@@ -2819,9 +2818,9 @@ CORBA::TypeCode::private_discriminator_type (
   ) const
 {
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
-                    this->private_state_->mutex_, 
+                    this->private_state_->mutex_,
                     0);
 
   return this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2837,7 +2836,7 @@ CORBA::TypeCode::private_discriminator_type_i (
       return this->private_state_->tc_discriminator_type_;
     }
 
-  TAO_InputCDR stream (this->buffer_+4, 
+  TAO_InputCDR stream (this->buffer_+4,
                        this->length_-4,
                        this->byte_order_);
 
@@ -2866,9 +2865,9 @@ CORBA::TypeCode::private_default_index (
   ) const
 {
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
-                    this->private_state_->mutex_, 
+                    this->private_state_->mutex_,
                     0);
 
   return this->private_default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2884,7 +2883,7 @@ CORBA::TypeCode::private_default_index_i (
       return this->private_state_->tc_default_index_used_;
     }
 
-  TAO_InputCDR stream (this->buffer_+4, 
+  TAO_InputCDR stream (this->buffer_+4,
                        this->length_-4,
                        this->byte_order_);
 
@@ -2906,7 +2905,7 @@ CORBA::TypeCode::private_default_index_i (
 CORBA::Long
 CORBA::TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  TAO_InputCDR stream (this->buffer_+4, 
+  TAO_InputCDR stream (this->buffer_+4,
                        this->length_-4,
                        this->byte_order_);
   switch (this->kind_)
@@ -2915,9 +2914,9 @@ CORBA::TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_array:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                           guard,
-                          this->private_state_->mutex_, 
+                          this->private_state_->mutex_,
                           0);
 
         if (this->private_state_->tc_length_known_)
@@ -2942,9 +2941,9 @@ CORBA::TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_wstring:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                           guard,
-                          this->private_state_->mutex_, 
+                          this->private_state_->mutex_,
                           0);
 
         if (this->private_state_->tc_length_known_)
@@ -2972,7 +2971,7 @@ CORBA::TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const
 CORBA::TypeCode_ptr
 CORBA::TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  TAO_InputCDR stream (this->buffer_+4, 
+  TAO_InputCDR stream (this->buffer_+4,
                        this->length_-4,
                        this->byte_order_);
   switch (kind_)
@@ -2981,9 +2980,9 @@ CORBA::TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_array:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                           guard,
-                          this->private_state_->mutex_, 
+                          this->private_state_->mutex_,
                           0);
 
         if (this->private_state_->tc_content_type_known_)
@@ -3005,9 +3004,9 @@ CORBA::TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_value_box:
       {
         // Double checked locking...
-        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                           guard,
-                          this->private_state_->mutex_, 
+                          this->private_state_->mutex_,
                           0);
 
         if (this->private_state_->tc_content_type_known_)
@@ -3032,7 +3031,7 @@ CORBA::TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const
         return this->private_state_->tc_content_type_;
       }
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 
+      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                         0);
     }
 }
@@ -3058,7 +3057,7 @@ CORBA::TypeCode::private_member_visibility (CORBA::ULong slot
     }
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
                     this->private_state_->mutex_,
                     0);
@@ -3120,7 +3119,7 @@ CORBA::TypeCode::private_type_modifier (ACE_ENV_SINGLE_ARG_DECL) const
     }
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
                     this->private_state_->mutex_,
                     0);
@@ -3165,7 +3164,7 @@ CORBA::TypeCode::private_concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
     }
 
   // Double checked locking...
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
                     this->private_state_->mutex_,
                     CORBA::TypeCode::_nil ());
@@ -3522,7 +3521,7 @@ CORBA::TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_struct:
       {
         CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, 
+        TAO_InputCDR stream (this->buffer_+4,
                              this->length_-4,
                              this->byte_order_);
 
@@ -3541,7 +3540,7 @@ CORBA::TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_enum:
       {
         CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, 
+        TAO_InputCDR stream (this->buffer_+4,
                              this->length_-4,
                              this->byte_order_);
 
@@ -3560,7 +3559,7 @@ CORBA::TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const
     case CORBA::tk_union:
       {
         CORBA::ULong members;
-        TAO_InputCDR stream (this->buffer_+4, 
+        TAO_InputCDR stream (this->buffer_+4,
                              this->length_-4,
                              this->byte_order_);
 
@@ -3617,7 +3616,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
       break;
 
     // Indirected typecodes can occur at "top level" like
-    // this only when constructing a recursive typecode in the 
+    // this only when constructing a recursive typecode in the
     // TypeCodeFactory. The check for non-null offset map suffices.
     case ~0u:
       if (x->offset_map () == 0)
@@ -3687,9 +3686,9 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA::TypeCode::_tao_decode (0, 
-                                    cdr, 
-                                    x 
+      CORBA::TypeCode::_tao_decode (0,
+                                    cdr,
+                                    x
                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -3703,36 +3702,39 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_Pseudo_Object_Manager<CORBA::TypeCode, 
+template class TAO_Pseudo_Object_Manager<CORBA::TypeCode,
                                          CORBA::TypeCode_var>;
 
 template class ACE_Node<CORBA::Long>;
 template class ACE_Unbounded_Queue<CORBA::Long>;
 template class ACE_Unbounded_Queue_Iterator<CORBA::Long>;
 
-template class ACE_Hash_Map_Entry<const char *, 
+template class ACE_Hash_Map_Entry<const char *,
                                   ACE_Unbounded_Queue<CORBA::Long> *>;
-template class ACE_Hash_Map_Manager_Ex<const char *, 
-                                       ACE_Unbounded_Queue<CORBA::Long> *, 
-                                       ACE_Hash<const char *>, 
-                                       ACE_Equal_To<const char *>, 
+template class ACE_Hash_Map_Manager_Ex<const char *,
+                                       ACE_Unbounded_Queue<CORBA::Long> *,
+                                       ACE_Hash<const char *>,
+                                       ACE_Equal_To<const char *>,
                                        ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, 
-                                             ACE_Unbounded_Queue<CORBA::Long> *, 
-                                             ACE_Hash<const char *>, 
-                                             ACE_Equal_To<const char *>, 
+template class ACE_Hash_Map_Iterator_Base_Ex<const char *,
+                                             ACE_Unbounded_Queue<CORBA::Long> *,
+                                             ACE_Hash<const char *>,
+                                             ACE_Equal_To<const char *>,
                                              ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, 
+template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *,
                                                 ACE_Unbounded_Queue<CORBA::Long> *,
-                                                ACE_Hash<const char *>, 
-                                                ACE_Equal_To<const char *>, 
+                                                ACE_Hash<const char *>,
+                                                ACE_Equal_To<const char *>,
                                                 ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<const char *, 
-                                        ACE_Unbounded_Queue<CORBA::Long> *, 
-                                        ACE_Hash<const char *>, 
-                                        ACE_Equal_To<const char *>, 
+template class ACE_Hash_Map_Iterator_Ex<const char *,
+                                        ACE_Unbounded_Queue<CORBA::Long> *,
+                                        ACE_Hash<const char *>,
+                                        ACE_Equal_To<const char *>,
                                         ACE_Null_Mutex>;
- 
+
+template class TAO_Pseudo_Var_T<CORBA::TypeCode>;
+template class TAO_Pseudo_Out_T<CORBA::TypeCode, CORBA::TypeCode_var>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var>
@@ -3746,5 +3748,8 @@ template class ACE_Hash_Map_Iterator_Ex<const char *,
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
- 
+
+#pragma instantiate TAO_Pseudo_Var_T<CORBA::TypeCode>
+#pragma instantiate TAO_Pseudo_Out_T<CORBA::TypeCode, CORBA::TypeCode_var>
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index d6735f5a11c..0d138d06f89 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -26,6 +26,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Exception.h"
+#include "tao/Pseudo_VarOut_T.h"
 
 // Forward declarations
 class TAO_InputCDR;
@@ -38,6 +39,11 @@ namespace TAO
 
 namespace CORBA
 {
+  class TypeCode;
+
+  typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
+  typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
+
   /**
    * @class TypeCode
    *
@@ -309,17 +315,17 @@ namespace CORBA
     typedef ACE_Unbounded_Queue<CORBA::Long> OFFSET_LIST;
     typedef ACE_Unbounded_Queue_Iterator<CORBA::Long> OFFSET_LIST_ITERATOR;
     typedef ACE_Hash_Map_Entry<const char *, OFFSET_LIST *> OFFSET_MAP_ENTRY;
-    typedef ACE_Hash_Map_Manager_Ex<const char *, 
-                                    OFFSET_LIST *, 
-                                    ACE_Hash<const char *>, 
-                                    ACE_Equal_To<const char *>, 
+    typedef ACE_Hash_Map_Manager_Ex<const char *,
+                                    OFFSET_LIST *,
+                                    ACE_Hash<const char *>,
+                                    ACE_Equal_To<const char *>,
                                     ACE_Null_Mutex>
       OFFSET_MAP;
 
-    typedef ACE_Hash_Map_Iterator_Ex<const char *, 
-                                     OFFSET_LIST *, 
-                                     ACE_Hash<const char *>, 
-                                     ACE_Equal_To<const char *>, 
+    typedef ACE_Hash_Map_Iterator_Ex<const char *,
+                                     OFFSET_LIST *,
+                                     ACE_Hash<const char *>,
+                                     ACE_Equal_To<const char *>,
                                      ACE_Null_Mutex>
       OFFSET_MAP_ITERATOR;
 
@@ -530,64 +536,6 @@ namespace CORBA
 
     OFFSET_MAP *offset_map_;
   };
-
-  /**
-   * @class TypeCode_var
-   *
-   * @brief A smart pointer for TypeCodes.
-   *
-   * Implements the _var class for the TypeCode pseudo object.
-   */
-  class TAO_Export TypeCode_var
-  {
-  public:
-    TypeCode_var (void); // default constructor
-    TypeCode_var (TypeCode_ptr);
-    TypeCode_var (const TypeCode_var &); // copy constructor
-    ~TypeCode_var (void); // destructor
-
-    TypeCode_var &operator= (TypeCode_ptr);
-    TypeCode_var &operator= (const TypeCode_var &);
-    TypeCode_ptr operator-> (void) const;
-
-    /// in, inout, out, _retn
-    operator const TypeCode_ptr &() const;
-    operator TypeCode_ptr &();
-    TypeCode_ptr in (void) const;
-    TypeCode_ptr &inout (void);
-    TypeCode_ptr &out (void);
-    TypeCode_ptr _retn (void);
-    TypeCode_ptr ptr (void) const;
-
-  private:
-    TypeCode_ptr ptr_;
-  };
-
-  /**
-   * @class TypeCode_out
-   *
-   * @brief The _out class for TypeCode.
-   *
-   * Implements the _out class for the TypeCode pseudo object.
-   */
-  class TAO_Export TypeCode_out
-  {
-  public:
-    TypeCode_out (TypeCode_ptr &);
-    TypeCode_out (TypeCode_var &);
-    TypeCode_out (const TypeCode_out &);
-    TypeCode_out &operator= (const TypeCode_out &);
-    TypeCode_out &operator= (TypeCode_ptr);
-    operator TypeCode_ptr &();
-    TypeCode_ptr &ptr (void);
-    TypeCode_ptr operator-> (void);
-
-  private:
-    TypeCode_ptr &ptr_;
-
-    /// Assignment from _var not allowed
-    TypeCode_out &operator= (const TypeCode_var &);
-  };
 }  // End CORBA namespace
 
 // --------------------------------------------------------------
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index bb6d54cd737..aadb70e4855 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -127,153 +127,3 @@ CORBA::release (CORBA::TypeCode_ptr obj)
     obj->_decr_refcnt ();
 }
 
-// ****************************************************************
-
-ACE_INLINE
-CORBA::TypeCode_var::TypeCode_var (void)
-  : ptr_ (CORBA::TypeCode::_nil ())
-{}
-
-ACE_INLINE
-CORBA::TypeCode_var::TypeCode_var (CORBA::TypeCode_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::TypeCode_var::TypeCode_var (const CORBA::TypeCode_var &p)
-  : ptr_ (CORBA::TypeCode::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA::TypeCode_var::~TypeCode_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::TypeCode_var &
-CORBA::TypeCode_var::operator= (CORBA::TypeCode_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::TypeCode_var &
-CORBA::TypeCode_var::operator= (const CORBA::TypeCode_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = CORBA::TypeCode::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA::TypeCode_var::operator const CORBA::TypeCode_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::TypeCode_var::operator CORBA::TypeCode_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr &
-CORBA::TypeCode_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr &
-CORBA::TypeCode_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::TypeCode::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA::TypeCode_ptr val = this->ptr_;
-  this->ptr_ = CORBA::TypeCode::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::TypeCode_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::TypeCode_out::TypeCode_out (CORBA::TypeCode_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::TypeCode::_nil ();
-}
-
-ACE_INLINE
-CORBA::TypeCode_out::TypeCode_out (CORBA::TypeCode_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA::TypeCode::_nil ();
-}
-
-ACE_INLINE
-CORBA::TypeCode_out::TypeCode_out (const CORBA::TypeCode_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA::TypeCode_out &
-CORBA::TypeCode_out::operator= (const CORBA::TypeCode_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::TypeCode_out &
-CORBA::TypeCode_out::operator= (CORBA::TypeCode_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::TypeCode_out::operator CORBA::TypeCode_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr &
-CORBA::TypeCode_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
index 045a918d1c3..cebdacc77ff 100644
--- a/TAO/tao/ValueBase.cpp
+++ b/TAO/tao/ValueBase.cpp
@@ -41,7 +41,7 @@ CORBA::ValueBase::_downcast (CORBA::ValueBase *vt)
 void
 CORBA::ValueBase::_tao_any_destructor (void *x)
 {
-  CORBA::ValueBase_ptr tmp = ACE_static_cast (CORBA::ValueBase *, x);
+  CORBA::ValueBase * tmp = ACE_static_cast (CORBA::ValueBase *, x);
   CORBA::remove_ref (tmp);
 }
 
@@ -350,3 +350,15 @@ operator>> (TAO_InputCDR &strm,
                                            _tao_valuetype);
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Value_Var_T<CORBA::ValueBase>;
+  template class TAO_Pseudo_Value_Out_T<CORBA::ValueBase, CORBA::ValueBase_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Value_Var_T<CORBA::ValueBase>
+# pragma instantiate TAO_Pseudo_Value_Out_T<CORBA::ValueBase, CORBA::ValueBase_var>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h
index fd45078bb8d..0bd0752c73a 100644
--- a/TAO/tao/ValueBase.h
+++ b/TAO/tao/ValueBase.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/corbafwd.h"
+#include "tao/Pseudo_Value_VarOut_T.h"
 
 #include "ace/Basic_Types.h"           /* for ptr_arith_t */
 #include "ace/Synch_T.h"
@@ -35,7 +36,8 @@ namespace CORBA
   TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueBase *);
   TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueBase *);
 
-  class ValueBase_var;
+  typedef TAO_Pseudo_Value_Var_T<ValueBase> ValueBase_var;
+  typedef TAO_Pseudo_Value_Out_T<ValueBase, ValueBase_var> ValueBase_out;
 
   /**
    * @class ValueBase
@@ -118,68 +120,6 @@ namespace CORBA
   }; // ValueBase
 
   /**
-   * @class ValueBase_var
-   *
-   * @brief _var class for ValueBase
-   */
-  class TAO_Export ValueBase_var
-  {
-  public:
-    ValueBase_var (void);
-    ValueBase_var (CORBA::ValueBase *);
-    ValueBase_var (const ValueBase_var &);
-    ~ValueBase_var (void);
-
-    ValueBase_var &operator= (CORBA::ValueBase *);
-    ValueBase_var &operator= (const ValueBase_var &);
-    CORBA::ValueBase *operator-> (void) const;
-
-    operator const CORBA::ValueBase *() const;
-    operator CORBA::ValueBase *&();
-
-    /// in, inout, out, _retn
-    CORBA::ValueBase *in (void) const;
-    CORBA::ValueBase *&inout (void);
-    CORBA::ValueBase *&out (void);
-    CORBA::ValueBase *_retn (void);
-    CORBA::ValueBase *ptr (void) const;
-
-    static CORBA::ValueBase * tao_duplicate (CORBA::ValueBase *);
-    static void tao_release (CORBA::ValueBase *);
-    static CORBA::ValueBase * tao_nil (void);
-    static CORBA::ValueBase * tao_narrow (CORBA::ValueBase *
-                                          ACE_ENV_ARG_DECL_NOT_USED);
-    static CORBA::ValueBase * tao_upcast (void *);
-
-  private:
-    CORBA::ValueBase *ptr_;
-  };
-
-  /**
-   * @class ValueBase_out
-   *
-   * @brief _out class for CORBA::ValueBase
-   *
-   * _out class for CORBA::ValueBase
-   */
-  class TAO_Export ValueBase_out
-  {
-  public:
-    ValueBase_out (CORBA::ValueBase *&);
-    ValueBase_out (ValueBase_var &);
-    ValueBase_out (const ValueBase_out &);
-    ValueBase_out &operator= (const ValueBase_out &);
-    ValueBase_out &operator= (const ValueBase_var &);
-    ValueBase_out &operator= (CORBA::ValueBase *);
-    operator CORBA::ValueBase *&();
-    CORBA::ValueBase *&ptr (void);
-    CORBA::ValueBase *operator-> (void);
-
-  private:
-    CORBA::ValueBase *&ptr_;
-  };
-
-  /**
    * @class DefaultValueRefCountBase
    *
    * @brief Default mix-in for reference count of a valuetype.
diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i
index 5520bcc80bb..9d58f3e7b7e 100644
--- a/TAO/tao/ValueBase.i
+++ b/TAO/tao/ValueBase.i
@@ -4,236 +4,35 @@
 
 // static operations in namespace CORBA ========================
 
-ACE_INLINE void
+ACE_INLINE 
+void
 CORBA::add_ref (CORBA::ValueBase *val)
 {
   if (val)
-    val->_add_ref ();
+    {
+      val->_add_ref ();
+    }
 }
 
-ACE_INLINE void
+ACE_INLINE 
+void
 CORBA::remove_ref (CORBA::ValueBase *val)
 {
   if (val)
-    val->_remove_ref ();
-}
-
-// ===========================================================
-
-// constructor
-ACE_INLINE
-CORBA::ValueBase::ValueBase (void)
-{
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueBase_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueBase_var::ValueBase_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::ValueBase_var::ValueBase_var (CORBA::ValueBase *p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA::ValueBase_var::~ValueBase_var (void)
-{
-  CORBA::remove_ref (this->ptr_);
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueBase_var::ValueBase_var (const CORBA::ValueBase_var &p)
-  : ptr_ (p.ptr_)
-{
-  p.ptr_->_add_ref ();
-}
-
-ACE_INLINE CORBA::ValueBase_var &
-CORBA::ValueBase_var::operator= (CORBA::ValueBase *p)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueBase_var &
-CORBA::ValueBase_var::operator= (const CORBA::ValueBase_var &p)
-{
-  if (this != &p)
     {
-      CORBA::remove_ref (this->ptr_);
-      p.ptr_->_add_ref ();
-      this->ptr_ = p.ptr_;
+      val->_remove_ref ();
     }
-
-  return *this;
-}
-
-ACE_INLINE
-CORBA::ValueBase_var::operator const CORBA::ValueBase *() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::ValueBase_var::operator CORBA::ValueBase *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBase *&
-CORBA::ValueBase_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBase *&
-CORBA::ValueBase_var::out (void)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_var::_retn (void)
-{
-  // Yield ownership of valuebase.
-  CORBA::ValueBase *val = this->ptr_;
-  this->ptr_ = 0;
-  return val;
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_var::tao_duplicate (CORBA::ValueBase *p)
-{
-  p->_add_ref ();
-  return p;
-}
-
-ACE_INLINE void
-CORBA::ValueBase_var::tao_release (CORBA::ValueBase *p)
-{
-  p->_remove_ref ();
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_var::tao_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_var::tao_narrow (
-    CORBA::ValueBase *p
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  p->_add_ref ();
-  return CORBA::ValueBase::_downcast (p);
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_var::tao_upcast (void *src)
-{
-  CORBA::ValueBase **tmp =
-    ACE_static_cast (CORBA::ValueBase **, src);
-  return *tmp;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueBase_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueBase_out::ValueBase_out (CORBA::ValueBase *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueBase_out::ValueBase_out (CORBA::ValueBase_var &p)
-  : ptr_ (p.out ())
-{
-  this->ptr_->_remove_ref ();
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::ValueBase_out::ValueBase_out (const CORBA::ValueBase_out &p)
-  : ptr_ (p.ptr_)
-{
-}
-
-ACE_INLINE CORBA::ValueBase_out &
-CORBA::ValueBase_out::operator= (const CORBA::ValueBase_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueBase_out &
-CORBA::ValueBase_out::operator= (const CORBA::ValueBase_var &p)
-{
-  p.ptr ()->_add_ref ();
-  this->ptr_ = p.ptr ();
-  return *this;
 }
 
-ACE_INLINE CORBA::ValueBase_out &
-CORBA::ValueBase_out::operator= (CORBA::ValueBase *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
+// ===========================================================
 
 ACE_INLINE
-CORBA::ValueBase_out::operator CORBA::ValueBase *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBase *&
-CORBA::ValueBase_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ValueBase *
-CORBA::ValueBase_out::operator-> (void)
+CORBA::ValueBase::ValueBase (void)
 {
-  return this->ptr_;
 }
 
 // ===========================================================
 
-// constructor
 ACE_INLINE
 CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase (void)
   : _tao_reference_count_ (1)
@@ -241,14 +40,16 @@ CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase (void)
 }
 
 
-ACE_INLINE void
+ACE_INLINE 
+void
 CORBA::DefaultValueRefCountBase::_tao_add_ref (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
   ++_tao_reference_count_;
 }
 
-ACE_INLINE void
+ACE_INLINE 
+void
 CORBA::DefaultValueRefCountBase::_tao_remove_ref (void)
 {
   {
@@ -263,7 +64,8 @@ CORBA::DefaultValueRefCountBase::_tao_remove_ref (void)
   delete this;
 }
 
-ACE_INLINE CORBA::ULong
+ACE_INLINE 
+CORBA::ULong
 CORBA::DefaultValueRefCountBase::_tao_refcount_value (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
@@ -277,67 +79,78 @@ CORBA::DefaultValueRefCountBase::_tao_refcount_value (void)
 
 // Detection of flags in the CDR Stream
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
 {
   return (tag == 0);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_value_tag (CORBA::ULong tag)
 {
   return ((tag & Value_tag_sigbits) == 0x7FFFFF00L);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags:: has_codebase_url(CORBA::ULong tag)
 {
   return (CORBA::Boolean) (tag & Codebase_url);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::has_no_type_info (CORBA::ULong tag)
 {
   return ((tag & Type_info_sigbits) == Type_info_none);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::has_single_type_info (CORBA::ULong tag)
 {
   return ((tag & Type_info_sigbits) == Type_info_single);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::ULong tag)
 {
   return ((tag & Type_info_sigbits) == Type_info_list);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags:: is_chunked (CORBA::ULong tag)
 {
   return (CORBA::Boolean) (tag & 8);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_indirection_tag (CORBA::ULong tag)
 {
   return (tag == 0xFFFFFFFFL);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_indirection (CORBA::ULong value)
 {
   return (0x80000000L < value && value <= (0xFFFFFFFFL - 4));
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_block_size (CORBA::ULong value)
 {
   return ( 0 < value && value < 0x7fffff00L);
 }
 
-ACE_INLINE CORBA::Boolean
+ACE_INLINE 
+CORBA::Boolean
 TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
 {
   return (0x80000000L < tag  && tag <= 0xFFFFFFFFL);
diff --git a/TAO/tao/ValueFactory.cpp b/TAO/tao/ValueFactory.cpp
index 6cf497f3750..58e4a5e4b3b 100644
--- a/TAO/tao/ValueFactory.cpp
+++ b/TAO/tao/ValueFactory.cpp
@@ -21,3 +21,15 @@ CORBA::ValueFactoryBase::create_for_unmarshal_abstract (void)
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Value_Var_T<CORBA::ValueFactoryBase>;
+  template class TAO_Pseudo_Value_Out_T<CORBA::ValueFactoryBase, CORBA::ValueFactoryBase_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Value_Var_T<CORBA::ValueFactoryBase>
+# pragma instantiate TAO_Pseudo_Value_Out_T<CORBA::ValueFactoryBase, CORBA::ValueFactoryBase_var>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h
index 9d682aa227b..6e8caffddfe 100644
--- a/TAO/tao/ValueFactory.h
+++ b/TAO/tao/ValueFactory.h
@@ -21,10 +21,24 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Pseudo_Value_VarOut_T.h"
+
 #include "ace/Synch_T.h"
 
 namespace CORBA
 {
+  class ValueFactoryBase;
+
+  TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueFactoryBase *);
+  TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueFactoryBase *);
+
+  typedef TAO_Pseudo_Value_Var_T<ValueFactoryBase> ValueFactoryBase_var;
+
+  typedef TAO_Pseudo_Value_Out_T<ValueFactoryBase, ValueFactoryBase_var> 
+    ValueFactoryBase_out;
+
+  typedef ValueFactoryBase_var ValueFactory_var;
+
   class TAO_Export ValueFactoryBase
   {
   public:
@@ -48,35 +62,6 @@ namespace CORBA
     CORBA::ULong _tao_reference_count_;
     TAO_SYNCH_MUTEX _tao_reference_count_lock_;
   }; // CORBA_ValueFactoryBase
-
-  /**
-   * @class ValueFactoryBase_var
-   *
-   * @brief _var class for ValueFactoryBase
-   */
-  class TAO_Export ValueFactoryBase_var
-  {
-  public:
-    ValueFactoryBase_var (void);
-    ValueFactoryBase_var (CORBA::ValueFactoryBase *);
-    ValueFactoryBase_var (const ValueFactoryBase_var &);
-    ~ValueFactoryBase_var (void);
-
-    ValueFactoryBase_var &operator= (CORBA::ValueFactoryBase *);
-    ValueFactoryBase_var &operator= (const ValueFactoryBase_var &);
-    CORBA::ValueFactoryBase *operator-> (void) const;
-
-    /// in, inout, out, _retn
-    CORBA::ValueFactoryBase *in (void) const;
-    CORBA::ValueFactoryBase *&inout (void);
-    CORBA::ValueFactoryBase *&out (void);
-    CORBA::ValueFactoryBase *_retn (void);
-    CORBA::ValueFactoryBase *ptr (void) const;
-
-  private:
-    CORBA::ValueFactoryBase *ptr_;
-  };
-
 }  // End CORBA namespace
 
 // Use this macro for writing code that is independend from
diff --git a/TAO/tao/ValueFactory.i b/TAO/tao/ValueFactory.i
index bbb6ad561fe..e1f2572fb2c 100644
--- a/TAO/tao/ValueFactory.i
+++ b/TAO/tao/ValueFactory.i
@@ -3,137 +3,60 @@
 // $Id$
 
 ACE_INLINE
-CORBA::ValueFactoryBase::ValueFactoryBase (void)
-  : _tao_reference_count_ (1)
-{
-}
-
-ACE_INLINE void
-CORBA::ValueFactoryBase::_add_ref (void)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-  ++_tao_reference_count_;
-}
-
-ACE_INLINE void
-CORBA::ValueFactoryBase::_remove_ref (void)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-    -- this->_tao_reference_count_;
-    if (this->_tao_reference_count_ != 0)
-      return;
-  }
-  delete this;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ValueFactoryBase_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::ValueFactoryBase_var::ValueFactoryBase_var (void)
-  : ptr_ (0)
+void
+CORBA::add_ref (CORBA::ValueFactoryBase * p)
 {
-}
-
-ACE_INLINE
-CORBA::ValueFactoryBase_var::ValueFactoryBase_var (
-    CORBA::ValueFactoryBase *p
-  )
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA::ValueFactoryBase_var::~ValueFactoryBase_var (void)
-{
-  if (this->ptr_ != 0)
+  if (p != 0)
     {
-      this->ptr_->_remove_ref ();
+      p->_add_ref ();
     }
 }
 
-ACE_INLINE CORBA::ValueFactoryBase *
-CORBA::ValueFactoryBase_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
 ACE_INLINE
-CORBA::ValueFactoryBase_var::ValueFactoryBase_var (
-    const CORBA::ValueFactoryBase_var &p
-  )
-  : ptr_ (p.ptr_)
-{
-  p.ptr_->_add_ref ();
-}
-
-ACE_INLINE CORBA::ValueFactoryBase_var &
-CORBA::ValueFactoryBase_var::operator= (CORBA::ValueFactoryBase *p)
+void
+CORBA::remove_ref (CORBA::ValueFactoryBase * p)
 {
-  if (this->ptr_ != 0)
+  if (p != 0)
     {
-      this->ptr_->_remove_ref ();
+      p->_remove_ref ();
     }
-
-  this->ptr_ = p;
-  return *this;
 }
 
-ACE_INLINE CORBA::ValueFactoryBase_var &
-CORBA::ValueFactoryBase_var::operator= (const CORBA::ValueFactoryBase_var &p)
-{
-  if (this != &p)
-    {
-      if (this->ptr_ != 0)
-        {
-          this->ptr_->_remove_ref ();
-        }
+// ================================================================
 
-      p.ptr_->_add_ref ();
-      this->ptr_ = p.ptr_;
-    }
-
-  return *this;
-}
-
-ACE_INLINE CORBA::ValueFactoryBase *
-CORBA::ValueFactoryBase_var::operator-> (void) const
+ACE_INLINE
+CORBA::ValueFactoryBase::ValueFactoryBase (void)
+  : _tao_reference_count_ (1)
 {
-  return this->ptr_;
 }
 
-ACE_INLINE CORBA::ValueFactoryBase *
-CORBA::ValueFactoryBase_var::in (void) const
+ACE_INLINE 
+void
+CORBA::ValueFactoryBase::_add_ref (void)
 {
-  return this->ptr_;
+  ACE_GUARD (TAO_SYNCH_MUTEX, 
+             guard, 
+             this->_tao_reference_count_lock_);
+  ++_tao_reference_count_;
 }
 
-ACE_INLINE CORBA::ValueFactoryBase *&
-CORBA::ValueFactoryBase_var::inout (void)
+ACE_INLINE 
+void
+CORBA::ValueFactoryBase::_remove_ref (void)
 {
-  return this->ptr_;
-}
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, 
+               guard, 
+               this->_tao_reference_count_lock_);
 
-ACE_INLINE CORBA::ValueFactoryBase *&
-CORBA::ValueFactoryBase_var::out (void)
-{
-  if (this->ptr_ != 0)
-    {
-      this->ptr_->_remove_ref ();
-    }
+    -- this->_tao_reference_count_;
 
-  this->ptr_ = 0;
-  return this->ptr_;
-}
+    if (this->_tao_reference_count_ != 0)
+      {
+        return;
+      }
+  }
 
-ACE_INLINE CORBA::ValueFactoryBase *
-CORBA::ValueFactoryBase_var::_retn (void)
-{
-  // Yield ownership of valuebase.
-  CORBA::ValueFactoryBase *val = this->ptr_;
-  this->ptr_ = 0;
-  return val;
+  delete this;
 }
 
diff --git a/TAO/tao/Value_VarOut_T.cpp b/TAO/tao/Value_VarOut_T.cpp
new file mode 100644
index 00000000000..5b75b912c9b
--- /dev/null
+++ b/TAO/tao/Value_VarOut_T.cpp
@@ -0,0 +1,192 @@
+// $Id$
+
+#ifndef TAO_VALUE_VAROUT_T_C
+#define TAO_VALUE_VAROUT_T_C
+
+#include "tao/Value_VarOut_T.h"
+
+ACE_RCSID (tao, 
+           Value_VarOut_T, 
+           "$Id$")
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life>::TAO_Value_Var_T (void)
+  : ptr_ (0)
+{}
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life>::TAO_Value_Var_T (T * p)
+  : ptr_ (p)
+{}
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life>::TAO_Value_Var_T (const T * p)
+  : ptr_ (ACE_const_cast (T *, p))
+{}
+
+template <typename T, typename T_life>
+T *
+TAO_Value_Var_T<T,T_life>::ptr (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life>::TAO_Value_Var_T (
+    const TAO_Value_Var_T<T,T_life> & p
+  )
+{
+  T_life::tao_add_ref (p.ptr ());
+  this->ptr_ = p.ptr ();
+}
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life>::~TAO_Value_Var_T (void)
+{
+  T_life::tao_remove_ref (this->ptr_);
+}
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life> &
+TAO_Value_Var_T<T,T_life>::operator= (T * p)
+{
+  T_life::tao_remove_ref (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life> &
+TAO_Value_Var_T<T,T_life>::operator= (const TAO_Value_Var_T & p)
+{
+  if (this != &p)
+  {
+    T_life::tao_remove_ref (this->ptr_);
+    T * tmp = p.ptr ();
+    T_life::tao_add_ref (tmp);
+    this->ptr_ = tmp;
+  }
+  
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life>::operator const T * () const
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Var_T<T,T_life>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Value_Var_T<T,T_life>::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Value_Var_T<T,T_life>::in (void) const
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *&
+TAO_Value_Var_T<T,T_life>::inout (void)
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *&
+TAO_Value_Var_T<T,T_life>::out (void)
+{
+  T_life::tao_remove_ref (this->ptr_);
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Value_Var_T<T,T_life>::_retn (void)
+{
+  T * tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+// *************************************************************
+
+template <typename T, typename T_life>
+TAO_Value_Out_T<T,T_life>::TAO_Value_Out_T (T *& p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Out_T<T,T_life>::TAO_Value_Out_T (TAO_Value_Var_T<T,T_life> & p)
+  : ptr_ (p.out ())
+{
+  T_life::tao_remove_ref (this->ptr_);
+  this->ptr_ = 0;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Out_T<T,T_life>::TAO_Value_Out_T (const TAO_Value_Out_T<T,T_life> & p)
+  : ptr_ (ACE_const_cast (THIS_OUT_TYPE &, p).ptr_)
+{}
+
+template <typename T, typename T_life>
+TAO_Value_Out_T<T,T_life> &
+TAO_Value_Out_T<T,T_life>::operator= (const TAO_Value_Out_T<T,T_life> & p)
+{
+  this->ptr_ = ACE_const_cast (THIS_OUT_TYPE &, p).ptr_;
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Out_T<T,T_life> &
+TAO_Value_Out_T<T,T_life>::operator= (const TAO_Value_Var_T<T,T_life> & p)
+{
+  T * tmp = p.ptr ();
+  T_life::tao_add_ref (tmp);
+  this->ptr_ = tmp;
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Out_T<T,T_life> &
+TAO_Value_Out_T<T,T_life>::operator= (T * p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template <typename T, typename T_life>
+TAO_Value_Out_T<T,T_life>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *&
+TAO_Value_Out_T<T,T_life>::ptr (void)
+{
+  return this->ptr_;
+}
+
+template <typename T, typename T_life>
+T *
+TAO_Value_Out_T<T,T_life>::operator-> (void)
+{
+  return this->ptr_;
+}
+
+#endif /* TAO_VALUE_VAROUT_T_C */
diff --git a/TAO/tao/Value_VarOut_T.h b/TAO/tao/Value_VarOut_T.h
new file mode 100644
index 00000000000..67ac420ddf0
--- /dev/null
+++ b/TAO/tao/Value_VarOut_T.h
@@ -0,0 +1,105 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Value_VarOut_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_VALUE_VAROUT_T_H
+#define TAO_VALUE_VAROUT_T_H
+
+#include "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Value_Var_T
+ *
+ * @brief Parametrized implementation of _var class for valuetypes.
+ *
+ */
+template <typename T, typename T_life>
+class TAO_Value_Var_T 
+{
+public:
+  TAO_Value_Var_T (void);
+  TAO_Value_Var_T (T *);
+  TAO_Value_Var_T (const TAO_Value_Var_T<T,T_life> &);
+
+  // (TAO extension)
+  TAO_Value_Var_T (const T *);
+
+  ~TAO_Value_Var_T (void);
+  
+  TAO_Value_Var_T &operator= (T *);
+  TAO_Value_Var_T &operator= (const TAO_Value_Var_T<T,T_life> &);
+
+  T * operator-> (void) const;
+  
+  operator const T * () const;
+  operator T *& ();
+
+  // in, inout, out, _retn 
+  T * in (void) const;
+  T *& inout (void);
+  T *& out (void);
+  T * _retn (void);
+
+  // (TAO extension)
+  T * ptr (void) const;
+  
+private:
+  T * ptr_;
+};
+
+/**
+ * @class TAO_Value_Var_T
+ *
+ * @brief Parametrized implementation of _out class for valuetypes.
+ *
+ */
+template <typename T, typename T_life>
+class TAO_Value_Out_T 
+{
+public:
+  TAO_Value_Out_T (T *&);
+  TAO_Value_Out_T (TAO_Value_Var_T<T,T_life> &);
+  TAO_Value_Out_T (const TAO_Value_Out_T<T,T_life> &);
+
+  TAO_Value_Out_T &operator= (const TAO_Value_Out_T<T,T_life> &);
+  TAO_Value_Out_T &operator= (const TAO_Value_Var_T<T,T_life> &);
+  TAO_Value_Out_T &operator= (T *);
+
+  operator T *& ();
+  T *& ptr (void);
+
+  T * operator-> (void);
+  
+private:
+  typedef TAO_Value_Out_T<T, T_life> THIS_OUT_TYPE;
+  T *& ptr_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "tao/Value_VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Value_VarOut_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Value_VarOut_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_VALUE_VAROUT_T_H */
diff --git a/TAO/tao/Value_VarOut_T.inl b/TAO/tao/Value_VarOut_T.inl
new file mode 100644
index 00000000000..74e88caa0c5
--- /dev/null
+++ b/TAO/tao/Value_VarOut_T.inl
@@ -0,0 +1,2 @@
+// $Id$
+
diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp
new file mode 100644
index 00000000000..40944b47838
--- /dev/null
+++ b/TAO/tao/VarOut_T.cpp
@@ -0,0 +1,112 @@
+// $Id$
+
+#ifndef TAO_VAROUT_T_C
+#define TAO_VAROUT_T_C
+
+#include "tao/VarOut_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (tao, 
+           VarOut_T, 
+           "$Id$")
+
+template<typename T>
+TAO_Var_Base_T<T>::TAO_Var_Base_T (const TAO_Var_Base_T<T> & p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, 
+               T (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+// *************************************************************
+
+template<typename T>
+TAO_Fixed_Var_T<T> &
+TAO_Fixed_Var_T<T>::operator= (const TAO_Fixed_Var_T<T> & p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          foo * deep_copy = 0;
+          ACE_NEW_RETURN (deep_copy,
+                          T (*p.ptr_),
+                          *this);
+          
+          if (deep_copy != 0)
+            {
+              foo * tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+// Fixed-size types only.
+template<typename T>
+TAO_Fixed_Var_T<T> &
+TAO_Fixed_Var_T<T>::operator= (const T & p)
+{
+  if (this->ptr_ != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (this->ptr_,
+                    T (p),
+                    *this);
+  }
+  
+  return *this;
+}
+
+// *************************************************************
+
+template<typename T>
+TAO_Var_Var_T<T> &
+TAO_Var_Var_T<T>::operator= (const TAO_Var_Var_T<T> & p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          bar *deep_copy = 0;
+          ACE_NEW_RETURN (deep_copy,
+                          T (*p.ptr_),
+                          *this);
+          
+          if (deep_copy != 0)
+            {
+              T * tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+#endif /* TAO_VAROUT_T_C */
diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h
new file mode 100644
index 00000000000..ad61814afd9
--- /dev/null
+++ b/TAO/tao/VarOut_T.h
@@ -0,0 +1,158 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    VarOut_T.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_VAROUT_T_H
+#define TAO_VAROUT_T_H
+
+#include "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Var_Base_T
+ *
+ * @brief Parametrized implementation of _var base class for structs,
+ * unions and exceptions.
+ *
+ */
+template<typename T>
+class TAO_Var_Base_T
+{
+public:
+  TAO_Var_Base_T (void);
+  TAO_Var_Base_T (T *);
+  TAO_Var_Base_T (const TAO_Var_Base_T<T> &);
+
+  ~TAO_Var_Base_T (void);
+
+  T * operator-> (void);
+  const T * operator-> (void) const;
+  
+  operator const T & () const;
+  operator T & ();
+  operator T & () const;
+  
+  // Common mapping for fixed and variable size types.
+  const T & in (void) const;
+  T & inout (void);
+
+  // TAO extension.
+  T * ptr (void) const;
+
+protected:
+  T * ptr_;
+};
+
+/**
+ * @class TAO_Fixed_Var_T
+ *
+ * @brief Parametrized implementation of _var class for structs, unions,
+ * and exceptions with members of fixed size.
+ *
+ */
+template<typename T>
+class TAO_Fixed_Var_T : public TAO_Var_Base_T<T>
+{
+public:
+  TAO_Fixed_Var_T (void);
+  TAO_Fixed_Var_T (T *);
+  TAO_Fixed_Var_T (const TAO_Fixed_Var_T<T> &);
+
+  // Fixed-size types only.
+  TAO_Fixed_Var_T (const T &);
+
+  TAO_Fixed_Var_T & operator= (T *);
+  TAO_Fixed_Var_T & operator= (const TAO_Fixed_Var_T<T> &);
+  
+  // Fixed-size types only.
+  TAO_Fixed_Var_T & operator= (const T &);
+
+  // Mapping for fixed size types.
+  T & out (void);
+  T _retn (void);
+};
+
+/**
+ * @class TAO_Var_Var_T
+ *
+ * @brief Parametrized implementation of _var class for structs, unions,
+ * and exceptions with members of variable size.
+ *
+ */
+template<typename T>
+class TAO_Var_Var_T : public TAO_Var_Base_T<T>
+{
+public:
+  TAO_Var_Var_T (void);
+  TAO_Var_Var_T (T *);
+  TAO_Var_Var_T (const TAO_Var_Var_T<T> &);
+
+  TAO_Var_Var_T & operator= (T *);
+  TAO_Var_Var_T & operator= (const TAO_Var_Var_T<T> &);
+
+  // Variable size types only.
+  operator T *& ();
+
+  // Mapping for variable size types.
+  T *& out (void);
+  T * _retn (void);
+};
+
+/**
+ * @class TAO_Out_T
+ *
+ * @brief Parametrized implementation of _out class for structs, unions
+ * and exceptions..
+ *
+ */
+template<typename T, typename T_var>
+class TAO_Out_T
+{
+public:
+  TAO_Out_T (T *&);
+  TAO_Out_T (T_var &);
+  TAO_Out_T (const TAO_Out_T<T,T_var> &);
+
+  TAO_Out_T &operator= (const TAO_Out_T<T,T_var> &);
+  TAO_Out_T &operator= (T *);
+
+  operator T *& ();
+  T *& ptr (void);
+
+  T * operator-> (void);
+  
+private:
+  typedef TAO_Out_T<T,T_var> THIS_OUT_TYPE;
+  T *& ptr_;
+
+  // Assignment from T_var not allowed.
+  void operator= (const T_var &);
+};
+
+#if defined (__ACE_INLINE__)
+#include "tao/VarOut_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/VarOut_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("VarOut_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_VAROUT_T_H */
diff --git a/TAO/tao/VarOut_T.inl b/TAO/tao/VarOut_T.inl
new file mode 100644
index 00000000000..3fb5c1f5642
--- /dev/null
+++ b/TAO/tao/VarOut_T.inl
@@ -0,0 +1,261 @@
+//$Id$
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Base_T<T>::TAO_Var_Base_T (void)
+  : ptr_ (0)
+{}
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Base_T<T>::TAO_Var_Base_T (T * p)
+  : ptr_ (p)
+{}
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Base_T<T>::~TAO_Var_Base_T (void)
+{
+  delete this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE 
+const T *
+TAO_Var_Base_T<T>::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE 
+T *
+TAO_Var_Base_T<T>::operator-> (void)
+{
+  return this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Base_T<T>::operator const T & () const
+{
+  return *this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Base_T<T>::operator T & () 
+{
+  return *this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Base_T<T>::operator T & () const
+{
+  return *this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE 
+const T &
+TAO_Var_Base_T<T>::in (void) const
+{
+  return *this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE 
+T &
+TAO_Var_Base_T<T>::inout (void)
+{
+  return *this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE 
+T *
+TAO_Var_Base_T<T>::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// *************************************************************
+
+template<typename T>
+ACE_INLINE
+TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (void)
+{}
+
+template<typename T>
+ACE_INLINE
+TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (T * p)
+  : TAO_Var_Base_T<T> (p)
+{}
+
+template<typename T>
+ACE_INLINE
+TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (const TAO_Fixed_Var_T<T> & p)
+  : TAO_Var_Base_T<T> (p)
+{}
+
+// Fixed-size types only.
+template<typename T>
+ACE_INLINE
+TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (const T & p)
+{
+  ACE_NEW (this->ptr_, 
+           T (p));
+}
+
+template<typename T>
+ACE_INLINE
+TAO_Fixed_Var_T<T> &
+TAO_Fixed_Var_T<T>::operator= (T * p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+// Mapping for fixed size.
+template<typename T>
+ACE_INLINE 
+T &
+TAO_Fixed_Var_T<T>::out (void)
+{
+  return *this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE 
+T
+TAO_Fixed_Var_T<T>::_retn (void)
+{
+  return *this->ptr_;
+}
+
+// *************************************************************
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Var_T<T>::TAO_Var_Var_T (void)
+{}
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Var_T<T>::TAO_Var_Var_T (T * p)
+  : TAO_Var_Base_T<T> (p)
+{}
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Var_T<T>::TAO_Var_Var_T (const TAO_Var_Var_T<T> & p)
+  : TAO_Var_Base_T<T> (p)
+{}
+
+template<typename T>
+ACE_INLINE
+TAO_Var_Var_T<T> &
+TAO_Var_Var_T<T>::operator= (T * p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+// Variable-size types only.
+template<typename T>
+ACE_INLINE
+TAO_Var_Var_T<T>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+// Mapping for variable size.
+template<typename T>
+ACE_INLINE
+T *&
+TAO_Var_Var_T<T>::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+template<typename T>
+ACE_INLINE
+T *
+TAO_Var_Var_T<T>::_retn (void)
+{
+  T * tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+// *************************************************************
+
+template<typename T, typename T_var>
+ACE_INLINE
+TAO_Out_T<T,T_var>::TAO_Out_T (T *& p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+template<typename T, typename T_var>
+ACE_INLINE
+TAO_Out_T<T,T_var>::TAO_Out_T (T_var & p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+template<typename T, typename T_var>
+ACE_INLINE
+TAO_Out_T<T,T_var>::TAO_Out_T (const TAO_Out_T<T,T_var> & p)
+  : ptr_ (ACE_const_cast (THIS_OUT_TYPE &, p).ptr_)
+{}
+
+template<typename T, typename T_var>
+ACE_INLINE
+TAO_Out_T<T,T_var> &
+TAO_Out_T<T,T_var>::operator= (const TAO_Out_T<T,T_var> & p)
+{
+  this->ptr_ = ACE_const_cast (THIS_OUT_TYPE &, p).ptr_;
+  return *this;
+}
+
+template<typename T, typename T_var>
+ACE_INLINE
+TAO_Out_T<T,T_var> &
+TAO_Out_T<T,T_var>::operator= (T * p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+template<typename T, typename T_var>
+ACE_INLINE
+TAO_Out_T<T,T_var>::operator T *& ()
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_var>
+ACE_INLINE
+T *&
+TAO_Out_T<T,T_var>::ptr (void)
+{
+  return this->ptr_;
+}
+
+template<typename T, typename T_var>
+ACE_INLINE
+T *
+TAO_Out_T<T,T_var>::operator-> (void)
+{
+  return this->ptr_;
+}
+
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 481e92051fc..83c6348f486 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -68,6 +68,15 @@
 #include "tao/Object_KeyC.h"
 #include "tao/ObjectIdListC.h"
 
+// Template _var and _out classes.
+#include "tao/Objref_VarOut_T.h"
+#include "tao/Value_VarOut_T.h"
+#include "tao/Pseudo_VarOut_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/Array_VarOut_T.h"
+#include "tao/VarOut_T.h"
+
 #include "tao/Remote_Object_Proxy_Impl.h"
 
 #include "tao/StringSeqC.h"
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 91c828cd5e3..3bb8aa5c6fe 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -150,8 +150,6 @@ namespace CORBA
   // CORBA::TypeCode typedefs.
   class TypeCode;
   typedef TypeCode * TypeCode_ptr;
-  class TypeCode_var;
-  class TypeCode_out;
 
   /**
    * @name CORBA String Memory Management
@@ -182,32 +180,20 @@ namespace CORBA
   class WString_out;
 
   class StringSeq;
-  class StringSeq_var;
-  class StringSeq_out;
   extern TAO_Export TypeCode_ptr _tc_StringSeq;
 
   class WStringSeq;
-  class WStringSeq_var;
-  class WStringSeq_out;
   extern TAO_Export TypeCode_ptr _tc_WStringSeq;
 
   class OctetSeq;
-  class OctetSeq_var;
-  class OctetSeq_out;
   extern TAO_Export TypeCode_ptr _tc_OctetSeq;
 
-//   typedef TAO_Unbounded_Sequence<Octet> OctetSeq;
-//   typedef TAO_Unbounded_Sequence<Octet> OctetSeq_var;
-//   typedef TAO_Unbounded_Sequence<Octet> OctetSeq_out;
-
   class Any;
   class Any_var;
   class Any_out;
   typedef Any * Any_ptr;
 
   class Environment;
-  class Environment_var;
-  class Environment_out;
   typedef Environment * Environment_ptr;
 
   class Exception;
@@ -217,54 +203,35 @@ namespace CORBA
 
   class Request;
   typedef Request * Request_ptr;
-  class Request_var;
-  class Request_out;
 
   class NamedValue;
   typedef NamedValue * NamedValue_ptr;
-  class NamedValue_var;
-  class NamedValue_out;
 
   class NVList;
   typedef NVList * NVList_ptr;
-  class NVList_var;
-  class NVList_out;
 
   class Context;
   typedef Context * Context_ptr;
-  class Context_var;
-  class Context_out;
 
   class ContextList;
   typedef ContextList *ContextList_ptr;
-  class ContextList_var;
-  class ContextList_out;
 
   class Object;
   typedef Object *Object_ptr;
-  class Object_var;
-  class Object_out;
 
   class LocalObject;
   typedef LocalObject *LocalObject_ptr;
-  class LocalObject_var;
-  class LocalObject_out;
 
   class Principal;
   typedef Principal *Principal_ptr;
-  class Principal_var;
-  class Principal_out;
 
   class ORB;
   typedef ORB *ORB_ptr;
-  class ORB_var;
-  class ORB_out;
 
   class ServerRequest;
   typedef ServerRequest *ServerRequest_ptr;
 
   class ExceptionList;
-  class ExceptionList_var;
   typedef ExceptionList *ExceptionList_ptr;
 
   class ImplementationDef;
@@ -272,22 +239,13 @@ namespace CORBA
 
   class Current;
   typedef Current *Current_ptr;
-  class Current_var;
-  class Current_out;
 
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
-  class TypeCodeFactory_out;
-  class TypeCodeFactory_var;
 
   class ValueBase;
-  typedef ValueBase *ValueBase_ptr;
-  class ValueBase_var;
-  class ValueBase_out;
   class ValueFactoryBase;
-  class ValueFactoryBase_var;
   typedef ValueFactoryBase *ValueFactory;
-  typedef ValueFactoryBase_var ValueFactory_var;
   class DefaultValueRefCountBase;
 
   typedef CORBA::Short Visibility;
@@ -308,8 +266,6 @@ namespace CORBA
 
   class AbstractBase;
   typedef AbstractBase * AbstractBase_ptr;
-  class AbstractBase_var;
-  class AbstractBase_out;
 
   enum CompletionStatus
   {
@@ -392,10 +348,10 @@ namespace CORBA
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr);
-  extern TAO_Export Boolean is_nil (Request_ptr);
-  extern TAO_Export Boolean is_nil (ServerRequest_ptr req);
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr);
+  extern TAO_Export Boolean is_nil (Request_ptr);
+  extern TAO_Export Boolean is_nil (ServerRequest_ptr);
   extern TAO_Export Boolean is_nil (Context_ptr);
   //@}
 
@@ -411,10 +367,10 @@ namespace CORBA
   TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr);
-  extern TAO_Export void release (Request_ptr);
-  extern TAO_Export void release (ServerRequest_ptr req);
   TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr);
+  extern TAO_Export void release (Request_ptr);
+  extern TAO_Export void release (ServerRequest_ptr);
   extern TAO_Export void release (Context_ptr);
   //@}
 
@@ -597,14 +553,10 @@ namespace CORBA
   extern TAO_Export  CORBA::TypeCode_ptr _tc_ServiceDetailType;
 
   struct ServiceDetail;
-  class ServiceDetail_var;
-  class ServiceDetail_out;
   typedef ServiceDetail * ServiceDetail_ptr;
   extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceDetail;
 
   struct ServiceInformation;
-  class ServiceInformation_var;
-  class ServiceInformation_out;
   typedef ServiceInformation * ServiceInformation_ptr;
   extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceInformation;
 
diff --git a/TAO/tests/AMH_Exceptions/Makefile b/TAO/tests/AMH_Exceptions/Makefile
index c3b6f1b22dd..8ff8f83b05d 100644
--- a/TAO/tests/AMH_Exceptions/Makefile
+++ b/TAO/tests/AMH_Exceptions/Makefile
@@ -54,1210 +54,1314 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp TestC.h $(TAO_ROOT)/tao/corba.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/NVList.h \
-  $(TAO_ROOT)/tao/NVList.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/Principal.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/BoundsC.h \
-  $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/DomainC.h \
-  $(TAO_ROOT)/tao/DomainC.i \
-  $(TAO_ROOT)/tao/WrongTransactionC.h \
-  $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i TestC.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i
 
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Get_Opt.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Get_Opt.i \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/NVList.h \
-  $(TAO_ROOT)/tao/NVList.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/Principal.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/BoundsC.h \
-  $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/DomainC.h \
-  $(TAO_ROOT)/tao/DomainC.i \
-  $(TAO_ROOT)/tao/WrongTransactionC.h \
-  $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(TAO_ROOT)/tao/ORB_Core.i TestS.h TestC.h TestC.i \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/AMH_Response_Handler.h \
-  $(TAO_ROOT)/tao/Service_Context.h \
-  $(TAO_ROOT)/tao/Service_Context.inl TestS_T.h \
-  TestS_T.i TestS_T.cpp TestS.i \
-  $(ACE_ROOT)/ace/Sched_Params.h \
-  $(ACE_ROOT)/ace/Sched_Params.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
-  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
-  $(TAO_ROOT)/tao/default_resource.h \
-  $(TAO_ROOT)/tao/default_resource.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/PICurrent.h \
+ $(TAO_ROOT)/tao/PICurrent.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ TestS.h TestC.h TestC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/AMH_Response_Handler.h \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ TestS_T.h TestS_T.i TestS_T.cpp TestS.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i \
+ $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
+ $(TAO_ROOT)/tao/Strategies/strategies_export.h \
+ $(TAO_ROOT)/tao/default_resource.h \
+ $(TAO_ROOT)/tao/default_resource.i \
+ $(TAO_ROOT)/tao/Strategies/advanced_resource.i
 
-.obj/TestC.o .obj/TestC.so .shobj/TestC.o .shobj/TestC.so: TestC.cpp TestC.h $(TAO_ROOT)/tao/corba.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/NVList.h \
-  $(TAO_ROOT)/tao/NVList.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/Principal.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/BoundsC.h \
-  $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/DomainC.h \
-  $(TAO_ROOT)/tao/DomainC.i \
-  $(TAO_ROOT)/tao/WrongTransactionC.h \
-  $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i TestC.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
-  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
-  $(TAO_ROOT)/tao/Stub.i \
-  $(TAO_ROOT)/tao/Invocation.h \
-  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
-  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/operation_details.h \
-  $(TAO_ROOT)/tao/Service_Context.h \
-  $(TAO_ROOT)/tao/Service_Context.inl \
-  $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/target_specification.i \
-  $(TAO_ROOT)/tao/operation_details.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Codeset_Translator_Factory.h \
-  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.h \
-  $(TAO_ROOT)/tao/Codeset_Translator_Factory_T.cpp \
-  $(TAO_ROOT)/tao/Transport.inl \
-  $(TAO_ROOT)/tao/Invocation.i \
-  $(TAO_ROOT)/tao/PortableInterceptor.h \
-  $(TAO_ROOT)/tao/RequestInfo_Util.h \
-  $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
-  $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \
-  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
-  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
+.obj/TestC.o .obj/TestC.so .shobj/TestC.o .shobj/TestC.so: TestC.cpp TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/PICurrent.h \
+ $(TAO_ROOT)/tao/PICurrent.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Condition.h \
+ $(TAO_ROOT)/tao/Condition.inl \
+ $(TAO_ROOT)/tao/Condition.cpp \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/LF_Invocation_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
+ $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(ACE_ROOT)/ace/Recyclable.h \
+ $(ACE_ROOT)/ace/Recyclable.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Transport_Timer.h \
+ $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+ $(TAO_ROOT)/tao/Synch_Refcountable.h \
+ $(ACE_ROOT)/ace/Refcountable.h \
+ $(ACE_ROOT)/ace/Refcountable.inl \
+ $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+ $(TAO_ROOT)/tao/Transport.inl \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
 .obj/TestS.o .obj/TestS.so .shobj/TestS.o .shobj/TestS.so: TestS.cpp TestS.h TestC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/NVList.h \
-  $(TAO_ROOT)/tao/NVList.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/Principal.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/BoundsC.h \
-  $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/DomainC.h \
-  $(TAO_ROOT)/tao/DomainC.i \
-  $(TAO_ROOT)/tao/WrongTransactionC.h \
-  $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i TestC.i \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/AMH_Response_Handler.h \
-  $(TAO_ROOT)/tao/Service_Context.h \
-  $(TAO_ROOT)/tao/Service_Context.inl TestS_T.h \
-  TestS_T.i TestS_T.cpp TestS.i \
-  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
-  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
-  $(ACE_ROOT)/ace/Map_T.h \
-  $(ACE_ROOT)/ace/Pair_T.h \
-  $(ACE_ROOT)/ace/Pair_T.i \
-  $(ACE_ROOT)/ace/Pair_T.cpp \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Active_Map_Manager.h \
-  $(ACE_ROOT)/ace/Active_Map_Manager.i \
-  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Map_T.i \
-  $(ACE_ROOT)/ace/Map_T.cpp \
-  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
-  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
-  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
-  $(TAO_ROOT)/tao/Policy_Validator.h \
-  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
-  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
-  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
-  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
-  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Server_Request.h \
-  $(TAO_ROOT)/tao/Tagged_Profile.h \
-  $(TAO_ROOT)/tao/GIOPC.h \
-  $(TAO_ROOT)/tao/GIOPC.i \
-  $(TAO_ROOT)/tao/Tagged_Profile.i \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/TAO_Server_Request.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
-  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
-  $(TAO_ROOT)/tao/Stub.i \
-  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
-  $(TAO_ROOT)/tao/PortableInterceptor.h \
-  $(TAO_ROOT)/tao/RequestInfo_Util.h \
-  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
-  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
-  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
-  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
-  $(ACE_ROOT)/ace/Dynamic_Service.h \
-  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
-  $(ACE_ROOT)/ace/Dynamic_Service.i \
-  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/AMH_Response_Handler.h \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ TestS_T.h TestS_T.i TestS_T.cpp TestS.i \
+ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+ $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+ $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+ $(TAO_ROOT)/tao/Policy_Validator.h \
+ $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+ $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+ $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
+ $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/PICurrent.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(TAO_ROOT)/tao/PICurrent.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/AMH_Exceptions/client.dsp b/TAO/tests/AMH_Exceptions/client.dsp
index 2bf938883b4..929ed4bc8f9 100644
--- a/TAO/tests/AMH_Exceptions/client.dsp
+++ b/TAO/tests/AMH_Exceptions/client.dsp
@@ -123,7 +123,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GH  $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GH  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -161,7 +161,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Gv  -GH -Ge 1 $(InputName).idl

+	..\..\..\bin\tao_idl -GH -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMH_Exceptions/server.dsp b/TAO/tests/AMH_Exceptions/server.dsp
index fde408f4d5f..8468f6f3743 100644
--- a/TAO/tests/AMH_Exceptions/server.dsp
+++ b/TAO/tests/AMH_Exceptions/server.dsp
@@ -127,7 +127,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -GV -GH $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GH $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -165,7 +165,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv  -GH $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GH $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMH_Oneway/client.dsp b/TAO/tests/AMH_Oneway/client.dsp
index 24c8ea3f008..8889073fae6 100644
--- a/TAO/tests/AMH_Oneway/client.dsp
+++ b/TAO/tests/AMH_Oneway/client.dsp
@@ -119,7 +119,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GH  $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GH  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -157,7 +157,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Gv  -GH -Ge 1 $(InputName).idl

+	..\..\..\bin\tao_idl -GH -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMH_Oneway/server.dsp b/TAO/tests/AMH_Oneway/server.dsp
index ae6f7ffb721..34fe8191d7d 100644
--- a/TAO/tests/AMH_Oneway/server.dsp
+++ b/TAO/tests/AMH_Oneway/server.dsp
@@ -127,7 +127,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -GV -GH $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GH $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -165,7 +165,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv  -GH $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GH $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI/AMI_Test_Client.dsp b/TAO/tests/AMI/AMI_Test_Client.dsp
index 25f4f4c0a24..188468afec8 100644
--- a/TAO/tests/AMI/AMI_Test_Client.dsp
+++ b/TAO/tests/AMI/AMI_Test_Client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -167,7 +167,7 @@ InputPath=.\ami_test.idl
 InputName=ami_test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -GC -Gv $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI/AMI_Test_Server.dsp b/TAO/tests/AMI/AMI_Test_Server.dsp
index 0fa401a825d..10e6f9de836 100644
--- a/TAO/tests/AMI/AMI_Test_Server.dsp
+++ b/TAO/tests/AMI/AMI_Test_Server.dsp
@@ -183,7 +183,7 @@ InputPath=.\ami_test.idl
 InputName=ami_test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI_Timeouts/client.dsp b/TAO/tests/AMI_Timeouts/client.dsp
index f51d8b90304..266f860b13b 100644
--- a/TAO/tests/AMI_Timeouts/client.dsp
+++ b/TAO/tests/AMI_Timeouts/client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -156,7 +156,7 @@ InputPath=.\timeout.idl
 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -194,7 +194,7 @@ InputPath=.\timeout.idl
 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI_Timeouts/server.dsp b/TAO/tests/AMI_Timeouts/server.dsp
index 3bd110c9bcb..16abc9748ec 100644
--- a/TAO/tests/AMI_Timeouts/server.dsp
+++ b/TAO/tests/AMI_Timeouts/server.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -152,7 +152,7 @@ InputPath=.\timeout.idl
 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -190,7 +190,7 @@ InputPath=.\timeout.idl
 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/Bug_1482_Regression/Makefile b/TAO/tests/Bug_1482_Regression/Makefile
index 0a9f33bcbdd..1c966e8d0eb 100644
--- a/TAO/tests/Bug_1482_Regression/Makefile
+++ b/TAO/tests/Bug_1482_Regression/Makefile
@@ -64,6 +64,7 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
+<<<<<<< Makefile
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp TestS.h \
  $(TAO_ROOT)/tao/Messaging/MessagingS.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -380,8 +381,339 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
+=======
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp TestS.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging.h \
+ $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.h \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.i \
+ TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i Client_Task.h \
+ Reply_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Notification_Strategy.h \
+ $(ACE_ROOT)/ace/Notification_Strategy.inl \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+>>>>>>> 1.1.4.1
 
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Hello.h \
+<<<<<<< Makefile
  $(ACE_ROOT)/ace/pre.h \
  TestS.h \
  $(TAO_ROOT)/tao/Messaging/MessagingS.h \
@@ -1015,8 +1347,668 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
+=======
+ $(ACE_ROOT)/ace/pre.h \
+ TestS.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging.h \
+ $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.h \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.i \
+ TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ Server_Task.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Notification_Strategy.h \
+ $(ACE_ROOT)/ace/Notification_Strategy.inl \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp
+
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp TestS.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging.h \
+ $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.h \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.i \
+ TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i Client_Task.h \
+ Reply_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Notification_Strategy.h \
+ $(ACE_ROOT)/ace/Notification_Strategy.inl \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+>>>>>>> 1.1.4.1
 
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Hello.h \
+<<<<<<< Makefile
  $(ACE_ROOT)/ace/pre.h \
  TestS.h \
  $(TAO_ROOT)/tao/Messaging/MessagingS.h \
@@ -1333,8 +2325,339 @@ realclean: clean
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.cpp
+=======
+ $(ACE_ROOT)/ace/pre.h \
+ TestS.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging.h \
+ $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.h \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.i \
+ TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ Server_Task.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Notification_Strategy.h \
+ $(ACE_ROOT)/ace/Notification_Strategy.inl \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp
+>>>>>>> 1.1.4.1
 
 .obj/Reply_Handler.o .obj/Reply_Handler.so .shobj/Reply_Handler.o .shobj/Reply_Handler.so: Reply_Handler.cpp Reply_Handler.h \
+<<<<<<< Makefile
  $(ACE_ROOT)/ace/pre.h \
  TestS.h \
  $(TAO_ROOT)/tao/Messaging/MessagingS.h \
@@ -1604,8 +2927,287 @@ realclean: clean
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i
+=======
+ $(ACE_ROOT)/ace/pre.h \
+ TestS.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging.h \
+ $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.h \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.i \
+ TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i
+>>>>>>> 1.1.4.1
 
 .obj/Client_Task.o .obj/Client_Task.so .shobj/Client_Task.o .shobj/Client_Task.so: Client_Task.cpp Client_Task.h \
+<<<<<<< Makefile
  $(ACE_ROOT)/ace/pre.h \
  TestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1955,8 +3557,377 @@ realclean: clean
  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
  $(TAO_ROOT)/tao/Stub.i
+=======
+ $(ACE_ROOT)/ace/pre.h \
+ TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging.h \
+ $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.h \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ TestC.i Reply_Handler.h TestS.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.i \
+ TestS_T.h TestS_T.i TestS_T.cpp TestS.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Notification_Strategy.h \
+ $(ACE_ROOT)/ace/Notification_Strategy.inl \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/PICurrent.h \
+ $(TAO_ROOT)/tao/PICurrent.inl \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+ $(TAO_ROOT)/tao/Stub.i
+>>>>>>> 1.1.4.1
 
 .obj/Server_Task.o .obj/Server_Task.so .shobj/Server_Task.o .shobj/Server_Task.so: Server_Task.cpp Server_Task.h \
+<<<<<<< Makefile
  $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/post.h \
@@ -2222,8 +4193,296 @@ realclean: clean
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.cpp
+=======
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Notification_Strategy.h \
+ $(ACE_ROOT)/ace/Notification_Strategy.inl \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp
+>>>>>>> 1.1.4.1
 
 .obj/TestC.o .obj/TestC.so .shobj/TestC.o .shobj/TestC.so: TestC.cpp TestC.h \
+<<<<<<< Makefile
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
@@ -2587,8 +4846,391 @@ realclean: clean
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
  $(TAO_ROOT)/tao/Messaging/Twoway_Asynch_Invocation.i \
  $(TAO_ROOT)/tao/Messaging/AMI_ClientRequestInfo_i.h
+=======
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging.h \
+ $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.h \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ TestC.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/PICurrent.h \
+ $(TAO_ROOT)/tao/PICurrent.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Condition.h \
+ $(TAO_ROOT)/tao/Condition.inl \
+ $(TAO_ROOT)/tao/Condition.cpp \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/LF_Invocation_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.h \
+ $(TAO_ROOT)/tao/LF_Event.inl \
+ $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(ACE_ROOT)/ace/Recyclable.h \
+ $(ACE_ROOT)/ace/Recyclable.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Transport_Timer.h \
+ $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+ $(TAO_ROOT)/tao/Synch_Refcountable.h \
+ $(ACE_ROOT)/ace/Refcountable.h \
+ $(ACE_ROOT)/ace/Refcountable.inl \
+ $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+ $(TAO_ROOT)/tao/Transport.inl \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl \
+ $(TAO_ROOT)/tao/Messaging/Twoway_Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Messaging/Asynch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Messaging/Asynch_Timeout_Handler.h \
+ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
+ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
+ $(TAO_ROOT)/tao/Messaging/Asynch_Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ $(TAO_ROOT)/tao/Messaging/Twoway_Asynch_Invocation.i \
+ $(TAO_ROOT)/tao/Messaging/AMI_ClientRequestInfo_i.h
+>>>>>>> 1.1.4.1
 
 .obj/TestS.o .obj/TestS.so .shobj/TestS.o .shobj/TestS.so: TestS.cpp TestS.h \
+<<<<<<< Makefile
  $(TAO_ROOT)/tao/Messaging/MessagingS.h \
  $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/Messaging/Messaging.h \
@@ -2971,5 +5613,406 @@ realclean: clean
  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
  $(ACE_ROOT)/ace/Dynamic_Service.i \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+=======
+ $(TAO_ROOT)/tao/Messaging/MessagingS.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging.h \
+ $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Policy_ForwardC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Time_Value.inl \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/String_Base.h \
+ $(ACE_ROOT)/ace/String_Base_Const.h \
+ $(ACE_ROOT)/ace/String_Base.i \
+ $(ACE_ROOT)/ace/String_Base.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.h \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Seq_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Policy_ForwardC.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/IOP_IORC.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any_T.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/AbstractBase.h \
+ $(TAO_ROOT)/tao/AbstractBase.inl \
+ $(TAO_ROOT)/tao/Any_T.inl \
+ $(TAO_ROOT)/tao/Any_T.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/VarOut_T.h \
+ $(TAO_ROOT)/tao/VarOut_T.inl \
+ $(TAO_ROOT)/tao/VarOut_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \
+ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Value_VarOut_T.h \
+ $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.h \
+ $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.h \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \
+ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/Messaging/MessagingS.i \
+ TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ServicesC.h \
+ $(TAO_ROOT)/tao/ServicesC.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/WrongTransactionC.i \
+ $(TAO_ROOT)/tao/Array_VarOut_T.h \
+ $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+ $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+ $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ TestC.i TestS_T.h TestS_T.i TestS_T.cpp TestS.i \
+ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+ $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+ $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+ $(TAO_ROOT)/tao/Policy_Validator.h \
+ $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+ $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+ $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
+ $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/PICurrent.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(TAO_ROOT)/tao/PICurrent.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Exit.h \
+ $(ACE_ROOT)/ace/Thread_Control.h \
+ $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Framework_Component.h \
+ $(ACE_ROOT)/ace/Framework_Component.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.h \
+ $(ACE_ROOT)/ace/Framework_Component_T.inl \
+ $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+ $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+>>>>>>> 1.1.4.1
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index 27ad53cc52d..94650ad79dc 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -219,6 +219,7 @@ main (int argc , char *argv[])
       if (ACE_OS::strcmp (s_schmendrick._interface_repository_id (),
                           "IDL:floop_prefix/gleep/floop/schmendrick:524.23"))
         {
+         cout << s_schmendrick._interface_repository_id () << endl;
           ++error_count;
           ACE_DEBUG ((LM_DEBUG,
                       "pragma prefix error in object 'schmendrick'\n"));
diff --git a/TAO/tests/IDL_Test/sequence.idl b/TAO/tests/IDL_Test/sequence.idl
index 8b848db3e03..64205f886cf 100644
--- a/TAO/tests/IDL_Test/sequence.idl
+++ b/TAO/tests/IDL_Test/sequence.idl
@@ -30,14 +30,14 @@ interface seqTest
   void send_dozen (inout dozens bouquets);
 };
 
-// CDR operator declarations and definitions 
-// for the sequences were getting generated
-// twice. Now there's an #if !defined guard
-// around them.
+// Anonymous sequence members must be unique types even if the
+// sequence itself is not, so the member name has been
+// incorported into the sequence class name. #if !defined guards
+// are generated around code for the inner anonymous sequences.
 struct twinStruct
   {
-    sequence<short> and_;
-    sequence<short> or_;
+    sequence<sequence<short> > and_;
+    sequence<sequence<short> > or_;
   };
 
 // Nested sequences
diff --git a/TAO/tests/OBV/Factory/client.dsp b/TAO/tests/OBV/Factory/client.dsp
index 0aad3130622..63f3f7f743e 100644
--- a/TAO/tests/OBV/Factory/client.dsp
+++ b/TAO/tests/OBV/Factory/client.dsp
@@ -129,7 +129,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -167,7 +167,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Factory/server.dsp b/TAO/tests/OBV/Factory/server.dsp
index 850e9146b85..f2e080e3b2e 100644
--- a/TAO/tests/OBV/Factory/server.dsp
+++ b/TAO/tests/OBV/Factory/server.dsp
@@ -137,7 +137,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index bfc72998512..2a3eb140309 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -12,15 +12,15 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 
 
 void
-reflect_node (BaseNode_ptr bn)
+reflect_node (BaseNode* bn)
 {
   if(bn == 0) return;
 
   reflect_node (bn->left ());
   reflect_node (bn->right ());
 
-  BaseNode_ptr old_right = bn->right ();
-  BaseNode_ptr old_left = bn->left ();
+  BaseNode *old_right = bn->right ();
+  BaseNode *old_left = bn->left ();
 
   CORBA::add_ref (old_right);
   CORBA::add_ref (old_left);
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index b71178be956..aa7f0782728 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 void
-dump_node (BaseNode_ptr bn, int indent)
+dump_node (BaseNode *bn, int indent)
 {
   if (bn == 0) return;
 
@@ -46,7 +46,7 @@ dump_node (BaseNode_ptr bn, int indent)
   int i = indent;
   for (; i != 0; i--) ACE_DEBUG ((LM_DEBUG, "  "));
 
-  StringNode_ptr sn = StringNode::_downcast (bn);
+  StringNode *sn = StringNode::_downcast (bn);
   if (sn != 0)
   {
     ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %s\n",
@@ -65,7 +65,7 @@ dump_node (BaseNode_ptr bn, int indent)
 }
 
 void
-dump_tree (TreeController_ptr tc)
+dump_tree (TreeController *tc)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) start tree dump <%x>\n",
diff --git a/TAO/tests/OBV/Forward/client.dsp b/TAO/tests/OBV/Forward/client.dsp
index c5bf897ff7b..a4055663d79 100644
--- a/TAO/tests/OBV/Forward/client.dsp
+++ b/TAO/tests/OBV/Forward/client.dsp
@@ -139,7 +139,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -177,7 +177,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -223,7 +223,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -261,7 +261,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -307,7 +307,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -345,7 +345,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Forward/server.dsp b/TAO/tests/OBV/Forward/server.dsp
index 7fc21bdaeba..9d6a5f60929 100644
--- a/TAO/tests/OBV/Forward/server.dsp
+++ b/TAO/tests/OBV/Forward/server.dsp
@@ -169,7 +169,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -208,7 +208,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -252,7 +252,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "f$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -291,7 +291,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -335,7 +335,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -374,7 +374,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 12034ad2c16..dc0852cfa6a 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -208,7 +208,7 @@ Test_Recursive_Union::deep_init (Param_Test::Recursive_Union &ru,
 
       ru.nested_member (nru);
 
-      Param_Test::Recursive_Union::_tao_seq_Recursive_Union tmp (MAX_SEQ_LENGTH);
+      Param_Test::Recursive_Union::_rec_member_seq tmp (MAX_SEQ_LENGTH);
 
       ru.rec_member (tmp);
 
@@ -223,7 +223,7 @@ Test_Recursive_Union::deep_init (Param_Test::Recursive_Union &ru,
       // This line is TAO-specific, but some compilers we support
       // are broken in their handling of the portable scoped typedef
       // required by CORBA 2.3
-      Param_Test::Recursive_Union::_tao_seq_Recursive_Union tmp (MAX_SEQ_LENGTH);
+      Param_Test::Recursive_Union::_rec_member_seq tmp (MAX_SEQ_LENGTH);
 
       tmp.length (len);
 
@@ -261,7 +261,7 @@ Test_Recursive_Union::deep_init_nested (Param_Test::nested_rec_union &nu,
       // This line is TAO-specific, but some compilers we support
       // are broken in their handling of the portable scoped typedef
       // required by CORBA 2.3
-      Param_Test::nested_rec_union::_tao_seq_nested_rec_union tmp (MAX_SEQ_LENGTH);
+      Param_Test::nested_rec_union::_nested_rec_member_seq tmp (MAX_SEQ_LENGTH);
 
       tmp.length (len);